Update CSV and metadata annotations for openshift certification (#1024)

cockroachdb · Mar 14, 2024 · bb7b6cc · bb7b6cc
1 parent 1f64bd0
commit bb7b6cc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
@@ -29,6 +29,13 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/cockroachdb/cockroach-operator
     support: Cockroach Labs
+    features.operators.openshift.io/disconnected: "true"
+    features.operators.openshift.io/fips-compliant: "false"
+    features.operators.openshift.io/proxy-aware: "false"
+    features.operators.openshift.io/tls-profiles: "false"
+    features.operators.openshift.io/token-auth-aws: "false"
+    features.operators.openshift.io/token-auth-azure: "false"
+    features.operators.openshift.io/token-auth-gcp: "false"
   name: cockroach-operator.v0.0.0
   namespace: placeholder
 spec:

diff --git a/config/templates/csv.yaml.in b/config/templates/csv.yaml.in
@@ -29,6 +29,13 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/cockroachdb/cockroach-operator
     support: Cockroach Labs
+    features.operators.openshift.io/disconnected: "true"
+    features.operators.openshift.io/fips-compliant: "false"
+    features.operators.openshift.io/proxy-aware: "false"
+    features.operators.openshift.io/tls-profiles: "false"
+    features.operators.openshift.io/token-auth-aws: "false"
+    features.operators.openshift.io/token-auth-azure: "false"
+    features.operators.openshift.io/token-auth-gcp: "false"
   name: cockroach-operator.v0.0.0
   namespace: placeholder
 spec:

diff --git a/hack/bundle.sh b/hack/bundle.sh
@@ -75,8 +75,10 @@ generate_bundle() {
   --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.
+  # the testing annotations since these are handled automatically upstream. Also add openshift version annotation
+  local openshift_version_annotation="  com.redhat.openshift.versions: v4.8"
   sed \
+  -e "s+annotations:+annotations:\n  # Minimum Openshift version annotation\n${openshift_version_annotation}+" \
   -e "s/package.v1: cockroach-operator/package.v1: ${pkg}/g" \
   -e "/\s*# Annotations for testing/d" \
   -e "/\s*operators.operatorframework.io.test/d" \