Fix the jobs to release on openshift certification (#998)

* Fix the jobs to release on openshift certification * Update CRDB versions * Add additional env variables to CSV for certification
cockroachdb · Jul 28, 2023 · 807ae69 · 807ae69
1 parent da60e7b
commit 807ae69
Show file tree

Hide file tree

Showing 11 changed files with 257 additions and 211 deletions.
diff --git a/build/release/teamcity-publish-openshift.sh b/build/release/teamcity-publish-openshift.sh
@@ -18,8 +18,8 @@ set -euxo pipefail
 source "$(dirname "${0}")/teamcity-support.sh"
 
 RH_PROJECT_ID="5e6027425c5456060d5f6084"
-RH_REGISTRY="scan.connect.redhat.com"
-RH_OPERATOR_IMG="${RH_REGISTRY}/ospid-cf721588-ad8a-4618-938c-5191c5e10ae4/cockroachdb-operator:${TAG}"
+RH_REGISTRY="quay.io"
+RH_OPERATOR_IMG="${RH_REGISTRY}/redhat-isv-containers/${RH_PROJECT_ID}:${TAG}"
 
 OPERATOR_IMG="docker.io/cockroachdb/cockroach-operator:${TAG}"
 if ! [[ -z "${DRY_RUN}" ]] ; then

diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml
@@ -214,6 +214,8 @@ spec:
               value: cockroachdb/cockroach:v22.2.9
             - name: RELATED_IMAGE_COCKROACH_v22_2_10
               value: cockroachdb/cockroach:v22.2.10
+            - name: RELATED_IMAGE_COCKROACH_v22_2_12
+              value: cockroachdb/cockroach:v22.2.12
             - name: RELATED_IMAGE_COCKROACH_v23_1_0
               value: cockroachdb/cockroach:v23.1.0
             - name: RELATED_IMAGE_COCKROACH_v23_1_1
@@ -226,3 +228,5 @@ spec:
               value: cockroachdb/cockroach:v23.1.4
             - name: RELATED_IMAGE_COCKROACH_v23_1_5
               value: cockroachdb/cockroach:v23.1.5
+            - name: RELATED_IMAGE_COCKROACH_v23_1_6
+              value: cockroachdb/cockroach:v23.1.6
diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
diff --git a/config/manifests/patches/deployment_patch.yaml b/config/manifests/patches/deployment_patch.yaml
@@ -223,6 +223,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9ab968e4ca62f23bf9848e5475ef4076df7318a8560f63d5b2090a32af6fe4e2
             - name: RELATED_IMAGE_COCKROACH_v22_2_10
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:818f592c50d4ed5599faa053344f7ecd963003352f1faa3b72dc0f5e00a0e78b
+            - name: RELATED_IMAGE_COCKROACH_v22_2_12
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51
             - name: RELATED_IMAGE_COCKROACH_v23_1_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682
             - name: RELATED_IMAGE_COCKROACH_v23_1_1
@@ -235,4 +237,6 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:42c9930d6861f6a2147ed6e01827eddd730279966763ec68868567a19cc164ab
             - name: RELATED_IMAGE_COCKROACH_v23_1_5
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3
+            - name: RELATED_IMAGE_COCKROACH_v23_1_6
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb
           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: v23.1.5
+  cockroachDBVersion: v23.1.6
   dataStore:
     pvc:
       spec:

diff --git a/config/templates/csv.yaml.in b/config/templates/csv.yaml.in
@@ -96,6 +96,16 @@ spec:
           expose the services using Ingress
         displayName: Cockroach Database Ingress
         path: ingress
+      - description: '(Optional) LogConfigMap define the config map which contains
+          log configuration used to send the logs through the proper channels in the
+          cockroachdb. Logging configuration is available for cockroach version v21.1.0
+          onwards. The logging configuration is taken in format of yaml file, you
+          can check the logging configuration here (https://www.cockroachlabs.com/docs/stable/configure-logs.html#default-logging-configuration)
+          The default logging for cockroach version v20.x or less is stderr, logging
+          API is ignored for older versions. NOTE: The `data` field of map must contain
+          an entry called `logging.yaml` that contains config options.'
+        displayName: Cockroach Database Logging configuration config map
+        path: logConfigMap
       - description: (Optional) If specified, the pod's nodeSelector
         displayName: Map of nodeSelectors to match when scheduling pods on nodes
         path: nodeSelector
@@ -181,9 +191,11 @@ spec:
   minKubeVersion: 1.18.0
   provider:
     name: Cockroach Labs
-  version: 0.0.0
   relatedImages:
 {{- range .CrdbVersions}}
-  - name: RELATED_IMAGE_COCKROACH_{{ underscore .Tag }}
-    image: {{ .RedhatImage }}
+  - image: {{ .RedhatImage }}
+    name: RELATED_IMAGE_COCKROACH_{{ underscore .Tag }}
 {{- end }}
+  - image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
+    name: RELATED_IMAGE_COCKROACH_OPERATOR
+  version: 0.0.0
diff --git a/crdb-versions.yaml b/crdb-versions.yaml
@@ -304,6 +304,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v22.2.10
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:818f592c50d4ed5599faa053344f7ecd963003352f1faa3b72dc0f5e00a0e78b
   tag: v22.2.10
+- image: cockroachdb/cockroach:v22.2.12
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51
+  tag: v22.2.12
 - image: cockroachdb/cockroach:v23.1.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682
   tag: v23.1.0
@@ -322,3 +325,6 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v23.1.5
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3
   tag: v23.1.5
+- image: cockroachdb/cockroach:v23.1.6
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb
+  tag: v23.1.6
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:v23.1.5
+    image: cockroachdb/cockroach:v23.1.6
     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: v23.1.5
+# cockroachDBVersion: v23.1.6
   image:
-    name: cockroachdb/cockroach:v23.1.5
+    name: cockroachdb/cockroach:v23.1.6
   # 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:v23.1.5
+    name: cockroachdb/cockroach:v23.1.6
   nodes: 3
diff --git a/install/operator.yaml b/install/operator.yaml
@@ -572,6 +572,8 @@ spec:
           value: cockroachdb/cockroach:v22.2.9
         - name: RELATED_IMAGE_COCKROACH_v22_2_10
           value: cockroachdb/cockroach:v22.2.10
+        - name: RELATED_IMAGE_COCKROACH_v22_2_12
+          value: cockroachdb/cockroach:v22.2.12
         - name: RELATED_IMAGE_COCKROACH_v23_1_0
           value: cockroachdb/cockroach:v23.1.0
         - name: RELATED_IMAGE_COCKROACH_v23_1_1
@@ -584,6 +586,8 @@ spec:
           value: cockroachdb/cockroach:v23.1.4
         - name: RELATED_IMAGE_COCKROACH_v23_1_5
           value: cockroachdb/cockroach:v23.1.5
+        - name: RELATED_IMAGE_COCKROACH_v23_1_6
+          value: cockroachdb/cockroach:v23.1.6
         - name: OPERATOR_NAME
           value: cockroachdb
         - name: POD_NAME