Merge pull request #11 from junotx/release-0.2

update the version in the configuration files
kubesphere · Oct 20, 2020 · 11a1537 · 11a1537
2 parents 7e36cc7 + 44fcb3e
commit 11a1537
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -1,10 +1,11 @@
 NAMESPACE ?= kubesphere-logging-system
 
-REGISTRY?=kubespheredev
+REGISTRY?=kubesphere
 REPO_OPERATOR?=$(REGISTRY)/kube-events-operator
 REPO_EXPORTER?=$(REGISTRY)/kube-events-exporter
 REPO_RULER?=$(REGISTRY)/kube-events-ruler
 TAG?=v0.1.0
+TAG_RULER?=v0.2.0
 
 GO_PKG?=github.com/kubesphere/kube-events
 
@@ -29,7 +30,7 @@ deploy:
 generate: $(DEEPCOPY_TARGET) manifests
 	cd config && $(GOBIN)/kustomize edit set image operator=$(REPO_OPERATOR):$(TAG)
 	$(GOBIN)/kustomize build config > config/bundle.yaml
-	cd config/crs && $(GOBIN)/kustomize edit set image operator=exporter=$(REPO_EXPORTER):$(TAG) ruler=$(REPO_RULER):$(TAG)
+	cd config/crs && $(GOBIN)/kustomize edit set image exporter=$(REPO_EXPORTER):$(TAG) ruler=$(REPO_RULER):$(TAG_RULER)
 	$(GOBIN)/kustomize build config/crs > config/crs/bundle.yaml
 
 # Generate manifests e.g. CRD, RBAC etc.
@@ -62,23 +63,20 @@ $(KE_DOCGEN_BINARY): cmd/docgen/kube-events-docgen.go
 
 image-push: image
 	docker push $(REPO_OPERATOR):$(TAG)
-	docker push $(REPO_OPERATOR):latest
 	docker push $(REPO_EXPORTER):$(TAG)
-	docker push $(REPO_EXPORTER):latest
-	docker push $(REPO_RULER):$(TAG)
-	docker push $(REPO_RULER):latest
+	docker push $(REPO_RULER):$(TAG_RULER)
 
 .PHONY: image
 image: operator-image exporter-image ruler-image
 
 operator-image: cmd/operator/Dockerfile
-	docker build -t $(REPO_OPERATOR):$(TAG) -t $(REPO_OPERATOR):latest -f cmd/operator/Dockerfile .
+	docker build -t $(REPO_OPERATOR):$(TAG) -f cmd/operator/Dockerfile .
 
 exporter-image: cmd/exporter/Dockerfile
-	docker build -t $(REPO_EXPORTER):$(TAG) -t $(REPO_EXPORTER):latest -f cmd/exporter/Dockerfile .
+	docker build -t $(REPO_EXPORTER):$(TAG) -f cmd/exporter/Dockerfile .
 
 ruler-image: cmd/ruler/Dockerfile
-	docker build -t $(REPO_RULER):$(TAG) -t $(REPO_RULER):latest -f cmd/ruler/Dockerfile .
+	docker build -t $(REPO_RULER):$(TAG_RULER) -f cmd/ruler/Dockerfile .
 
 
 ca-secret:

diff --git a/config/bundle.yaml b/config/bundle.yaml
@@ -640,7 +640,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: kubespheredev/kube-events-operator:v0.1.0
+        image: kubesphere/kube-events-operator:v0.1.0
         name: events-operator
         ports:
         - containerPort: 9443

diff --git a/config/crs/bundle.yaml b/config/crs/bundle.yaml
@@ -4,7 +4,7 @@ metadata:
   name: kube-events-exporter
   namespace: kubesphere-logging-system
 spec:
-  image: kubespheredev/kube-events-exporter:v0.1.0
+  image: kubesphere/kube-events-exporter:v0.1.0
   resources: {}
   sinks:
     stdout: {}
@@ -893,7 +893,7 @@ metadata:
   name: kube-events-ruler
   namespace: kubesphere-logging-system
 spec:
-  image: kubespheredev/kube-events-ruler:v0.1.0
+  image: kubesphere/kube-events-ruler:v0.2.0
   replicas: 2
   sinks:
     alertmanager:

diff --git a/config/crs/kustomization.yaml b/config/crs/kustomization.yaml
@@ -10,12 +10,10 @@ patchesStrategicMerge:
 - ruler_patch.yaml
 images:
 - name: exporter
-  newName: kubespheredev/kube-events-exporter
-  newTag: v0.1.0
-- name: operator=exporter=kubespheredev/kube-events-exporter
+  newName: kubesphere/kube-events-exporter
   newTag: v0.1.0
 - name: ruler
-  newName: kubespheredev/kube-events-ruler
-  newTag: v0.1.0
+  newName: kubesphere/kube-events-ruler
+  newTag: v0.2.0
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/config/kustomization.yaml b/config/kustomization.yaml
@@ -8,7 +8,7 @@ configurations:
 - kustomizeconfig.yaml
 images:
 - name: operator
-  newName: kubespheredev/kube-events-operator
+  newName: kubesphere/kube-events-operator
   newTag: v0.1.0
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -1,7 +1,7 @@
 operator:
   enabled: true
   image:
-    repository: kubespheredev/kube-events-operator
+    repository: kubesphere/kube-events-operator
     tag: v0.1.0
     pullPolicy: IfNotPresent
   configReloader:
@@ -23,7 +23,7 @@ operator:
 exporter:
   enabled: true
   image:
-    repository: kubespheredev/kube-events-exporter
+    repository: kubesphere/kube-events-exporter
     tag: v0.1.0
     pullPolicy: IfNotPresent
   resources: {}
@@ -48,8 +48,8 @@ ruler:
   enabled: true
   replicas: 2
   image:
-    repository: kubespheredev/kube-events-ruler
-    tag: v0.1.0
+    repository: kubesphere/kube-events-ruler
+    tag: v0.2.0
     pullPolicy: IfNotPresent
   resources: {}
 #    limits: