From 26473e7a848bc6baa64855ed893f2e32b51852c6 Mon Sep 17 00:00:00 2001 From: Maxim Patlasov Date: Wed, 16 Oct 2024 15:39:30 +0200 Subject: [PATCH] STOR-1844: update OLM manifests to use stable channel --- config/samba/bundle.Dockerfile | 6 +++--- config/samba/manifests/art.yaml | 2 +- config/samba/manifests/preview | 1 + config/samba/manifests/smb-csi-driver-operator.package.yaml | 2 +- config/samba/manifests/{preview => stable}/image-references | 0 .../smb-csi-driver-operator.clusterserviceversion.yaml | 2 +- config/samba/metadata/annotations.yaml | 4 ++-- hack/create-samba-bundle | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) create mode 120000 config/samba/manifests/preview rename config/samba/manifests/{preview => stable}/image-references (100%) rename config/samba/manifests/{preview => stable}/smb-csi-driver-operator.clusterserviceversion.yaml (99%) diff --git a/config/samba/bundle.Dockerfile b/config/samba/bundle.Dockerfile index 6e8560cac..643213583 100644 --- 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 index 960ca91f0..90341a254 100644 --- 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 new file mode 120000 index 000000000..1911e6b8e --- /dev/null +++ b/config/samba/manifests/preview @@ -0,0 +1 @@ +stable/ \ No newline at end of file diff --git a/config/samba/manifests/smb-csi-driver-operator.package.yaml b/config/samba/manifests/smb-csi-driver-operator.package.yaml index 14b06d19c..1e742151f 100644 --- 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/config/samba/manifests/preview/image-references b/config/samba/manifests/stable/image-references similarity index 100% rename from config/samba/manifests/preview/image-references rename to config/samba/manifests/stable/image-references diff --git a/config/samba/manifests/preview/smb-csi-driver-operator.clusterserviceversion.yaml b/config/samba/manifests/stable/smb-csi-driver-operator.clusterserviceversion.yaml similarity index 99% rename from config/samba/manifests/preview/smb-csi-driver-operator.clusterserviceversion.yaml rename to config/samba/manifests/stable/smb-csi-driver-operator.clusterserviceversion.yaml index 37af065c7..26cb3e7a6 100644 --- a/config/samba/manifests/preview/smb-csi-driver-operator.clusterserviceversion.yaml +++ b/config/samba/manifests/stable/smb-csi-driver-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: aos-storage-staff@redhat.com name: Red Hat diff --git a/config/samba/metadata/annotations.yaml b/config/samba/metadata/annotations.yaml index 5d56ba18c..c44b9f0c1 100644 --- 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 index 50a771f59..8869d45ab 100755 --- 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~" \