Skip to content

Commit

Permalink
Merge pull request #218 from leelavg/bump-addons
Browse files Browse the repository at this point in the history
makefile: update csi-addons bundle version from 0.9.0 to 0.9.1
  • Loading branch information
openshift-merge-bot[bot] authored Aug 30, 2024
2 parents bd029bb + 19a0cd2 commit 5595a28
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ bundle: manifests kustomize operator-sdk yq ## Generate bundle manifests and met
$(KUSTOMIZE) build $(MANIFEST_PATH) | sed "s|STATUS_REPORTER_IMAGE_VALUE|$(IMG)|g" | awk '{print}'| \
$(OPERATOR_SDK) generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) --extra-service-accounts="$$($(KUSTOMIZE) build $(MANIFEST_PATH) | $(YQ) 'select(.kind == "ServiceAccount") | .metadata.name' -N | paste -sd "," -)"
yq -i '.dependencies[0].value.packageName = "'${CSI_ADDONS_PACKAGE_NAME}'"' config/metadata/dependencies.yaml
yq -i '.dependencies[0].value.version = "'${CSI_ADDONS_PACKAGE_VERSION}'"' config/metadata/dependencies.yaml
yq -i '.dependencies[0].value.version = ">='${CSI_ADDONS_PACKAGE_VERSION}'"' config/metadata/dependencies.yaml
cp config/metadata/* bundle/metadata/
./hack/create-csi-images-manifest.sh
$(OPERATOR_SDK) bundle validate ./bundle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
categories: Storage
console.openshift.io/plugins: '["odf-client-console"]'
containerImage: quay.io/ocs-dev/ocs-client-operator:latest
createdAt: "2024-08-22T06:43:16Z"
createdAt: "2024-08-30T13:24:10Z"
description: OpenShift Data Foundation client operator enables consumption of
storage services from a remote centralized OpenShift Data Foundation provider
cluster.
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dependencies:
- type: olm.package
value:
packageName: csi-addons
version: 0.9.0
version: '>=0.9.1'
- type: olm.package
value:
packageName: cephcsi-operator
Expand Down
2 changes: 1 addition & 1 deletion config/metadata/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dependencies:
- type: olm.package
value:
packageName: csi-addons
version: 0.9.0
version: '>=0.9.1'
- type: olm.package
value:
packageName: cephcsi-operator
Expand Down
4 changes: 2 additions & 2 deletions hack/make-bundle-vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ IMAGE_TAG ?= latest
IMAGE_NAME ?= ocs-client-operator
BUNDLE_IMAGE_NAME ?= $(IMAGE_NAME)-bundle
CSI_ADDONS_BUNDLE_IMAGE_NAME ?= k8s-bundle
CSI_ADDONS_BUNDLE_IMAGE_TAG ?= v0.9.0
CSI_ADDONS_BUNDLE_IMAGE_TAG ?= v0.9.1
CATALOG_IMAGE_NAME ?= $(IMAGE_NAME)-catalog

OCS_CLIENT_CONSOLE_IMG_NAME ?= ocs-client-console
Expand Down Expand Up @@ -99,7 +99,7 @@ endif

# csi-addons dependencies
CSI_ADDONS_PACKAGE_NAME ?= csi-addons
CSI_ADDONS_PACKAGE_VERSION ?= 0.9.0
CSI_ADDONS_PACKAGE_VERSION ?= 0.9.1

## CSI driver images
# The following variables define the default CSI container images to deploy
Expand Down

0 comments on commit 5595a28

Please sign in to comment.