Merge pull request #430 from rhrmo/update-metadata-4.21

STOR-2600, OCPBUGS-61436, OCPBUGS-61450: Bump OLM metadata to 4.21

Author: openshift-merge-bot[bot]

Makefile

@@ -1,3 +1,9 @@
+CURPATH=$(PWD)
+BIN_PATH=$(CURPATH)/bin
+YQ = $(BIN_PATH)/yq
+YQ_VERSION = v4.47.1
+export PATH := $(BIN_PATH):$(PATH)
+
 all: build
 .PHONY: all
 
@@ -8,15 +14,28 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
 	golang.mk \
 	targets/openshift/deps-gomod.mk \
 	targets/openshift/images.mk \
+	targets/openshift/yq.mk \
 )
 
+# Bump OCP version in CSV and OLM metadata
+#
+# Example:
+#   make metadata OCP_VERSION=4.20.0
+metadata: ensure-yq
+ifdef OCP_VERSION
+	./hack/update-metadata.sh $(OCP_VERSION)
+else
+	./hack/update-metadata.sh
+endif
+.PHONY: metadata
+
 verify: verify-generated-assets
 
 verify-generated-assets: update-generated-assets
 	git diff --exit-code
 .PHONY: verify-generated-assets
 
-update: update-generated-assets
+update: update-generated-assets metadata
 
 update-generated-assets:
 	hack/update-generated-assets.sh

README.md

@@ -73,6 +73,13 @@ export KUBE_RBAC_PROXY_IMAGE=quay.io/openshift/origin-kube-rbac-proxy:latest
 ./bin/aws-ebs-csi-driver-operator start --kubeconfig $MY_KUBECONFIG --namespace openshift-cluster-csi-drivers
 ```
 
+## Bumping OCP version in CSV and OLM metadata
+
+This updates the package versions in `config/aws-efs/manifests/aws-efs-csi-driver-operator.package.yaml`, `config/aws-efs/manifests/stable/aws-efs-csi-driver-operator.clusterserviceversion.yaml`, `config/samba/manifests/smb-csi-driver-operator.package.yaml`, `config/samba/manifests/stable/smb-csi-driver-operator.clusterserviceversion.yaml` to 4.20:
+```
+./hack/update-metadata.sh 4.20
+```
+
 ## Migrating an existing operator
 
 If you are looking to migrate an existing CSI Driver operator to the combined `csi-operator` operator, refer to [the docs](docs/migrating-operators.md)

config/aws-efs/manifests/aws-efs-csi-driver-operator.package.yaml

@@ -1,4 +1,4 @@
 packageName: aws-efs-csi-driver-operator
 channels:
-- name: stable
-  currentCSV: aws-efs-csi-driver-operator.v4.20.0
+  - name: stable
+    currentCSV: aws-efs-csi-driver-operator.v4.21.0