Skip to content

Commit da60e7b

Browse files
authored
Remove the duplicate cockroachdb versions generated by the API response (#997)
1 parent f441d93 commit da60e7b

File tree

11 files changed

+28
-7
lines changed

11 files changed

+28
-7
lines changed

config/manager/patches/image.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,3 +224,5 @@ spec:
224224
value: cockroachdb/cockroach:v23.1.3
225225
- name: RELATED_IMAGE_COCKROACH_v23_1_4
226226
value: cockroachdb/cockroach:v23.1.4
227+
- name: RELATED_IMAGE_COCKROACH_v23_1_5
228+
value: cockroachdb/cockroach:v23.1.5

config/manifests/bases/cockroach-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,3 +381,5 @@ spec:
381381
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:40f00476b63cb9e370fe85f01407173693213a9242fc117d28b06378ca0d98e0
382382
- name: RELATED_IMAGE_COCKROACH_v23_1_4
383383
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:42c9930d6861f6a2147ed6e01827eddd730279966763ec68868567a19cc164ab
384+
- name: RELATED_IMAGE_COCKROACH_v23_1_5
385+
image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3

config/manifests/patches/deployment_patch.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,4 +233,6 @@ spec:
233233
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:40f00476b63cb9e370fe85f01407173693213a9242fc117d28b06378ca0d98e0
234234
- name: RELATED_IMAGE_COCKROACH_v23_1_4
235235
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:42c9930d6861f6a2147ed6e01827eddd730279966763ec68868567a19cc164ab
236+
- name: RELATED_IMAGE_COCKROACH_v23_1_5
237+
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3
236238
image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER

config/samples/crdb-tls-example.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kind: CrdbCluster
1919
metadata:
2020
name: crdb-tls-example
2121
spec:
22-
cockroachDBVersion: v23.1.4
22+
cockroachDBVersion: v23.1.5
2323
dataStore:
2424
pvc:
2525
spec:

crdb-versions.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,3 +319,6 @@ CrdbVersions:
319319
- image: cockroachdb/cockroach:v23.1.4
320320
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:42c9930d6861f6a2147ed6e01827eddd730279966763ec68868567a19cc164ab
321321
tag: v23.1.4
322+
- image: cockroachdb/cockroach:v23.1.5
323+
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3
324+
tag: v23.1.5

examples/client-secure-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
serviceAccountName: cockroachdb-sa
2424
containers:
2525
- name: cockroachdb-client-secure
26-
image: cockroachdb/cockroach:v23.1.4
26+
image: cockroachdb/cockroach:v23.1.5
2727
imagePullPolicy: IfNotPresent
2828
volumeMounts:
2929
- name: client-certs

examples/example.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ spec:
4040
memory: 8Gi
4141
tlsEnabled: true
4242
# You can set either a version of the db or a specific image name
43-
# cockroachDBVersion: v23.1.4
43+
# cockroachDBVersion: v23.1.5
4444
image:
45-
name: cockroachdb/cockroach:v23.1.4
45+
name: cockroachdb/cockroach:v23.1.5
4646
# nodes refers to the number of crdb pods that are created
4747
# via the statefulset
4848
nodes: 3

examples/smoketest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ spec:
3939
memory: 300Mi
4040
tlsEnabled: true
4141
image:
42-
name: cockroachdb/cockroach:v23.1.4
42+
name: cockroachdb/cockroach:v23.1.5
4343
nodes: 3

hack/update_crdb_versions/main.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,11 @@ func fetchAPIResponse(url string) (*apiResponse, error) {
121121

122122
func generateOutput(resp *apiResponse) *yamlOutput {
123123
output := new(yamlOutput)
124+
usedTags := make(map[string]bool)
124125
for _, data := range resp.Data {
125126
for _, r := range data.Repos {
126127
for _, tag := range r.Tags {
127-
if !isValid(tag.Name) {
128+
if !isValid(tag.Name) || isUsed(usedTags, tag.Name) {
128129
continue
129130
}
130131

@@ -156,6 +157,15 @@ func isValid(tag string) bool {
156157
return semVerRegex.MatchString(tag)
157158
}
158159

160+
// isUsed returns true if a tag has already been used to generate cockroach image.
161+
func isUsed(usedTags map[string]bool, tag string) bool {
162+
if _, ok := usedTags[tag]; ok {
163+
return true
164+
}
165+
usedTags[tag] = true
166+
return false
167+
}
168+
159169
// apiResponse encapsulates the response from the RH Catalog API.
160170
type apiResponse struct {
161171
Data []struct {

install/operator.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,8 @@ spec:
582582
value: cockroachdb/cockroach:v23.1.3
583583
- name: RELATED_IMAGE_COCKROACH_v23_1_4
584584
value: cockroachdb/cockroach:v23.1.4
585+
- name: RELATED_IMAGE_COCKROACH_v23_1_5
586+
value: cockroachdb/cockroach:v23.1.5
585587
- name: OPERATOR_NAME
586588
value: cockroachdb
587589
- name: POD_NAME

0 commit comments

Comments
 (0)