From 02bd57499ab97691e33252a5fac48100983af3f3 Mon Sep 17 00:00:00 2001 From: Adrien Gentil Date: Tue, 27 Feb 2024 14:28:21 +0100 Subject: [PATCH] MGMT-16884: ClusterServiceVersion for release 2.10 branch references "latest" tag --- Makefile | 2 +- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 12 +++++----- deploy/olm-catalog/bundle.Dockerfile | 2 +- ...ervice-operator.clusterserviceversion.yaml | 24 +++++++++---------- deploy/olm-catalog/metadata/annotations.yaml | 2 +- deploy/operator/setup_assisted_operator.sh | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 3cf4478e46d..d38edbdd735 100644 --- a/Makefile +++ b/Makefile @@ -126,7 +126,7 @@ endif # Operator Vars - these must be kept up to date BUNDLE_CHANNELS ?= alpha,ocm-2.10 BUNDLE_OUTPUT_DIR ?= deploy/olm-catalog -BUNDLE_METADATA_OPTS ?= --channels=$(BUNDLE_CHANNELS) --default-channel=alpha +BUNDLE_METADATA_OPTS ?= --channels=$(BUNDLE_CHANNELS) --default-channel=ocm-2.10 # We decided to have an option to change replicas count only while running locally # check if SERVICE_REPLICAS_COUNT was set and if yes change default value to required one diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index fd9daba88a0..9919bc4a52d 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -3,6 +3,6 @@ kind: Kustomization images: - name: controller newName: quay.io/edge-infrastructure/assisted-service - newTag: latest + newTag: ocm-2.10 resources: - manager.yaml diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 9ef7b9a2737..717ae383a52 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -27,21 +27,21 @@ spec: - /assisted-service-operator args: - --leader-elect - image: quay.io/edge-infrastructure/assisted-service:latest + image: quay.io/edge-infrastructure/assisted-service:ocm-2.10 name: manager env: - name: SERVICE_IMAGE - value: quay.io/edge-infrastructure/assisted-service:latest + value: quay.io/edge-infrastructure/assisted-service:ocm-2.10 - name: IMAGE_SERVICE_IMAGE - value: quay.io/edge-infrastructure/assisted-image-service:latest + value: quay.io/edge-infrastructure/assisted-image-service:ocm-2.10 - name: DATABASE_IMAGE value: quay.io/centos7/postgresql-12-centos7:latest - name: AGENT_IMAGE - value: quay.io/edge-infrastructure/assisted-installer-agent:latest + value: quay.io/edge-infrastructure/assisted-installer-agent:ocm-2.10 - name: CONTROLLER_IMAGE - value: quay.io/edge-infrastructure/assisted-installer-controller:latest + value: quay.io/edge-infrastructure/assisted-installer-controller:ocm-2.10 - name: INSTALLER_IMAGE - value: quay.io/edge-infrastructure/assisted-installer:latest + value: quay.io/edge-infrastructure/assisted-installer:ocm-2.10 - name: OS_IMAGES value: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.9/4.9.45/rhcos-4.9.45-x86_64-live.x86_64.iso","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-x86_64-live.x86_64.iso","version":"410.84.202210040010-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-aarch64-live.aarch64.iso","version":"410.84.202210040011-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-x86_64-live.x86_64.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-aarch64-live.aarch64.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-s390x-live.s390x.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-ppc64le-live.ppc64le.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-x86_64-live.x86_64.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-aarch64-live.aarch64.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-s390x-live.s390x.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-ppc64le-live.ppc64le.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.13","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-x86_64-live.x86_64.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-aarch64-live.aarch64.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-ppc64le-live.ppc64le.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-s390x-live.s390x.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-x86_64-live.x86_64.iso","version":"414.92.202310170514-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-aarch64-live.aarch64.iso","version":"414.92.202310170514-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-ppc64le-live.ppc64le.iso","version":"414.92.202309201615-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-s390x-live.s390x.iso","version":"414.92.202309201615-0"},{"openshift_version":"4.15","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.15.0-rc.0/rhcos-4.15.0-rc.0-x86_64-live.x86_64.iso","version":"415.92.202311241643-0"},{"openshift_version":"4.15","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.15.0-rc.0/rhcos-4.15.0-rc.0-aarch64-live.aarch64.iso","version":"415.92.202311241643-0"},{"openshift_version":"4.15","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.15.0-rc.0/rhcos-4.15.0-rc.0-ppc64le-live.ppc64le.iso","version":"415.92.202311241643-0"},{"openshift_version":"4.15","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/pre-release/4.15.0-rc.0/rhcos-4.15.0-rc.0-s390x-live.s390x.iso","version":"415.92.202311241643-0"}]' # os images - name: SERVICE_ACCOUNT_NAME diff --git a/deploy/olm-catalog/bundle.Dockerfile b/deploy/olm-catalog/bundle.Dockerfile index 30659ae9007..81599d7a41c 100644 --- a/deploy/olm-catalog/bundle.Dockerfile +++ b/deploy/olm-catalog/bundle.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=assisted-service-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha,ocm-2.10 -LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha +LABEL operators.operatorframework.io.bundle.channel.default.v1=ocm-2.10 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.10.0+git LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml b/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml index 325f515cde2..f83bf1a5fec 100644 --- a/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml @@ -203,7 +203,7 @@ metadata: ] capabilities: Basic Install categories: OpenShift Optional - containerImage: quay.io/edge-infrastructure/assisted-service:latest + containerImage: quay.io/edge-infrastructure/assisted-service:ocm-2.10 createdAt: "" description: The Infrastructure Operator for Red Hat OpenShift is responsible for managing the deployment of the Assisted Service. @@ -947,17 +947,17 @@ spec: - /assisted-service-operator env: - name: SERVICE_IMAGE - value: quay.io/edge-infrastructure/assisted-service:latest + value: quay.io/edge-infrastructure/assisted-service:ocm-2.10 - name: IMAGE_SERVICE_IMAGE - value: quay.io/edge-infrastructure/assisted-image-service:latest + value: quay.io/edge-infrastructure/assisted-image-service:ocm-2.10 - name: DATABASE_IMAGE value: quay.io/centos7/postgresql-12-centos7:latest - name: AGENT_IMAGE - value: quay.io/edge-infrastructure/assisted-installer-agent:latest + value: quay.io/edge-infrastructure/assisted-installer-agent:ocm-2.10 - name: CONTROLLER_IMAGE - value: quay.io/edge-infrastructure/assisted-installer-controller:latest + value: quay.io/edge-infrastructure/assisted-installer-controller:ocm-2.10 - name: INSTALLER_IMAGE - value: quay.io/edge-infrastructure/assisted-installer:latest + value: quay.io/edge-infrastructure/assisted-installer:ocm-2.10 - name: OS_IMAGES value: '[{"openshift_version":"4.9","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.9/4.9.45/rhcos-4.9.45-x86_64-live.x86_64.iso","version":"49.84.202207192205-0"},{"openshift_version":"4.10","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-x86_64-live.x86_64.iso","version":"410.84.202210040010-0"},{"openshift_version":"4.10","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.10/4.10.37/rhcos-4.10.37-aarch64-live.aarch64.iso","version":"410.84.202210040011-0"},{"openshift_version":"4.11","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-x86_64-live.x86_64.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-aarch64-live.aarch64.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-s390x-live.s390x.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.11","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-ppc64le-live.ppc64le.iso","version":"411.86.202308081056-0"},{"openshift_version":"4.12","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-x86_64-live.x86_64.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-aarch64-live.aarch64.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-s390x-live.s390x.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.12","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-ppc64le-live.ppc64le.iso","version":"412.86.202308081039-0"},{"openshift_version":"4.13","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-x86_64-live.x86_64.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-aarch64-live.aarch64.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-ppc64le-live.ppc64le.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.13","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.13/4.13.10/rhcos-4.13.10-s390x-live.s390x.iso","version":"413.92.202307260246-0"},{"openshift_version":"4.14","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-x86_64-live.x86_64.iso","version":"414.92.202310170514-0"},{"openshift_version":"4.14","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-aarch64-live.aarch64.iso","version":"414.92.202310170514-0"},{"openshift_version":"4.14","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-ppc64le-live.ppc64le.iso","version":"414.92.202309201615-0"},{"openshift_version":"4.14","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/4.14/4.14.0/rhcos-4.14.0-s390x-live.s390x.iso","version":"414.92.202309201615-0"},{"openshift_version":"4.15","cpu_architecture":"x86_64","url":"https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/pre-release/4.15.0-rc.0/rhcos-4.15.0-rc.0-x86_64-live.x86_64.iso","version":"415.92.202311241643-0"},{"openshift_version":"4.15","cpu_architecture":"arm64","url":"https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.15.0-rc.0/rhcos-4.15.0-rc.0-aarch64-live.aarch64.iso","version":"415.92.202311241643-0"},{"openshift_version":"4.15","cpu_architecture":"ppc64le","url":"https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/pre-release/4.15.0-rc.0/rhcos-4.15.0-rc.0-ppc64le-live.ppc64le.iso","version":"415.92.202311241643-0"},{"openshift_version":"4.15","cpu_architecture":"s390x","url":"https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/pre-release/4.15.0-rc.0/rhcos-4.15.0-rc.0-s390x-live.s390x.iso","version":"415.92.202311241643-0"}]' - name: SERVICE_ACCOUNT_NAME @@ -972,7 +972,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name - image: quay.io/edge-infrastructure/assisted-service:latest + image: quay.io/edge-infrastructure/assisted-service:ocm-2.10 livenessProbe: httpGet: path: /healthz @@ -1085,16 +1085,16 @@ spec: provider: name: Red Hat relatedImages: - - image: quay.io/edge-infrastructure/assisted-service:latest + - image: quay.io/edge-infrastructure/assisted-service:ocm-2.10 name: controller - - image: quay.io/edge-infrastructure/assisted-image-service:latest + - image: quay.io/edge-infrastructure/assisted-image-service:ocm-2.10 name: image-service - image: quay.io/centos7/postgresql-12-centos7:latest name: postgresql - - image: quay.io/edge-infrastructure/assisted-installer:latest + - image: quay.io/edge-infrastructure/assisted-installer:ocm-2.10 name: installer - - image: quay.io/edge-infrastructure/assisted-installer-agent:latest + - image: quay.io/edge-infrastructure/assisted-installer-agent:ocm-2.10 name: agent - - image: quay.io/edge-infrastructure/assisted-installer-controller:latest + - image: quay.io/edge-infrastructure/assisted-installer-controller:ocm-2.10 name: reporter version: 99.0.0-unreleased diff --git a/deploy/olm-catalog/metadata/annotations.yaml b/deploy/olm-catalog/metadata/annotations.yaml index 93ad45acdc2..f7c67a4ae9c 100644 --- a/deploy/olm-catalog/metadata/annotations.yaml +++ b/deploy/olm-catalog/metadata/annotations.yaml @@ -5,7 +5,7 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: assisted-service-operator operators.operatorframework.io.bundle.channels.v1: alpha,ocm-2.10 - operators.operatorframework.io.bundle.channel.default.v1: alpha + operators.operatorframework.io.bundle.channel.default.v1: ocm-2.10 operators.operatorframework.io.metrics.builder: operator-sdk-v1.10.0+git operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/deploy/operator/setup_assisted_operator.sh b/deploy/operator/setup_assisted_operator.sh index e0072724fd2..3195d75c9e8 100755 --- a/deploy/operator/setup_assisted_operator.sh +++ b/deploy/operator/setup_assisted_operator.sh @@ -153,7 +153,7 @@ $(subscription_config) installPlanApproval: Automatic name: assisted-service-operator source: ${catalog_source_name} - channel: ${CHANNEL:-alpha} + channel: ${CHANNEL:-ocm-2.10} sourceNamespace: openshift-marketplace EOCR