Merge pull request #300 from mpatlasov/STOR-1844-update-OLM-manifests…

…-to-use-stable-channel STOR-1844: update OLM manifests to use stable channel
openshift · Oct 16, 2024 · 7280bd6 · 7280bd6
2 parents e9b462f + 26473e7
commit 7280bd6
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/config/samba/bundle.Dockerfile b/config/samba/bundle.Dockerfile
@@ -3,7 +3,7 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=smb-csi-driver-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=preview
-LABEL operators.operatorframework.io.bundle.channel.default.v1=preview
-COPY manifests/preview/smb-csi-driver-operator.clusterserviceversion.yaml /manifests/smb-csi-driver-operator.clusterserviceversion.yaml
+LABEL operators.operatorframework.io.bundle.channels.v1=stable
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
+COPY manifests/stable/smb-csi-driver-operator.clusterserviceversion.yaml /manifests/smb-csi-driver-operator.clusterserviceversion.yaml
 COPY metadata/annotations.yaml /metadata/annotations.yaml
diff --git a/config/samba/manifests/art.yaml b/config/samba/manifests/art.yaml
@@ -1,5 +1,5 @@
 updates:
-  - file: "preview/smb-csi-driver-operator.clusterserviceversion.yaml" # relative to this file
+  - file: "stable/smb-csi-driver-operator.clusterserviceversion.yaml" # relative to this file
     update_list:
     # replace metadata.name value
     - search: "smb-csi-driver-operator.v{MAJOR}.{MINOR}.0"

diff --git a/config/samba/manifests/preview b/config/samba/manifests/preview
@@ -0,0 +1 @@
+stable/
diff --git a/config/samba/manifests/smb-csi-driver-operator.package.yaml b/config/samba/manifests/smb-csi-driver-operator.package.yaml
@@ -1,4 +1,4 @@
 packageName: smb-csi-driver-operator
 channels:
-- name: preview
+- name: stable
   currentCSV: smb-csi-driver-operator.v4.18.0
diff --git a/.../samba/manifests/preview/image-references → ...g/samba/manifests/stable/image-references b/.../samba/manifests/preview/image-references → ...g/samba/manifests/stable/image-references
diff --git a/...river-operator.clusterserviceversion.yaml → ...river-operator.clusterserviceversion.yaml b/...river-operator.clusterserviceversion.yaml → ...river-operator.clusterserviceversion.yaml
@@ -45,7 +45,7 @@ spec:
     - name: Source Repository
       url: https://github.com/openshift/csi-operator
   version: 4.18.0
-  maturity: preview
+  maturity: stable
   maintainers:
     - email: [email protected]
       name: Red Hat

diff --git a/config/samba/metadata/annotations.yaml b/config/samba/metadata/annotations.yaml
@@ -1,6 +1,6 @@
 annotations:
-  operators.operatorframework.io.bundle.channel.default.v1: preview
-  operators.operatorframework.io.bundle.channels.v1: preview
+  operators.operatorframework.io.bundle.channel.default.v1: stable
+  operators.operatorframework.io.bundle.channels.v1: stable
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.metadata.v1: metadata/

diff --git a/hack/create-samba-bundle b/hack/create-samba-bundle
@@ -30,7 +30,7 @@ mkdir -p opm-bundle
 pushd opm-bundle
 cp -r -v ../../config/samba/* .
 
-MANIFEST=manifests/preview/smb-csi-driver-operator.clusterserviceversion.yaml
+MANIFEST=manifests/stable/smb-csi-driver-operator.clusterserviceversion.yaml
 
 # Replace images in the manifest - error prone, needs to be in sync with image-references.
 sed -i.bak -e "s~quay.io/openshift/origin-smb-csi-driver-operator:latest~$OPERATOR_IMAGE~" \