Fix the review comments

Author: prafull01

config/manager/patches/image.yaml

@@ -188,6 +188,8 @@ spec:
               value: cockroachdb/cockroach:v22.1.15
             - name: RELATED_IMAGE_COCKROACH_v22_1_16
               value: cockroachdb/cockroach:v22.1.16
+            - name: RELATED_IMAGE_COCKROACH_v22_1_18
+              value: cockroachdb/cockroach:v22.1.18
             - name: RELATED_IMAGE_COCKROACH_v22_2_0
               value: cockroachdb/cockroach:v22.2.0
             - name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -202,3 +204,5 @@ spec:
               value: cockroachdb/cockroach:v22.2.5
             - name: RELATED_IMAGE_COCKROACH_v22_2_6
               value: cockroachdb/cockroach:v22.2.6
+            - name: RELATED_IMAGE_COCKROACH_v22_2_7
+              value: cockroachdb/cockroach:v22.2.7

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

@@ -345,6 +345,8 @@ spec:
     image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0ec1dc184a2199736b4bd7de3241a357be7427caea5da1c931b08bc06f5c3dc0
   - name: RELATED_IMAGE_COCKROACH_v22_1_16
     image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d590946b2f7c7ec0c7ec057a338e81f864d6a9e3d3ac4e0769aa5756a8e13fc
+  - name: RELATED_IMAGE_COCKROACH_v22_1_18
+    image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:363d8feb560324a848c5771edd224dc19020013af7641979ee81ae8ee536d7e3
   - name: RELATED_IMAGE_COCKROACH_v22_2_0
     image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
   - name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -359,3 +361,5 @@ spec:
     image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0fea6ed8a78ea624240ee6ffb3573d5cf1115186aa9180fcd7d1273351deaaa3
   - name: RELATED_IMAGE_COCKROACH_v22_2_6
     image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:53c7b960a2ed70a0998a4f8e28a4f78f7f676e01cffebe665e91e3a7629d88ed
+  - name: RELATED_IMAGE_COCKROACH_v22_2_7
+    image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d14f77f70aea0422a906510c1ac2652ff76e131ed705cb002f80e13e887b0cd9

config/manifests/patches/deployment_patch.yaml

@@ -197,6 +197,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0ec1dc184a2199736b4bd7de3241a357be7427caea5da1c931b08bc06f5c3dc0
             - name: RELATED_IMAGE_COCKROACH_v22_1_16
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d590946b2f7c7ec0c7ec057a338e81f864d6a9e3d3ac4e0769aa5756a8e13fc
+            - name: RELATED_IMAGE_COCKROACH_v22_1_18
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:363d8feb560324a848c5771edd224dc19020013af7641979ee81ae8ee536d7e3
             - name: RELATED_IMAGE_COCKROACH_v22_2_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
             - name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -211,4 +213,6 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:0fea6ed8a78ea624240ee6ffb3573d5cf1115186aa9180fcd7d1273351deaaa3
             - name: RELATED_IMAGE_COCKROACH_v22_2_6
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:53c7b960a2ed70a0998a4f8e28a4f78f7f676e01cffebe665e91e3a7629d88ed
+            - name: RELATED_IMAGE_COCKROACH_v22_2_7
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d14f77f70aea0422a906510c1ac2652ff76e131ed705cb002f80e13e887b0cd9
           image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER

config/samples/crdb-tls-example.yaml

@@ -19,7 +19,7 @@ kind: CrdbCluster
 metadata:
   name: crdb-tls-example
 spec:
-  cockroachDBVersion: v22.2.6
+  cockroachDBVersion: v22.2.7
   dataStore:
     pvc:
       spec:

crdb-versions.yaml

@@ -265,6 +265,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v22.1.16
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1d590946b2f7c7ec0c7ec057a338e81f864d6a9e3d3ac4e0769aa5756a8e13fc
   tag: v22.1.16
