From 5cd8348f56b72cf70841eba1e3933dd39775426a Mon Sep 17 00:00:00 2001 From: Nitesh-Rewatkar <90749010+nitesh3108@users.noreply.github.com> Date: Wed, 4 Sep 2024 12:36:20 +0530 Subject: [PATCH] operator version bump up (#676) --- Dockerfile | 2 +- .../dell-csm-operator.clusterserviceversion.yaml | 14 +++++++------- config/install/kustomization.yaml | 2 +- config/manager/kustomization.yaml | 2 +- .../dell-csm-operator.clusterserviceversion.yaml | 10 +++++----- controllers/csm_controller.go | 2 +- deploy/olm/operator_community.yaml | 2 +- deploy/operator.yaml | 6 +++--- docker.mk | 8 ++++---- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3ebaeffa..3d7345fc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ LABEL vendor="Dell Inc." \ name="dell-csm-operator" \ summary="Operator for installing Dell CSI Drivers and Dell CSM Modules" \ description="Common Operator for installing various Dell CSI Drivers and Dell CSM Modules" \ - version="1.6.0" \ + version="1.7.0" \ license="Dell CSM Operator Apache License" # copy the licenses folder diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index 524e15b67..58dfedf93 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -1446,7 +1446,7 @@ metadata: ] capabilities: Seamless Upgrades categories: Storage - containerImage: docker.io/dellemc/dell-csm-operator:v1.6.0 + containerImage: docker.io/dellemc/dell-csm-operator:v1.7.0 createdAt: "2024-07-24T08:27:49Z" description: Easily install and manage Dell’s CSI Drivers and CSM features.operators.openshift.io/disconnected: "true" @@ -1460,7 +1460,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/dell/csm-operator support: Dell Technologies - name: dell-csm-operator.v1.6.0 + name: dell-csm-operator.v1.7.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -4397,7 +4397,7 @@ spec: - /manager env: - name: RELATED_IMAGE_dell-csm-operator - value: docker.io/dellemc/dell-csm-operator:v1.6.0 + value: docker.io/dellemc/dell-csm-operator:v1.7.0 - name: RELATED_IMAGE_csi-isilon value: docker.io/dellemc/csi-isilon:v2.11.0 - name: RELATED_IMAGE_csi-powermax @@ -4450,7 +4450,7 @@ spec: value: docker.io/dellemc/connectivity-client-docker-k8s:1.19.0 - name: RELATED_IMAGE_cert-persister value: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0 - image: docker.io/dellemc/dell-csm-operator:v1.6.0 + image: docker.io/dellemc/dell-csm-operator:v1.7.0 imagePullPolicy: Always livenessProbe: httpGet: @@ -4511,7 +4511,7 @@ spec: name: Dell Technologies url: https://github.com/dell/csm-operator relatedImages: - - image: docker.io/dellemc/dell-csm-operator:v1.6.0 + - image: docker.io/dellemc/dell-csm-operator:v1.7.0 name: dell-csm-operator - image: docker.io/dellemc/csi-isilon:v2.11.0 name: csi-isilon @@ -4566,5 +4566,5 @@ spec: - image: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0 name: cert-persister skips: - - dell-csm-operator.v1.5.1 - version: 1.6.0 + - dell-csm-operator.v1.6.0 + version: 1.7.0 diff --git a/config/install/kustomization.yaml b/config/install/kustomization.yaml index 93e5d1b90..3c3679588 100644 --- a/config/install/kustomization.yaml +++ b/config/install/kustomization.yaml @@ -11,4 +11,4 @@ bases: images: - name: controller newName: docker.io/dellemc/dell-csm-operator - newTag: v1.6.0 + newTag: v1.7.0 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index e1191dc06..37f91631c 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -11,4 +11,4 @@ kind: Kustomization images: - name: controller newName: docker.io/dellemc/dell-csm-operator - newTag: v1.6.0 + newTag: v1.7.0 diff --git a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml index ea314ac92..9c65c233c 100644 --- a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml @@ -5,7 +5,7 @@ metadata: alm-examples: '[]' capabilities: Seamless Upgrades categories: Storage - containerImage: docker.io/dellemc/dell-csm-operator:v1.6.0 + containerImage: docker.io/dellemc/dell-csm-operator:v1.7.0 createdAt: "2022-03-29T11:59:59Z" description: Easily install and manage Dell’s CSI Drivers and CSM features.operators.openshift.io/disconnected: "true" @@ -17,7 +17,7 @@ metadata: features.operators.openshift.io/token-auth-gcp: "false" repository: https://github.com/dell/csm-operator support: Dell Technologies - name: dell-csm-operator.v1.6.0 + name: dell-csm-operator.v1.7.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -1811,7 +1811,7 @@ spec: name: Dell Technologies url: https://github.com/dell/csm-operator relatedImages: - - image: docker.io/dellemc/dell-csm-operator:v1.6.0 + - image: docker.io/dellemc/dell-csm-operator:v1.7.0 name: dell-csm-operator - image: docker.io/dellemc/csi-isilon:v2.11.0 name: csi-isilon @@ -1866,5 +1866,5 @@ spec: - image: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0 name: cert-persister skips: - - dell-csm-operator.v1.5.1 - version: 1.6.0 + - dell-csm-operator.v1.6.0 + version: 1.7.0 diff --git a/controllers/csm_controller.go b/controllers/csm_controller.go index bb0ee727d..3358c65a1 100644 --- a/controllers/csm_controller.go +++ b/controllers/csm_controller.go @@ -93,7 +93,7 @@ const ( CSMFinalizerName = "finalizer.dell.emc.com" // CSMVersion - - CSMVersion = "v1.11.0" + CSMVersion = "v1.12.0" ) var ( diff --git a/deploy/olm/operator_community.yaml b/deploy/olm/operator_community.yaml index 8484028a5..e25a6b6f4 100644 --- a/deploy/olm/operator_community.yaml +++ b/deploy/olm/operator_community.yaml @@ -5,7 +5,7 @@ metadata: namespace: test-csm-operator-olm spec: sourceType: grpc - image: docker.io/dellemc/dell-csm-operator:v1.6.0 + image: docker.io/dellemc/dell-csm-operator:v1.7.0 --- apiVersion: operators.coreos.com/v1 kind: OperatorGroup diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 9bba6d1cb..40ea8c04f 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -1328,7 +1328,7 @@ spec: template: metadata: annotations: - storage.dell.com/CSMVersion: v1.11.0 + storage.dell.com/CSMVersion: v1.12.0 labels: control-plane: controller-manager spec: @@ -1339,7 +1339,7 @@ spec: - /manager env: - name: RELATED_IMAGE_dell-csm-operator - value: docker.io/dellemc/dell-csm-operator:v1.6.0 + value: docker.io/dellemc/dell-csm-operator:v1.7.0 - name: RELATED_IMAGE_csi-isilon value: docker.io/dellemc/csi-isilon:v2.11.0 - name: RELATED_IMAGE_csi-powermax @@ -1392,7 +1392,7 @@ spec: value: docker.io/dellemc/connectivity-client-docker-k8s:1.19.0 - name: RELATED_IMAGE_cert-persister value: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0 - image: docker.io/dellemc/dell-csm-operator:v1.6.0 + image: docker.io/dellemc/dell-csm-operator:v1.7.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/docker.mk b/docker.mk index b4fdf88b7..9eb53927c 100644 --- a/docker.mk +++ b/docker.mk @@ -14,11 +14,11 @@ BUNDLE_IMAGE_TAG_BASE_COMMUNITY ?= dell-csm-community-operator-bundle # Image tag base for community catalog images CATALOG_IMAGE_TAG_BASE_COMMUNITY ?= dell-csm-community-operator-catalog -# Operator version tagged with build number. For e.g. - v1.6.0.001 -VERSION ?= v1.6.0 +# Operator version tagged with build number. For e.g. - v1.7.0.001 +VERSION ?= v1.7.0 # Bundle Version is the semantic version(required by operator-sdk) -BUNDLE_VERSION ?= 1.6.0 +BUNDLE_VERSION ?= 1.7.0 # Timestamp local builds TIMESTAMP := $(shell date +%Y%m%d%H%M%S) @@ -37,5 +37,5 @@ IMG ?= "$(REGISTRY)/$(IMAGE_TAG_BASE):$(VERSION)" # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=/:) BUNDLE_IMG ?= "$(REGISTRY)/$(BUNDLE_IMAGE_TAG_BASE_COMMUNITY):$(VERSION)" -# The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v1.6.0). +# The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v1.7.0). CATALOG_IMG ?= "$(REGISTRY)/$(CATALOG_IMAGE_TAG_BASE_COMMUNITY):$(VERSION)"