Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

operator version bump up #676

Merged
merged 1 commit into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions bundle/manifests/dell-csm-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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: {}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/install/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ bases:
images:
- name: controller
newName: docker.io/dellemc/dell-csm-operator
newTag: v1.6.0
newTag: v1.7.0
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ kind: Kustomization
images:
- name: controller
newName: docker.io/dellemc/dell-csm-operator
newTag: v1.6.0
newTag: v1.7.0
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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: {}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion controllers/csm_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const (
CSMFinalizerName = "finalizer.dell.emc.com"

// CSMVersion -
CSMVersion = "v1.11.0"
CSMVersion = "v1.12.0"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion deploy/olm/operator_community.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -37,5 +37,5 @@ IMG ?= "$(REGISTRY)/$(IMAGE_TAG_BASE):$(VERSION)"
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
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)"
Loading