Skip to content

Commit

Permalink
Merge pull request #65 from wanjunlei/release-1.0
Browse files Browse the repository at this point in the history
init
  • Loading branch information
Benjamin Huo authored Apr 8, 2021
2 parents fdad15e + bfdd6f4 commit 5fd95ce
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 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
8 changes: 4 additions & 4 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/0.8.0/config/bundle.yaml
kubectl apply -f https://raw.githubusercontent.com/kubesphere/notification-manager/release-1.0/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:v0.6.0
image: kubesphere/notification-manager:v1.0.0
imagePullPolicy: IfNotPresent
serviceAccountName: notification-manager-sa
portName: webhook
Expand Down Expand Up @@ -649,12 +649,12 @@ There are some breaking changes in v1.0.0 :

### Steps to migrate crds from v0.x to v1.0

You can update the v0.x to the latest version by following this.
You can update the v0.x to the v1.0 by following this.

Firstly, backup the old crds and converts to new crds.

```shell
curl -o update.sh https://raw.githubusercontent.com/kubesphere/notification-manager/master/config/update/update.sh && sh update.sh
curl -o update.sh https://raw.githubusercontent.com/kubesphere/notification-manager/release-1.0/config/update/update.sh && sh update.sh
```

>This command will generate two directories, backup and crds. The `backup` directory store the old crds, and the `crds` directory store the new crds
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
latest
v1.0.0
2 changes: 1 addition & 1 deletion config/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2620,7 +2620,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
image: kubespheredev/notification-manager-operator:latest
image: kubesphere/notification-manager-operator:v1.0.0
imagePullPolicy: Always
name: notification-manager-operator
resources:
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.0.0
2 changes: 1 addition & 1 deletion config/samples/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ spec:
defaultConfigSelector:
matchLabels:
type: default
image: kubespheredev/notification-manager:latest
image: kubesphere/notification-manager:v1.0.0
imagePullPolicy: Always
portName: webhook
receivers:
Expand Down
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.0.0
imagePullPolicy: Always
serviceAccountName: notification-manager-sa
portName: webhook
Expand Down
4 changes: 2 additions & 2 deletions 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: v0.7.0
tag: v1.0.0
pullPolicy: IfNotPresent
resources:
limits:
Expand All @@ -33,7 +33,7 @@ operator:
# value of notification-manager
notificationmanager:
image:
tag: v0.7.0
tag: v1.0.0
pullPolicy: IfNotPresent
replicas: 1
resources:
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 @@ -43,7 +43,7 @@ var (
apiGVStr = v2beta1.GroupVersion.String()
log logr.Logger
minReplicas int32 = 1
defaultImage = "kubesphere/notification-manager:v0.1.0"
defaultImage = "kubesphere/notification-manager:v1.0.0"
defaultImagePullPolicy = corev1.PullIfNotPresent
)

Expand Down

0 comments on commit 5fd95ce

Please sign in to comment.