From dbc5027eaec65f81b6fd5cd09fe107063214e976 Mon Sep 17 00:00:00 2001 From: wanjunlei Date: Thu, 15 Jul 2021 15:22:53 +0800 Subject: [PATCH] init release-1.2 Signed-off-by: wanjunlei --- Makefile | 4 ++-- README.md | 4 ++-- VERSION | 2 +- config/bundle.yaml | 2 +- config/manager/kustomization.yaml | 4 ++-- config/samples/notification_manager.yaml | 2 +- helm/values.yaml | 2 +- pkg/controllers/notificationmanager_controller.go | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 9684934d..ec96a221 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION?=$(shell cat VERSION | tr -d " \t\n\r") # Image URL to use all building/pushing image targets -IMG ?= kubespheredev/notification-manager-operator:$(VERSION) -NM_IMG ?= kubespheredev/notification-manager:$(VERSION) +IMG ?= kubesphere/notification-manager-operator:$(VERSION) +NM_IMG ?= kubesphere/notification-manager:$(VERSION) AMD64 ?= -amd64 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) CRD_OPTIONS ?= "crd:trivialVersions=true" diff --git a/README.md b/README.md index 33c629b4..fc313070 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ A receiver could be configured without xxxConfigSelector, in which case Notifica Deploy CRDs and the Notification Manager Operator: ```shell -kubectl apply -f https://raw.githubusercontent.com/kubesphere/notification-manager/master/config/bundle.yaml +kubectl apply -f https://raw.githubusercontent.com/kubesphere/notification-manager/release-1.2/config/bundle.yaml ``` ### Deploy Notification Manager in KubeSphere (Uses `workspace` to distinguish each tenant user): @@ -77,7 +77,7 @@ spec: requests: cpu: 100m memory: 20Mi - image: kubesphere/notification-manager:v1.0.0 + image: kubesphere/notification-manager:v1.2.0 imagePullPolicy: IfNotPresent serviceAccountName: notification-manager-sa portName: webhook diff --git a/VERSION b/VERSION index a0f9a4b4..79127d85 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -latest +v1.2.0 diff --git a/config/bundle.yaml b/config/bundle.yaml index eb3524c8..b240c64b 100644 --- a/config/bundle.yaml +++ b/config/bundle.yaml @@ -6136,7 +6136,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: kubespheredev/notification-manager-operator:latest + image: kubesphere/notification-manager-operator:v1.2.0 imagePullPolicy: Always name: notification-manager-operator ports: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 67979327..bcba4f1c 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: kubespheredev/notification-manager-operator - newTag: latest + newName: kubesphere/notification-manager-operator + newTag: v1.2.0 diff --git a/config/samples/notification_manager.yaml b/config/samples/notification_manager.yaml index 1a4c3c43..2b3fd0d7 100644 --- a/config/samples/notification_manager.yaml +++ b/config/samples/notification_manager.yaml @@ -11,7 +11,7 @@ spec: requests: cpu: 100m memory: 20Mi - image: kubespheredev/notification-manager:latest + image: kubesphere/notification-manager:v1.2.0 imagePullPolicy: Always serviceAccountName: notification-manager-sa portName: webhook diff --git a/helm/values.yaml b/helm/values.yaml index e94e9639..96e755eb 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -16,7 +16,7 @@ operator: operator: image: repo: kubesphere/notification-manager-operator - tag: v1.0.0 + tag: v1.2.0 pullPolicy: IfNotPresent resources: limits: diff --git a/pkg/controllers/notificationmanager_controller.go b/pkg/controllers/notificationmanager_controller.go index b9636fef..c72d33f8 100644 --- a/pkg/controllers/notificationmanager_controller.go +++ b/pkg/controllers/notificationmanager_controller.go @@ -47,7 +47,7 @@ var ( apiGVStr = v2beta2.GroupVersion.String() log logr.Logger minReplicas int32 = 1 - defaultImage = "kubesphere/notification-manager:v1.0.0" + defaultImage = "kubesphere/notification-manager:v1.2.0" defaultImagePullPolicy = corev1.PullIfNotPresent )