Switch to stable channel

openshift · Oct 11, 2022 · 01a4669 · 01a4669
1 parent ebde549
commit 01a4669
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -13,14 +13,14 @@ GO_BUILD_BINDIR := bin
 GO_TEST_PACKAGES :=./pkg/... ./cmd/...
 
 KUBECTL = kubectl
-VERSION := 4.11
+VERSION := 4.12
 
 OPERATOR_NAMESPACE 			:= clusterresourceoverride-operator
 OPERATOR_DEPLOYMENT_NAME 	:= clusterresourceoverride-operator
 
 export OLD_OPERATOR_IMAGE_URL_IN_CSV 	= quay.io/openshift/clusterresourceoverride-rhel8-operator:$(VERSION)
 export OLD_OPERAND_IMAGE_URL_IN_CSV 	= quay.io/openshift/clusterresourceoverride-rhel8:$(VERSION)
-export CSV_FILE_PATH_IN_REGISTRY_IMAGE 	= /manifests/$(VERSION)/clusterresourceoverride-operator.v$(VERSION).0.clusterserviceversion.yaml
+export CSV_FILE_PATH_IN_REGISTRY_IMAGE 	= /manifests/stable/clusterresourceoverride-operator.clusterserviceversion.yaml
 
 LOCAL_OPERATOR_IMAGE	?= quay.io/redhat/clusterresourceoverride-operator:latest
 LOCAL_OPERAND_IMAGE 	?= quay.io/redhat/clusterresourceoverride:latest
