From d23f4eea77c7469a84e42e83c17e1c1f25f55879 Mon Sep 17 00:00:00 2001 From: Ricardo Osorio Date: Wed, 17 Aug 2022 11:23:13 +0100 Subject: [PATCH] Create new v2.8.2 release Using node v2.8.2 --- .github/workflows/build-and-publish.yaml | 2 +- .github/workflows/develop-image.yaml | 2 +- Makefile | 8 ++++---- .../manifests/storageos-related-images_v1_configmap.yaml | 2 +- .../storageosoperator.clusterserviceversion.yaml | 6 +++--- config/manager/kustomization.yaml | 2 +- config/manager/related_images_config.yaml | 2 +- e2e/kuttl/operator-deployment-1.19.yaml | 2 +- e2e/kuttl/operator-deployment-1.20.yaml | 2 +- e2e/kuttl/operator-deployment-1.21.yaml | 2 +- e2e/kuttl/operator-deployment-1.22.yaml | 2 +- e2e/kuttl/operator-deployment-1.23.yaml | 2 +- hack/generate-tests.sh | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml index 6ca894b3..68ef0f56 100644 --- a/.github/workflows/build-and-publish.yaml +++ b/.github/workflows/build-and-publish.yaml @@ -18,7 +18,7 @@ env: RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER=quay.io/k8scsi/csi-resizer:v1.1.0 RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER=quay.io/k8scsi/csi-snapshotter:v4.0.0 RELATED_IMAGE_STORAGEOS_INIT=storageos/init:v2.1.2 - RELATED_IMAGE_STORAGEOS_NODE=soegarots/node:v2-release-v2.8.2-4 + RELATED_IMAGE_STORAGEOS_NODE=storageos/node:v2.8.2 RELATED_IMAGE_NODE_MANAGER=storageos/node-manager:v0.0.8 RELATED_IMAGE_UPGRADE_GUARD=storageos/upgrade-guard:v0.0.4 RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR=quay.io/k8scsi/csi-node-driver-registrar:v2.1.0 diff --git a/.github/workflows/develop-image.yaml b/.github/workflows/develop-image.yaml index cb192243..775448a8 100644 --- a/.github/workflows/develop-image.yaml +++ b/.github/workflows/develop-image.yaml @@ -15,7 +15,7 @@ env: RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER=quay.io/k8scsi/csi-resizer:v1.1.0 RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER=quay.io/k8scsi/csi-snapshotter:v4.0.0 RELATED_IMAGE_STORAGEOS_INIT=storageos/init:v2.1.2 - RELATED_IMAGE_STORAGEOS_NODE=soegarots/node:v2-release-v2.8.2-4 + RELATED_IMAGE_STORAGEOS_NODE=storageos/node:v2.8.2 RELATED_IMAGE_NODE_MANAGER=storageos/node-manager:v0.0.8 RELATED_IMAGE_UPGRADE_GUARD=storageos/upgrade-guard:v0.0.4 RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR=quay.io/k8scsi/csi-node-driver-registrar:v2.1.0 diff --git a/Makefile b/Makefile index cec340d4..73c98651 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # VERSION defines the project version for the bundle. -VERSION ?= 2.8.2-beta.2 +VERSION ?= 2.8.2 # MIN_KUBE_VERSION is the build flag of minimum Kubernetes version. MIN_KUBE_VERSION ?= 1.19.0 @@ -22,10 +22,10 @@ BUNDLE_PACKAGE_NAME ?= --package=storageosoperator BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) $(BUNDLE_PACKAGE_NAME) # Image URL to use all building/pushing image targets -OPERATOR_IMAGE ?= storageos/operator:v2.8.2-beta.2 +OPERATOR_IMAGE ?= storageos/operator:v$(VERSION) # Image URL for manifest image. -MANIFESTS_IMAGE ?= storageos/operator-manifests:v2.8.2-beta.2 +MANIFESTS_IMAGE ?= storageos/operator-manifests:v$(VERSION) LD_FLAGS = -X main.SupportedMinKubeVersion=$(MIN_KUBE_VERSION) @@ -47,7 +47,7 @@ EXTERNAL_ATTACHER_IMAGE ?= quay.io/k8scsi/csi-attacher:v3.1.0 EXTERNAL_RESIZER_IMAGE ?= quay.io/k8scsi/csi-resizer:v1.1.0 EXTERNAL_SNAPSHOTTER_IMAGE ?= quay.io/k8scsi/csi-snapshotter:v4.0.0 INIT_IMAGE ?= storageos/init:v2.1.2 -NODE_IMAGE ?= soegarots/node:v2-release-v2.8.2-4 +NODE_IMAGE ?= storageos/node:v2.8.2 NODE_MANAGER_VERSION ?= v0.0.8 NODE_MANAGER_IMAGE ?= storageos/node-manager:$(NODE_MANAGER_VERSION) NODE_MANAGER_MANIFESTS_IMAGE ?= storageos/node-manager-manifests diff --git a/bundle/manifests/storageos-related-images_v1_configmap.yaml b/bundle/manifests/storageos-related-images_v1_configmap.yaml index 8ba6ca28..189c1906 100644 --- a/bundle/manifests/storageos-related-images_v1_configmap.yaml +++ b/bundle/manifests/storageos-related-images_v1_configmap.yaml @@ -11,7 +11,7 @@ data: RELATED_IMAGE_NODE_MANAGER: storageos/node-manager:v0.0.8 RELATED_IMAGE_PORTAL_MANAGER: storageos/portal-manager:v1.0.6 RELATED_IMAGE_STORAGEOS_INIT: storageos/init:v2.1.2 - RELATED_IMAGE_STORAGEOS_NODE: soegarots/node:v2-release-v2.8.2-4 + RELATED_IMAGE_STORAGEOS_NODE: storageos/node:v2.8.2 RELATED_IMAGE_UPGRADE_GUARD: storageos/upgrade-guard:v0.0.4 kind: ConfigMap metadata: diff --git a/bundle/manifests/storageosoperator.clusterserviceversion.yaml b/bundle/manifests/storageosoperator.clusterserviceversion.yaml index 13079de1..9fecb306 100644 --- a/bundle/manifests/storageosoperator.clusterserviceversion.yaml +++ b/bundle/manifests/storageosoperator.clusterserviceversion.yaml @@ -28,7 +28,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/storageos/operator support: StorageOS, Inc - name: storageosoperator.v2.8.2-beta.2 + name: storageosoperator.v2.8.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -870,7 +870,7 @@ spec: envFrom: - configMapRef: name: storageos-related-images - image: storageos/operator:v2.8.2-beta.2 + image: storageos/operator:v2.8.2 livenessProbe: httpGet: path: /healthz @@ -957,7 +957,7 @@ spec: selector: matchLabels: operated-by: storageosoperator - version: 2.8.2-beta.2 + version: 2.8.2 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index f733b98f..f783f852 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -17,4 +17,4 @@ kind: Kustomization images: - name: controller newName: storageos/operator - newTag: v2.8.2-beta.2 + newTag: v2.8.2 diff --git a/config/manager/related_images_config.yaml b/config/manager/related_images_config.yaml index a42c9389..d05b7fa9 100644 --- a/config/manager/related_images_config.yaml +++ b/config/manager/related_images_config.yaml @@ -5,7 +5,7 @@ RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V3=quay.io/k8scsi/csi-attacher:v3.1.0 RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER=quay.io/k8scsi/csi-resizer:v1.1.0 RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER=quay.io/k8scsi/csi-snapshotter:v4.0.0 RELATED_IMAGE_STORAGEOS_INIT=storageos/init:v2.1.2 -RELATED_IMAGE_STORAGEOS_NODE=soegarots/node:v2-release-v2.8.2-4 +RELATED_IMAGE_STORAGEOS_NODE=storageos/node:v2.8.2 RELATED_IMAGE_NODE_MANAGER=storageos/node-manager:v0.0.8 RELATED_IMAGE_UPGRADE_GUARD=storageos/upgrade-guard:v0.0.4 RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR=quay.io/k8scsi/csi-node-driver-registrar:v2.1.0 diff --git a/e2e/kuttl/operator-deployment-1.19.yaml b/e2e/kuttl/operator-deployment-1.19.yaml index 3ef3e8c3..4543a914 100644 --- a/e2e/kuttl/operator-deployment-1.19.yaml +++ b/e2e/kuttl/operator-deployment-1.19.yaml @@ -6,5 +6,5 @@ kindConfig: e2e/kind/kind-config-1.19.yaml startKIND: true kindNodeCache: true kindContainers: - - storageos/operator:v2.8.2-beta.2 + - storageos/operator:v2.8.2 timeout: 800 diff --git a/e2e/kuttl/operator-deployment-1.20.yaml b/e2e/kuttl/operator-deployment-1.20.yaml index 69516b55..becf867b 100644 --- a/e2e/kuttl/operator-deployment-1.20.yaml +++ b/e2e/kuttl/operator-deployment-1.20.yaml @@ -6,5 +6,5 @@ kindConfig: e2e/kind/kind-config-1.20.yaml startKIND: true kindNodeCache: true kindContainers: - - storageos/operator:v2.8.2-beta.2 + - storageos/operator:v2.8.2 timeout: 800 diff --git a/e2e/kuttl/operator-deployment-1.21.yaml b/e2e/kuttl/operator-deployment-1.21.yaml index 5b95e688..28c9b239 100644 --- a/e2e/kuttl/operator-deployment-1.21.yaml +++ b/e2e/kuttl/operator-deployment-1.21.yaml @@ -6,5 +6,5 @@ kindConfig: e2e/kind/kind-config-1.21.yaml startKIND: true kindNodeCache: true kindContainers: - - storageos/operator:v2.8.2-beta.2 + - storageos/operator:v2.8.2 timeout: 800 diff --git a/e2e/kuttl/operator-deployment-1.22.yaml b/e2e/kuttl/operator-deployment-1.22.yaml index 00d22503..eaf24e4c 100644 --- a/e2e/kuttl/operator-deployment-1.22.yaml +++ b/e2e/kuttl/operator-deployment-1.22.yaml @@ -6,5 +6,5 @@ kindConfig: e2e/kind/kind-config-1.22.yaml startKIND: true kindNodeCache: true kindContainers: - - storageos/operator:v2.8.2-beta.2 + - storageos/operator:v2.8.2 timeout: 800 diff --git a/e2e/kuttl/operator-deployment-1.23.yaml b/e2e/kuttl/operator-deployment-1.23.yaml index afb2e244..b7fdf2aa 100644 --- a/e2e/kuttl/operator-deployment-1.23.yaml +++ b/e2e/kuttl/operator-deployment-1.23.yaml @@ -6,5 +6,5 @@ kindConfig: e2e/kind/kind-config-1.23.yaml startKIND: true kindNodeCache: true kindContainers: - - storageos/operator:v2.8.2-beta.2 + - storageos/operator:v2.8.2 timeout: 800 diff --git a/hack/generate-tests.sh b/hack/generate-tests.sh index 8e0b9da9..bcd92287 100755 --- a/hack/generate-tests.sh +++ b/hack/generate-tests.sh @@ -48,7 +48,7 @@ kindConfig: e2e/kind/kind-config-${major}.yaml startKIND: true kindNodeCache: true kindContainers: - - storageos/operator:v2.8.2-beta.2 + - storageos/operator:v2.8.2 timeout: 800 EOF