Merge pull request #298 from Orange-OpenSource/release-1.1.2

Fix Helm publishing & Bump release
Orange-OpenSource · Feb 5, 2021 · 4ec6cab · 4ec6cab
2 parents abcde6e + 55d4b26
commit 4ec6cab
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -497,7 +497,7 @@ workflows:
       - operator/publish-helm:
           name: publish-helm-orange-incubator-casskop
           requires:
-            - kuttl-test ScaleUpAndDown
+            - report-casskop
           <<: *only_on_release_tag
 
       - deploy-website:

diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,15 @@
 
 # CassKop Cassandra Kubernetes Operator Changelog
 
+## v1.1.2
+
+- PR [#298](https://github.com/Orange-OpenSource/casskop/pull/297) - Fix Helm publishing
+
+
+## v1.1.1
+
+- PR [#297](https://github.com/Orange-OpenSource/casskop/pull/297) - Fix sonar jdk 
+- 
 ## v1.1.0
 
 ### Added

diff --git a/helm/cassandra-operator/Chart.yaml b/helm/cassandra-operator/Chart.yaml
@@ -4,8 +4,8 @@ name: cassandra-operator
 home: https://github.com/Orange-OpenSource/casskop
 sources:
   - https://github.com/Orange-OpenSource/casskop
-version: 1.1.0
-appVersion: 1.1.0-release
+version: 1.1.2
+appVersion: 1.1.2-release
 maintainers:
   - name: allamand
     email: sebastien.allamand@orange.com

diff --git a/helm/cassandra-operator/values.yaml b/helm/cassandra-operator/values.yaml
@@ -2,7 +2,7 @@
 ##
 image:
   repository: orangeopensource/casskop
-  tag: v1.1.0-release
+  tag: v1.1.2-release
   pullPolicy: Always
   imagePullSecrets:
     enabled: false

diff --git a/multi-casskop/helm/multi-casskop/Chart.yaml b/multi-casskop/helm/multi-casskop/Chart.yaml
@@ -4,8 +4,8 @@ name: multi-casskop
 home: https://github.com/Orange-OpenSource/casskop/multi-casskop
 sources:
   - https://github.com/Orange-OpenSource/casskop/multi-casskop
-version: 1.1.0
-appVersion: 1.1.0-release
+version: 1.1.2
+appVersion: 1.1.2-release
 maintainers:
   - name: allamand
     email: sebastien.allamand@orange.com

diff --git a/multi-casskop/helm/multi-casskop/values.yaml b/multi-casskop/helm/multi-casskop/values.yaml
@@ -2,7 +2,7 @@
 ##
 image:
   repository: orangeopensource/multi-casskop
-  tag: v1.1.0-release
+  tag: v1.1.2-release
   pullPolicy: Always
   imagePullSecrets:
     enabled: false

diff --git a/multi-casskop/samples/gke/terraform/main.tf b/multi-casskop/samples/gke/terraform/main.tf
@@ -68,7 +68,7 @@ variable "managed_zone" {
 variable "casskop_image_tag" {
   description = ""
   type        = string
-  default     = "v1.1.0-release"
+  default     = "v1.1.2-release"
 }
 
 // Provider definition

diff --git a/multi-casskop/version/version.go b/multi-casskop/version/version.go
@@ -15,5 +15,5 @@
 package version
 
 var (
-	Version = "1.1.0"
+	Version = "1.1.2"
 )
diff --git a/tools/publish_helm_gcs.sh b/tools/publish_helm_gcs.sh
@@ -19,8 +19,11 @@ set -o nounset
 set -o pipefail
 
 HELM_TARGET_DIR=$(pwd)/tmp/incubator
-readonly HELM_URL=https://storage.googleapis.com/kubernetes-helm
-readonly HELM_TARBALL=helm-v2.9.1-linux-amd64.tar.gz
+#readonly HELM_URL=https://storage.googleapis.com/kubernetes-helm
+#readonly HELM_TARBALL=helm-v2.9.1-linux-amd64.tar.gz
+readonly HELM_URL=https://get.helm.sh
+readonly HELM_TARBALL=helm-v3.4.2-linux-amd64.tar.gz
+
 #readonly STABLE_REPO_URL=https://orange-kubernetes-charts.storage.googleapis.com/
 readonly INCUBATOR_REPO_URL=https://orange-kubernetes-charts-incubator.storage.googleapis.com/
 #readonly GCS_BUCKET_STABLE=gs://orange-kubernetes-charts

diff --git a/version/version.go b/version/version.go
@@ -15,5 +15,5 @@
 package version
 
 var (
-	Version = "1.1.0"
+	Version = "1.1.2"
 )