+- image: cockroachdb/cockroach:v22.1.18
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:363d8feb560324a848c5771edd224dc19020013af7641979ee81ae8ee536d7e3
+  tag: v22.1.18
 - image: cockroachdb/cockroach:v22.2.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e50aab39722af22ccbf3d1db19e37972d52b0fc9a40998a64618dc966b2bac57
   tag: v22.2.0
@@ -286,3 +289,6 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v22.2.6
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:53c7b960a2ed70a0998a4f8e28a4f78f7f676e01cffebe665e91e3a7629d88ed
   tag: v22.2.6
+- image: cockroachdb/cockroach:v22.2.7
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:d14f77f70aea0422a906510c1ac2652ff76e131ed705cb002f80e13e887b0cd9
+  tag: v22.2.7

examples/client-secure-operator.yaml

@@ -23,7 +23,7 @@ spec:
   serviceAccountName: cockroachdb-sa
   containers:
   - name: cockroachdb-client-secure
-    image: cockroachdb/cockroach:v22.2.6
+    image: cockroachdb/cockroach:v22.2.7
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

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: v22.2.6
+# cockroachDBVersion: v22.2.7
   image:
-    name: cockroachdb/cockroach:v22.2.6
+    name: cockroachdb/cockroach:v22.2.7
   # nodes refers to the number of crdb pods that are created
   # via the statefulset
   nodes: 3

examples/smoketest.yaml

@@ -39,5 +39,5 @@ spec:
       memory: 300Mi
   tlsEnabled: true
   image:
-    name: cockroachdb/cockroach:v22.2.6
+    name: cockroachdb/cockroach:v22.2.7
   nodes: 3

hack/bundle.sh

