Add validation to check the image on cockroachdb registry (#1110)

prafull01 · web-flow · commit 8dce23348474 · 2025-06-06T21:00:17.000+05:30
diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml
@@ -240,6 +240,8 @@ spec:
               value: cockroachdb/cockroach:v23.2.24
             - name: RELATED_IMAGE_COCKROACH_v23_2_25
               value: cockroachdb/cockroach:v23.2.25
+            - name: RELATED_IMAGE_COCKROACH_v23_2_26
+              value: cockroachdb/cockroach:v23.2.26
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: cockroachdb/cockroach:v24.1.0
             - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -274,6 +276,8 @@ spec:
               value: cockroachdb/cockroach:v24.1.16
             - name: RELATED_IMAGE_COCKROACH_v24_1_18
               value: cockroachdb/cockroach:v24.1.18
+            - name: RELATED_IMAGE_COCKROACH_v24_1_19
+              value: cockroachdb/cockroach:v24.1.19
             - name: RELATED_IMAGE_COCKROACH_v24_2_0
               value: cockroachdb/cockroach:v24.2.0
             - name: RELATED_IMAGE_COCKROACH_v24_2_2
@@ -316,6 +320,8 @@ spec:
               value: cockroachdb/cockroach:v24.3.11
             - name: RELATED_IMAGE_COCKROACH_v24_3_12
               value: cockroachdb/cockroach:v24.3.12
+            - name: RELATED_IMAGE_COCKROACH_v24_3_14
+              value: cockroachdb/cockroach:v24.3.14
             - name: RELATED_IMAGE_COCKROACH_v25_1_0
               value: cockroachdb/cockroach:v25.1.0
             - name: RELATED_IMAGE_COCKROACH_v25_1_1
@@ -330,3 +336,7 @@ spec:
               value: cockroachdb/cockroach:v25.1.5
             - name: RELATED_IMAGE_COCKROACH_v25_1_6
               value: cockroachdb/cockroach:v25.1.6
+            - name: RELATED_IMAGE_COCKROACH_v25_1_7
+              value: cockroachdb/cockroach:v25.1.7
+            - name: RELATED_IMAGE_COCKROACH_v25_2_0
+              value: cockroachdb/cockroach:v25.2.0
diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
@@ -413,6 +413,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v23_2_24
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0754f7901feea9017bc5041cb91b7ac1cdbca10c2064f37c3648a2c395f24f83
     name: RELATED_IMAGE_COCKROACH_v23_2_25
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:02e1ef01a023da0eee653f63b314786fd66a78d184a97a314422f6f9c3ef8e7e
+    name: RELATED_IMAGE_COCKROACH_v23_2_26
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
     name: RELATED_IMAGE_COCKROACH_v24_1_0
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1374cbdc4ecf38e4b4226328f532e830b8932b34d9449bf2fbb36e60d0310521
@@ -447,6 +449,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_1_16
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8f1f2fd1aca914a1ef007117c85ac944055bbfb873a468a7374d239ef20b065e
     name: RELATED_IMAGE_COCKROACH_v24_1_18
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:68fe64fe3e112288ccfc2a7dffd69b9b2786a5da3d3bdedd6addf41659d460c9
+    name: RELATED_IMAGE_COCKROACH_v24_1_19
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
     name: RELATED_IMAGE_COCKROACH_v24_2_0
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:08cec123813304ab03bd66d72a09949667a874a42320bedafda391ebcdb2e56c
@@ -489,6 +493,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_3_11
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9f42e929f2cc7e9b6d24dd61e19c5d93dcfeabd34b9c8b935afbe78577efb18b
     name: RELATED_IMAGE_COCKROACH_v24_3_12
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:a59cafff8d4ff2c62204ece15880117011c30978823c232902c7182d747ec827
+    name: RELATED_IMAGE_COCKROACH_v24_3_14
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
     name: RELATED_IMAGE_COCKROACH_v25_1_0
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:fd6c9b8ca82ff4f2d0fe29166d1fc9bca6439cb40907be60f4d8f1b9735de2f7
@@ -503,6 +509,10 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v25_1_5
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e8f26fd132affbaeb8ef6b1807a646c83b301e5dc334a592dfb2cf8dc3dbaf10
     name: RELATED_IMAGE_COCKROACH_v25_1_6
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cc20270212f01fc231ff788e20b0476b8228c440bfc40430c0836d5eb702a042
+    name: RELATED_IMAGE_COCKROACH_v25_1_7
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715
+    name: RELATED_IMAGE_COCKROACH_v25_2_0
   - image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
     name: RELATED_IMAGE_COCKROACH_OPERATOR
   version: 0.0.0
diff --git a/config/manifests/patches/deployment_patch.yaml b/config/manifests/patches/deployment_patch.yaml
@@ -249,6 +249,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c9a31bdf19175880d0981e21dd19a1458b6e8cde8d4acbcb554f3bea3578a64e
             - name: RELATED_IMAGE_COCKROACH_v23_2_25
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0754f7901feea9017bc5041cb91b7ac1cdbca10c2064f37c3648a2c395f24f83
+            - name: RELATED_IMAGE_COCKROACH_v23_2_26
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:02e1ef01a023da0eee653f63b314786fd66a78d184a97a314422f6f9c3ef8e7e
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
             - name: RELATED_IMAGE_COCKROACH_v24_1_1
@@ -283,6 +285,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8fc8de4f3671a73f9aa747e5b23ec973d192fff6f2869c38985cd656063c1e3d
             - name: RELATED_IMAGE_COCKROACH_v24_1_18
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8f1f2fd1aca914a1ef007117c85ac944055bbfb873a468a7374d239ef20b065e
+            - name: RELATED_IMAGE_COCKROACH_v24_1_19
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:68fe64fe3e112288ccfc2a7dffd69b9b2786a5da3d3bdedd6addf41659d460c9
             - name: RELATED_IMAGE_COCKROACH_v24_2_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
             - name: RELATED_IMAGE_COCKROACH_v24_2_2
@@ -325,6 +329,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:742a6f69a3a209a7080a1e911fd96467d2a91aacb3f91d6be80a6a6e2e54b2ae
             - name: RELATED_IMAGE_COCKROACH_v24_3_12
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9f42e929f2cc7e9b6d24dd61e19c5d93dcfeabd34b9c8b935afbe78577efb18b
+            - name: RELATED_IMAGE_COCKROACH_v24_3_14
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:a59cafff8d4ff2c62204ece15880117011c30978823c232902c7182d747ec827
             - name: RELATED_IMAGE_COCKROACH_v25_1_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
             - name: RELATED_IMAGE_COCKROACH_v25_1_1
@@ -339,6 +345,10 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:79d688bebe0643ef0dd6ba7108cdb34c0442470c0c20ae0df88b5d02a3476cd0
             - name: RELATED_IMAGE_COCKROACH_v25_1_6
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e8f26fd132affbaeb8ef6b1807a646c83b301e5dc334a592dfb2cf8dc3dbaf10
+            - name: RELATED_IMAGE_COCKROACH_v25_1_7
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cc20270212f01fc231ff788e20b0476b8228c440bfc40430c0836d5eb702a042
+            - name: RELATED_IMAGE_COCKROACH_v25_2_0
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715
             - name: RELATED_IMAGE_COCKROACH_OPERATOR
               value: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
           image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml
@@ -19,7 +19,7 @@ kind: CrdbCluster
 metadata:
   name: crdb-tls-example
 spec:
-  cockroachDBVersion: v25.1.6
+  cockroachDBVersion: v25.2.0
   dataStore:
     pvc:
       spec:
diff --git a/crdb-versions.yaml b/crdb-versions.yaml
@@ -343,6 +343,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v23.2.25
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0754f7901feea9017bc5041cb91b7ac1cdbca10c2064f37c3648a2c395f24f83
   tag: v23.2.25
+- image: cockroachdb/cockroach:v23.2.26
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:02e1ef01a023da0eee653f63b314786fd66a78d184a97a314422f6f9c3ef8e7e
+  tag: v23.2.26
 - image: cockroachdb/cockroach:v24.1.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
   tag: v24.1.0
@@ -394,6 +397,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v24.1.18
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8f1f2fd1aca914a1ef007117c85ac944055bbfb873a468a7374d239ef20b065e
   tag: v24.1.18
+- image: cockroachdb/cockroach:v24.1.19
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:68fe64fe3e112288ccfc2a7dffd69b9b2786a5da3d3bdedd6addf41659d460c9
+  tag: v24.1.19
 - image: cockroachdb/cockroach:v24.2.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cad60044ad6573bd80b65e892a9ec0510dbe4fcbbfc6b51010ecf419f56f1024
   tag: v24.2.0
@@ -457,6 +463,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v24.3.12
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9f42e929f2cc7e9b6d24dd61e19c5d93dcfeabd34b9c8b935afbe78577efb18b
   tag: v24.3.12
+- image: cockroachdb/cockroach:v24.3.14
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:a59cafff8d4ff2c62204ece15880117011c30978823c232902c7182d747ec827
+  tag: v24.3.14
 - image: cockroachdb/cockroach:v25.1.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:8e8c081c231b5b15eca483ceec16ea9190ba73aae6e421865162446eb584519a
   tag: v25.1.0
@@ -478,3 +487,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v25.1.6
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e8f26fd132affbaeb8ef6b1807a646c83b301e5dc334a592dfb2cf8dc3dbaf10
   tag: v25.1.6
+- image: cockroachdb/cockroach:v25.1.7
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:cc20270212f01fc231ff788e20b0476b8228c440bfc40430c0836d5eb702a042
+  tag: v25.1.7
+- image: cockroachdb/cockroach:v25.2.0
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:c74cf927a2b2c5098ad74ad0880996f8b042186a9911d888a231ef5b9e2a0715
+  tag: v25.2.0
diff --git a/e2e/create/create_test.go b/e2e/create/create_test.go
@@ -31,9 +31,9 @@ import (
 )
 
 var (
-	crdbVersion         = "v21.1.7"
-	relatedImageEnvName = "RELATED_IMAGE_COCKROACH_v21_1_7"
-	validImage          = "cockroachdb/cockroach:v21.1.7"
+	crdbVersion         = "v21.2.7"
+	relatedImageEnvName = "RELATED_IMAGE_COCKROACH_v21_2_7"
+	validImage          = "cockroachdb/cockroach:v21.2.7"
 )
 
 // TestCreateInsecureCluster tests the creation of insecure cluster, and it should be successful.
diff --git a/e2e/e2e.go b/e2e/e2e.go
@@ -32,7 +32,7 @@ const (
 	MinorVersion2        = "cockroachdb/cockroach:v24.1.2"
 	MajorVersion         = "cockroachdb/cockroach:v24.2.2"
 	NonExistentVersion   = "cockroachdb/cockroach-non-existent:v21.1.999"
-	SkipFeatureVersion   = "cockroachdb/cockroach:v20.1.0"
+	SkipFeatureVersion   = "cockroachdb/cockroach:v21.2.0"
 	InvalidImage         = "nginx:latest"
 	DefaultCPULimit      = "800m"
 	DefaultMemoryLimit   = "3Gi"
diff --git a/e2e/upgrades/upgrades_test.go b/e2e/upgrades/upgrades_test.go
@@ -50,7 +50,7 @@ func TestUpgradesMinorVersion(t *testing.T) {
 
 	// We are testing a Minor Version Upgrade with
 	// partition update
-	// Going from v20.2.8 to v20.2.9
+	// Going from v24.1.0 to v24.1.2
 
 	if testing.Short() {
 		t.Skip("skipping test in short mode.")
@@ -97,11 +97,11 @@ func TestUpgradesMinorVersion(t *testing.T) {
 	steps.Run(t)
 }
 
-// TestUpgradesMajorVersion20to21 tests a major version upgrade
-func TestUpgradesMajorVersion20to21(t *testing.T) {
+// TestUpgradesMajorVersion24.1to24.2 tests a major version upgrade
+func TestUpgradesMajorVersion24_1to24_2(t *testing.T) {
 
 	// We are doing a major version upgrade here
-	// 20 to 21
+	// 24.1.2 to 24.2.2
 
 	if testing.Short() {
 		t.Skip("skipping test in short mode.")
@@ -149,8 +149,8 @@ func TestUpgradesMajorVersion20to21(t *testing.T) {
 	steps.Run(t)
 }
 
-// TestUpgradesMajorVersion20_1To20_2 is another major version upgrade
-func TestUpgradesMajorVersion20_1To20_2(t *testing.T) {
+// TestUpgradesMajorVersion21_2To22_1 is another major version upgrade
+func TestUpgradesMajorVersion21_2To22_1(t *testing.T) {
 
 	if testing.Short() {
 		t.Skip("skipping test in short mode.")
@@ -166,7 +166,7 @@ func TestUpgradesMajorVersion20_1To20_2(t *testing.T) {
 	sb.StartManager(t, controller.InitClusterReconcilerWithLogger(testLog))
 
 	builder := testutil.NewBuilder("crdb").WithNodeCount(3).WithTLS().
-		WithImage("cockroachdb/cockroach:v20.1.16").
+		WithImage("cockroachdb/cockroach:v21.2.16").
 		WithPVDataStore("1Gi").WithResources(resRequirements)
 
 	steps := testutil.Steps{
@@ -184,7 +184,7 @@ func TestUpgradesMajorVersion20_1To20_2(t *testing.T) {
 				require.NoError(t, sb.Get(current))
 
 				updated := current.DeepCopy()
-				updated.Spec.Image.Name = "cockroachdb/cockroach:v20.2.10"
+				updated.Spec.Image.Name = "cockroachdb/cockroach:v22.1.10"
 				require.NoError(t, sb.Patch(updated, client.MergeFrom(current)))
 				// we wait 10 min because we will be waiting 3 min for each pod because
 				// v20.1.16 does not have curl installed
@@ -251,7 +251,8 @@ func TestUpgradesMinorVersionThenRollback(t *testing.T) {
 
 	// We are testing a Minor Version Upgrade with
 	// partition update
-	// Going from v20.2.8 to v20.2.9
+	// Going from v24.1.0 to v24.1.2
+	// Then rollback to v24.1.0
 
 	if testing.Short() {
 		t.Skip("skipping test in short mode.")
diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml
@@ -23,7 +23,7 @@ spec:
   serviceAccountName: cockroachdb-sa
   containers:
   - name: cockroachdb-client-secure
-    image: cockroachdb/cockroach:v25.1.6
+    image: cockroachdb/cockroach:v25.2.0
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs
diff --git a/examples/example.yaml b/examples/example.yaml
@@ -40,9 +40,9 @@ spec:
       memory: 8Gi
   tlsEnabled: true
 # You can set either a version of the db or a specific image name
-# cockroachDBVersion: v25.1.6
+# cockroachDBVersion: v25.2.0
   image:
-    name: cockroachdb/cockroach:v25.1.6
+    name: cockroachdb/cockroach:v25.2.0
   # nodes refers to the number of crdb pods that are created
   # via the statefulset
   nodes: 3
diff --git a/examples/smoketest.yaml b/examples/smoketest.yaml
@@ -39,5 +39,5 @@ spec:
       memory: 300Mi
   tlsEnabled: true
   image:
-    name: cockroachdb/cockroach:v25.1.6
+    name: cockroachdb/cockroach:v25.2.0
   nodes: 3
diff --git a/hack/update_crdb_versions/main.go b/hack/update_crdb_versions/main.go
@@ -33,9 +33,11 @@ import (
 )
 
 const (
-	httpTimeoutSecs = 30
-	repo            = "registry.connect.redhat.com/cockroachdb/cockroach"
-	versionsFile    = "crdb-versions.yaml"
+	cockroachDBRegistry = "cockroachdb"
+	cockroachDBImage    = "cockroach"
+	httpTimeoutSecs     = 30
+	repo                = "registry.connect.redhat.com/cockroachdb/cockroach"
+	versionsFile        = "crdb-versions.yaml"
 
 	fileHeader = `#
 # Supported CockroachDB versions.
@@ -63,6 +65,9 @@ var (
 
 	// semVerRegex defines a Regexp for ensuring a valid (non-prerelease) version.
 	semVerRegex = regexp.MustCompile(`v?([0-9]+)(\.[0-9]+)?(\.[0-9]+)?$`)
+
+	BaseDockerHubURL = fmt.Sprintf("https://hub.docker.com/v2/namespaces/%s/repositories/%s/tags",
+		cockroachDBRegistry, cockroachDBImage)
 )
 
 func main() {
@@ -125,12 +130,11 @@ func generateOutput(resp *apiResponse) *yamlOutput {
 	for _, data := range resp.Data {
 		for _, r := range data.Repos {
 			for _, tag := range r.Tags {
-				if !isValid(tag.Name) || isUsed(usedTags, tag.Name) {
+				if !isValid(tag.Name) || isUsed(usedTags, tag.Name) || !isTagPresentOnCockroachImage(tag.Name) {
 					continue
 				}
-
 				output.CrdbVersions = append(output.CrdbVersions, version{
-					Image:       fmt.Sprintf("cockroachdb/cockroach:%s", tag.Name),
+					Image:       fmt.Sprintf("%s/%s:%s", cockroachDBRegistry, cockroachDBImage, tag.Name),
 					RedhatImage: fmt.Sprintf("%s@%s", repo, data.Digest),
 					Tag:         tag.Name,
 				})
@@ -166,6 +170,21 @@ func isUsed(usedTags map[string]bool, tag string) bool {
 	return false
 }
 
+// isTagPresentOnCockroachImage returns true if the given tag is present on the cockroachdb/cockroach image.
+func isTagPresentOnCockroachImage(tag string) bool {
+	dockerHubURL := fmt.Sprintf("%s/%s", BaseDockerHubURL, tag)
+	client := http.Client{Timeout: httpTimeoutSecs * time.Second}
+
+	r, err := client.Get(dockerHubURL)
+	if err != nil {
+		fmt.Println("error fetching image from Docker Hub:", err)
+		return false
+	}
+	defer r.Body.Close()
+
+	return r.StatusCode == http.StatusOK
+}
+
 // apiResponse encapsulates the response from the RH Catalog API.
 type apiResponse struct {
 	Data []struct {
diff --git a/hack/update_crdb_versions/main_test.go b/hack/update_crdb_versions/main_test.go
@@ -30,6 +30,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+var (
+	crdbURLPath = "/v2/cockroachdb/cockroach/tags"
+)
+
 func TestUpdateCrdbVersions(t *testing.T) {
 	images := []struct {
 		Note string
@@ -49,6 +53,17 @@ func TestUpdateCrdbVersions(t *testing.T) {
 		{Note: "metadata not supported", Tag: "v1+snapshot"},
 	}
 
+	dockerImages := []struct {
+		Note string
+		Sha  string
+		Tag  string
+	}{
+		// These are in expected order
+		{Sha: "sha256:image1", Tag: "v1"},
+		{Sha: "sha256:image1.2", Tag: "v1.2"},
+		{Sha: "sha256:image2", Tag: "v2"},
+	}
+
 	tmpl := template.Must(template.New("rhAPI").Parse(`
 {
   "data": [
@@ -67,7 +82,7 @@ func TestUpdateCrdbVersions(t *testing.T) {
 
 	var expected strings.Builder
 	expected.WriteString("CrdbVersions:\n")
-	for _, img := range images {
+	for _, img := range dockerImages {
 		if img.Sha != "" {
 			expected.WriteString(fmt.Sprintf("- image: cockroachdb/cockroach:%s\n", img.Tag))
 			expected.WriteString(fmt.Sprintf("  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@%s\n", img.Sha))
@@ -86,6 +101,23 @@ func TestUpdateCrdbVersions(t *testing.T) {
 	}))
 	defer server.Close()
 
+	dockerServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		tagName := strings.TrimPrefix(r.URL.Path, crdbURLPath+"/")
+
+		// Search for the tag
+		for _, img := range dockerImages {
+			if img.Tag == tagName {
+				w.WriteHeader(http.StatusOK)
+				fmt.Fprintf(w, `{"name":"%s"}`, tagName)
+			}
+		}
+
+		// Tag not found
+		w.WriteHeader(http.StatusNotFound)
+	}))
+	defer dockerServer.Close()
+
+	BaseDockerHubURL = dockerServer.URL + crdbURLPath
 	var str strings.Builder
 	require.NoError(t, UpdateCrdbVersions(server.URL, &str))
 	require.Equal(t, expected.String(), str.String())
diff --git a/install/operator.yaml b/install/operator.yaml

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ import (`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`var (`
`34`		`- crdbVersion = "v21.1.7"`
`35`		`- relatedImageEnvName = "RELATED_IMAGE_COCKROACH_v21_1_7"`
`36`		`- validImage = "cockroachdb/cockroach:v21.1.7"`
	`34`	`+ crdbVersion = "v21.2.7"`
	`35`	`+ relatedImageEnvName = "RELATED_IMAGE_COCKROACH_v21_2_7"`
	`36`	`+ validImage = "cockroachdb/cockroach:v21.2.7"`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`// TestCreateInsecureCluster tests the creation of insecure cluster, and it should be successful.`