Skip to content

Commit

Permalink
init release-1.2
Browse files Browse the repository at this point in the history
Signed-off-by: wanjunlei <[email protected]>
  • Loading branch information
wanjunlei committed Jul 15, 2021
1 parent 9ea6467 commit dbc5027
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
latest
v1.2.0
2 changes: 1 addition & 1 deletion config/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/samples/notification_manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ operator:
operator:
image:
repo: kubesphere/notification-manager-operator
tag: v1.0.0
tag: v1.2.0
pullPolicy: IfNotPresent
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/notificationmanager_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down

0 comments on commit dbc5027

Please sign in to comment.