@@ -70,17 +70,17 @@ generate_bundle() {
 
   # Generate the new package bundle
   kustomize build config/manifests | operator-sdk generate bundle -q \
-    --version "${version}" \
-    ${opts} \
-    --output-dir "${dir}"
+  --version "${version}" \
+  ${opts} \
+  --output-dir "${dir}"
 
   # Ensure package name is correct for the specific bundle and that the CSV name matches the package name. Also removing
   # the testing annotations since these are handled automatically upstream.
   sed \
-    -e "s/package.v1: cockroach-operator/package.v1: ${pkg}/g" \
-    -e "/\s*# Annotations for testing/d" \
-    -e "/\s*operators.operatorframework.io.test/d" \
-    "${dir}/metadata/annotations.yaml" > "${dir}/metadata/annotations.yaml.new"
+  -e "s/package.v1: cockroach-operator/package.v1: ${pkg}/g" \
+  -e "/\s*# Annotations for testing/d" \
+  -e "/\s*operators.operatorframework.io.test/d" \
+  "${dir}/metadata/annotations.yaml" > "${dir}/metadata/annotations.yaml.new"
 
   mv "${dir}/metadata/annotations.yaml.new" "${dir}/metadata/annotations.yaml"
 
@@ -89,9 +89,9 @@ generate_bundle() {
 
   # move the dockerfile into the bundle directory and make it valid
   sed \
-    -e "/\s*tests\/scorecard/d" \
-    -e "s+${dir}/++g" \
-    bundle.Dockerfile > "${dir}/Dockerfile"
+  -e "/\s*tests\/scorecard/d" \
+  -e "s+${dir}/++g" \
+  bundle.Dockerfile > "${dir}/Dockerfile"
 
   rm bundle.Dockerfile
 	rm "${dir}/manifests/cockroach-operator-webhook-service_v1_service.yaml"
@@ -108,9 +108,9 @@ adapt_csv() {
 
   # replace RH_COCKROACH_OP_IMAGE_PLACEHOLDER with the proper image and CREATED_AT_PLACEHOLDER with the current time
   sed \
-    -e "s+RH_COCKROACH_OP_IMAGE_PLACEHOLDER+${img}+g" \
-    -e "s+CREATED_AT_PLACEHOLDER+"$(date +"%FT%H:%M:%SZ")"+g" \
-    "${csv}" > "${csv}.new"
+  -e "s+RH_COCKROACH_OP_IMAGE_PLACEHOLDER+${img}+g" \
+  -e "s+CREATED_AT_PLACEHOLDER+"$(date +"%FT%H:%M:%SZ")"+g" \
+  "${csv}" > "${csv}.new"
 
   mv "${csv}.new" "${csv}"
 }
@@ -122,7 +122,7 @@ patch_marketplace_csv() {
 
   local csv="${1}/cockroachdb-certified-rhmp/manifests/${2}.clusterserviceversion.yaml"
   sed "s+  annotations:+  annotations:\n${rhmp_annotations}+" \
-    "${csv}" > "${csv}.new"
+  "${csv}" > "${csv}.new"
   mv "${csv}.new" "${csv}"
 }
 

hack/redhat.sh

@@ -43,7 +43,7 @@ main() {
 
   case "${1:-}" in
     operator)
-			publish_operator_image
+      publish_operator_image
       preflight_operator;;
     bundle)
 			publish_bundle_image "${REGISTRY}/${BUNDLE_IMAGE}" "bundle/cockroachdb-certified"
@@ -65,15 +65,15 @@ main() {
 publish_operator_image() {
   echo "Publishing operator image to local repo..."
   APP_VERSION="v${VERSION}" \
-    DOCKER_REGISTRY="${REGISTRY}" \
-    DOCKER_IMAGE_REPOSITORY="${IMAGE%:*}" \
-    bazel run --stamp --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //:push_operator_image
+  DOCKER_REGISTRY="${REGISTRY}" \
+  DOCKER_IMAGE_REPOSITORY="${IMAGE%:*}" \
+  bazel run --stamp --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //:push_operator_image
 }
 
 preflight_operator() {
   echo "Running preflight checks on operator image..."
   preflight check container "${REGISTRY}/${IMAGE}" \
-    --docker-config "${HOME}/.docker/config.json"
+  --docker-config "${HOME}/.docker/config.json"
 }
 
 publish_bundle_image() {
@@ -93,17 +93,17 @@ publish_bundle_index() {
 
   echo "Publishing ${index_img}..."
   opm index add \
-    --container-tool docker \
-    --bundles "${bundle_img}" \
-    --tag "${index_img}"
+  --container-tool docker \
+  --bundles "${bundle_img}" \
+  --tag "${index_img}"
 }
 
 preflight_bundle() {
 	local bundle_img="${1}"
 	local index_img="${2}"
 
   echo "Running preflight checks on bundle image..."
-	echo "  IMAGE: ${bundle_img}"
+	echo "IMAGE: ${bundle_img}"
 
 	PFLT_INDEXIMAGE="${index_img}" preflight check operator "${bundle_img}"
 }

install/operator.yaml

@@ -546,6 +546,8 @@ spec:
           value: cockroachdb/cockroach:v22.1.15
         - name: RELATED_IMAGE_COCKROACH_v22_1_16
           value: cockroachdb/cockroach:v22.1.16
+        - name: RELATED_IMAGE_COCKROACH_v22_1_18
+          value: cockroachdb/cockroach:v22.1.18
         - name: RELATED_IMAGE_COCKROACH_v22_2_0
           value: cockroachdb/cockroach:v22.2.0
         - name: RELATED_IMAGE_COCKROACH_v22_2_1
@@ -560,6 +562,8 @@ spec:
           value: cockroachdb/cockroach:v22.2.5
         - name: RELATED_IMAGE_COCKROACH_v22_2_6
           value: cockroachdb/cockroach:v22.2.6
+        - name: RELATED_IMAGE_COCKROACH_v22_2_7
+          value: cockroachdb/cockroach:v22.2.7
         - name: OPERATOR_NAME
           value: cockroachdb
         - name: POD_NAME