@@ -105,7 +105,7 @@ deploy:
 	rm -rf $(KUBE_MANIFESTS_DIR)
 	mkdir -p $(KUBE_MANIFESTS_DIR)
 	cp -r $(KUBE_MANIFESTS_SOURCE)/* $(KUBE_MANIFESTS_DIR)/
-	cp manifests/$(VERSION)/clusterresourceoverride.crd.yaml $(KUBE_MANIFESTS_DIR)/
+	cp manifests/stable/clusterresourceoverride.crd.yaml $(KUBE_MANIFESTS_DIR)/
 	cp $(ARTIFACTS)/registry-env.yaml $(KUBE_MANIFESTS_DIR)/
 
 	$(REGISTRY_SETUP_BINARY) --mode=$(DEPLOY_MODE) --olm=false --configmap=$(CONFIGMAP_ENV_FILE)
@@ -134,7 +134,7 @@ olm-generate:
 
 	sed "s/OPERATOR_NAMESPACE_PLACEHOLDER/$(OPERATOR_NAMESPACE)/g" -i "$(OPERATOR_GROUP_FILE)"
 	sed "s/OPERATOR_NAMESPACE_PLACEHOLDER/$(OPERATOR_NAMESPACE)/g" -i "$(SUBSCRIPTION_FILE)"
-	sed "s/OPERATOR_PACKAGE_CHANNEL/\"$(VERSION)\"/g" -i "$(SUBSCRIPTION_FILE)"
+	sed "s/OPERATOR_PACKAGE_CHANNEL/\"stable\"/g" -i "$(SUBSCRIPTION_FILE)"
 
 # generate kube resources to deploy operator registry image using an init container.
 operator-registry-generate: OPERATOR_REGISTRY_DEPLOYMENT_YAML := "$(OPERATOR_REGISTRY_MANIFESTS_DIR)/registry-deployment.yaml"
@@ -173,13 +173,13 @@ operator-registry-deploy: bin/yaml2json
 # in ci the operator registry image is built by ci agent.
 # on the other hand, in local mode, we need to build the image.
 operator-registry-image-ci:
-	docker build --build-arg VERSION=4.4 -t $(LOCAL_OPERATOR_REGISTRY_IMAGE) -f images/operator-registry/Dockerfile.registry.ci .
+	docker build --build-arg VERSION=$(VERSION) -t $(LOCAL_OPERATOR_REGISTRY_IMAGE) -f images/operator-registry/Dockerfile.registry.ci .
 	docker push $(LOCAL_OPERATOR_REGISTRY_IMAGE)
 
 # build and push the OLM manifests for this operator into an operator-registry image.
 # this builds an image with the generated database, (unlike image used for ci)
 operator-registry-image: MANIFESTS_DIR := "$(OUTPUT_DIR)/manifests"
-operator-registry-image: CSV_FILE := "$(MANIFESTS_DIR)/$(VERSION)/clusterresourceoverride-operator.v$(VERSION).0.clusterserviceversion.yaml"
+operator-registry-image: CSV_FILE := "$(MANIFESTS_DIR)/stable/clusterresourceoverride-operator.clusterserviceversion.yaml"
 operator-registry-image:
 	rm -rf $(MANIFESTS_DIR)
 	mkdir -p $(MANIFESTS_DIR)

diff --git a/images/ci/Dockerfile b/images/ci/Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 
 RUN make build
 
-FROM registry.ci.openshift.org/ocp/4.11:base
+FROM registry.ci.openshift.org/ocp/4.12:base
 
 COPY --from=builder /go/src/github.com/openshift/cluster-resource-override-admission-operator/bin/cluster-resource-override-admission-operator /usr/bin/
 
diff --git a/manifests/clusterresourceoverride-operator.package.yaml b/manifests/clusterresourceoverride-operator.package.yaml
@@ -1,4 +1,4 @@
 packageName: clusterresourceoverride
 channels:
-  - name: "4.11"
-    currentCSV: clusterresourceoverride-operator.v4.11.0
+  - name: stable
+    currentCSV: clusterresourceoverride-operator.v4.12.0
diff --git a/...erator.v4.11.0.clusterserviceversion.yaml → ...rride-operator.clusterserviceversion.yaml b/...erator.v4.11.0.clusterserviceversion.yaml → ...rride-operator.clusterserviceversion.yaml
@@ -6,16 +6,16 @@ metadata:
     capabilities: Seamless Upgrades
     categories: OpenShift Optional
     certifiedLevel: Primed
-    olm.skipRange: ">=4.3.0 <4.11.0"
-    containerImage: quay.io/openshift/clusterresourceoverride-rhel8-operator:4.11
+    olm.skipRange: ">=4.3.0 <4.12.0"
+    containerImage: quay.io/openshift/clusterresourceoverride-rhel8-operator:4.12
     createdAt: 2019/11/15
     description: An operator to manage the OpenShift ClusterResourceOverride Mutating Admission Webhook Server
     healthIndex: B
     repository: https://github.com/openshift/cluster-resource-override-admission-operator
     support: Red Hat
   labels:
     operatorframework.io/arch.amd64: supported
-  name: clusterresourceoverride-operator.v4.11.0
+  name: clusterresourceoverride-operator.v4.12.0
   namespace: clusterresourceoverride-operator
 spec:
   customresourcedefinitions:
@@ -290,7 +290,7 @@ spec:
                 serviceAccountName: clusterresourceoverride-operator
                 containers:
                   - name: clusterresourceoverride-operator
-                    image: quay.io/openshift/clusterresourceoverride-rhel8-operator:4.11
+                    image: quay.io/openshift/clusterresourceoverride-rhel8-operator:4.12
                     imagePullPolicy: Always
                     command:
                       - /usr/bin/cluster-resource-override-admission-operator
@@ -308,7 +308,7 @@ spec:
                           fieldRef:
                             fieldPath: metadata.namespace
                       - name: OPERAND_IMAGE
-                        value: quay.io/openshift/clusterresourceoverride-rhel8:4.11
+                        value: quay.io/openshift/clusterresourceoverride-rhel8:4.12
                       - name: OPERAND_VERSION
                         value: 1.0.0
                     ports:
@@ -347,10 +347,10 @@ spec:
     - efficiency
   labels:
     olm-owner-enterprise-app: clusterresourceoverride-operator
-    olm-status-descriptors: clusterresourceoverride-operator.v4.9.0
+    olm-status-descriptors: clusterresourceoverride-operator.v4.12.0
   maintainers:
     - email: support@redhat.com
       name: Red Hat
   provider:
     name: Red Hat
-  version: 4.11.0
+  version: 4.12.0
diff --git a/...sts/4.11/clusterresourceoverride.crd.yaml → ...s/stable/clusterresourceoverride.crd.yaml b/...sts/4.11/clusterresourceoverride.crd.yaml → ...s/stable/clusterresourceoverride.crd.yaml
diff --git a/manifests/4.11/image-references → manifests/stable/image-references b/manifests/4.11/image-references → manifests/stable/image-references
@@ -6,8 +6,8 @@ spec:
   - name: clusterresourceoverride-rhel8-operator
     from:
       kind: DockerImage
-      name: quay.io/openshift/clusterresourceoverride-rhel8-operator:4.11
+      name: quay.io/openshift/clusterresourceoverride-rhel8-operator:4.12
   - name: clusterresourceoverride-rhel8
     from:
       kind: DockerImage
-      name: quay.io/openshift/clusterresourceoverride-rhel8:4.11
+      name: quay.io/openshift/clusterresourceoverride-rhel8:4.12