From 9410d58e996db999d0ce4daa50027e111b50e798 Mon Sep 17 00:00:00 2001 From: armab Date: Fri, 8 May 2020 17:47:27 +0100 Subject: [PATCH 01/14] Switch to 3.3dev Docker images with Ubuntu Bionic See https://github.com/StackStorm/st2-dockerfiles/pull/16 --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index 96af7251..daf1cbea 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 # Update StackStorm version here to rely on other Docker images tags -appVersion: 3.2dev +appVersion: 3.3dev name: stackstorm-ha version: 0.27.0 description: StackStorm K8s Helm Chart, optimized for running StackStorm in HA environment. From 0004274f5b6d74eadc18bdf9f7b82da0883f20bf Mon Sep 17 00:00:00 2001 From: armab Date: Sat, 9 May 2020 14:28:56 +0100 Subject: [PATCH 02/14] Update bats tests to check new python 3.6 environment --- tests/st2tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/st2tests.sh b/tests/st2tests.sh index 5120e2ca..35f01afc 100755 --- a/tests/st2tests.sh +++ b/tests/st2tests.sh @@ -7,9 +7,9 @@ load "${BATS_HELPERS_DIR}/bats-file/load.bash" @test 'st2 version deployed and python env are as expected' { run st2 --version assert_success - # st2 3.1dev (7079635), on Python 2.7.12 + # st2 3.3dev (9ea417346), on Python 3.6.9 assert_line --partial "st2 ${ST2_VERSION}" - assert_line --partial 'on Python 2.7.12' + assert_line --partial 'on Python 3.6.9' } @test 'ST2_AUTH_URL service endpoint is accessible and working' { From 34d490b719e3b99b2a60454fb9e72cb74ba59366 Mon Sep 17 00:00:00 2001 From: armab Date: Sat, 9 May 2020 14:52:25 +0100 Subject: [PATCH 03/14] Bump chart version to 0.30.0, add Changelog --- CHANGELOG.md | 4 ++++ Chart.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa05bb93..b877e804 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## In Development +## v0.30.0 +* Pin st2 version to `v3.3dev` as a new latest development version (#129) +* Switch from `py2` `Ubuntu Xenial` to `py3` `Ubuntu Bionic` as a base StackStorm OS (StackStorm/st2-dockerfiles#16, #129) + ## v0.27.0 * Added support to toggle etcd-operator as a coordination backend (#127) (by @rrahman-nv) diff --git a/Chart.yaml b/Chart.yaml index daf1cbea..2bd78432 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 # Update StackStorm version here to rely on other Docker images tags appVersion: 3.3dev name: stackstorm-ha -version: 0.27.0 +version: 0.30.0 description: StackStorm K8s Helm Chart, optimized for running StackStorm in HA environment. home: https://stackstorm.com/#product icon: https://avatars1.githubusercontent.com/u/4969009 From 8b5ddb13471b005b27574c5bc75025fe536f1433 Mon Sep 17 00:00:00 2001 From: armab Date: Wed, 13 May 2020 18:13:06 +0100 Subject: [PATCH 04/14] Switch from MongoDB 3.4 to 4.0 --- CHANGELOG.md | 3 ++- values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b877e804..111d23e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ ## v0.30.0 * Pin st2 version to `v3.3dev` as a new latest development version (#129) -* Switch from `py2` `Ubuntu Xenial` to `py3` `Ubuntu Bionic` as a base StackStorm OS (StackStorm/st2-dockerfiles#16, #129) +* Migrate from `py2` `Ubuntu Xenial` to `py3` `Ubuntu Bionic` as a base StackStorm OS (StackStorm/st2-dockerfiles#16, #129) +* Switch from MongoDB `3.4` to `4.0` for the mongodb-ha Helm chart (#129) ## v0.27.0 * Added support to toggle etcd-operator as a coordination backend (#127) (by @rrahman-nv) diff --git a/values.yaml b/values.yaml index dba62d6b..5aec4f8c 100644 --- a/values.yaml +++ b/values.yaml @@ -419,8 +419,8 @@ mongodb-ha: # Specify your external [database] connection parameters under st2.config enabled: true image: - # StackStorm currently supports maximum MongoDB v3.4 - tag: 3.4 + # StackStorm currently supports maximum MongoDB v4.0 + tag: "4.0" auth: enabled: true # NB! It's highly recommended to change ALL defaults! From d2458b465a31feafe29bb6057dd023d3c4cd70e4 Mon Sep 17 00:00:00 2001 From: armab Date: Wed, 13 May 2020 18:31:00 +0100 Subject: [PATCH 05/14] Update `etcd-operator` 3rd party chart from `0.10.0` to `0.10.3` --- CHANGELOG.md | 1 + requirements.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 111d23e1..5b74121f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Pin st2 version to `v3.3dev` as a new latest development version (#129) * Migrate from `py2` `Ubuntu Xenial` to `py3` `Ubuntu Bionic` as a base StackStorm OS (StackStorm/st2-dockerfiles#16, #129) * Switch from MongoDB `3.4` to `4.0` for the mongodb-ha Helm chart (#129) +* Update `etcd-operator` 3rd party chart from `0.10.0` to `0.10.3` (#129) ## v0.27.0 * Added support to toggle etcd-operator as a coordination backend (#127) (by @rrahman-nv) diff --git a/requirements.yaml b/requirements.yaml index 6f5293fb..245a5c4f 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -13,7 +13,7 @@ dependencies: repository: https://kubernetes-charts.storage.googleapis.com/ condition: external-dns.enabled - name: etcd-operator - version: 0.10.0 + version: 0.10.3 repository: https://kubernetes-charts.storage.googleapis.com/ condition: etcd-operator.enabled From 6dc7a0e4b951eca801b659e25aa1b1c9e5654fa4 Mon Sep 17 00:00:00 2001 From: armab Date: Wed, 13 May 2020 18:39:55 +0100 Subject: [PATCH 06/14] Update `rabbitmq-ha` 3rd party chart from `1.36.4` to latest `1.44.4` --- CHANGELOG.md | 4 +++- requirements.yaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b74121f..a2d27d43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ * Pin st2 version to `v3.3dev` as a new latest development version (#129) * Migrate from `py2` `Ubuntu Xenial` to `py3` `Ubuntu Bionic` as a base StackStorm OS (StackStorm/st2-dockerfiles#16, #129) * Switch from MongoDB `3.4` to `4.0` for the mongodb-ha Helm chart (#129) -* Update `etcd-operator` 3rd party chart from `0.10.0` to `0.10.3` (#129) +* Update `etcd-operator` 3rd party chart from `0.10.0` to latest `0.10.3` (#129) +* Update `rabbitmq-ha` 3rd party chart from `1.36.4` to latest `1.44.4` (#129) + ## v0.27.0 * Added support to toggle etcd-operator as a coordination backend (#127) (by @rrahman-nv) diff --git a/requirements.yaml b/requirements.yaml index 245a5c4f..8aed8b4b 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -1,6 +1,6 @@ dependencies: - name: rabbitmq-ha - version: 1.36.4 + version: 1.44.4 repository: https://kubernetes-charts.storage.googleapis.com/ condition: rabbitmq-ha.enabled - name: mongodb-replicaset From c8f091de68d23514ea88bde9deee5aa74aa8b349 Mon Sep 17 00:00:00 2001 From: armab Date: Wed, 13 May 2020 19:03:46 +0100 Subject: [PATCH 07/14] Pin `rabbitmq-ha` 3rd party chart from `1.36.4` to `1.44.1` Latest rabbitmq-ha `1.44.4` fails with error: ``` Error: validation failed: unable to recognize "": no matches for kind "PrometheusRule" in version "monitoring.coreos.com/v1" ``` --- CHANGELOG.md | 2 +- requirements.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2d27d43..a3c14559 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ * Migrate from `py2` `Ubuntu Xenial` to `py3` `Ubuntu Bionic` as a base StackStorm OS (StackStorm/st2-dockerfiles#16, #129) * Switch from MongoDB `3.4` to `4.0` for the mongodb-ha Helm chart (#129) * Update `etcd-operator` 3rd party chart from `0.10.0` to latest `0.10.3` (#129) -* Update `rabbitmq-ha` 3rd party chart from `1.36.4` to latest `1.44.4` (#129) +* Update `rabbitmq-ha` 3rd party chart from `1.36.4` to `1.44.1` (#129) ## v0.27.0 diff --git a/requirements.yaml b/requirements.yaml index 8aed8b4b..f391108e 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -1,6 +1,6 @@ dependencies: - name: rabbitmq-ha - version: 1.44.4 + version: 1.44.1 repository: https://kubernetes-charts.storage.googleapis.com/ condition: rabbitmq-ha.enabled - name: mongodb-replicaset From 2ce507ac59199175ec8bb213fb3a49ca48d5cee0 Mon Sep 17 00:00:00 2001 From: armab Date: Wed, 13 May 2020 23:53:43 +0100 Subject: [PATCH 08/14] Update `mongodb-replicaset` 3rd party chart from `3.9.6` to `3.14.0` mongodb-replicaset `3.14.1` shows the following warning during the helm install: ``` 2020/05/13 23:42:49 Warning: Merging destination map for chart 'mongodb-ha'. The destination item 'global' is a table and ignoring the source 'global' as it has a non-table value of: 2020/05/13 23:42:49 Warning: Merging destination map for chart 'mongodb-ha'. The destination item 'global' is a table and ignoring the source 'global' as it has a non-table value of: ``` See https://github.com/helm/charts/pull/21630#issuecomment-628285592 --- CHANGELOG.md | 2 +- requirements.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3c14559..b25af212 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ * Switch from MongoDB `3.4` to `4.0` for the mongodb-ha Helm chart (#129) * Update `etcd-operator` 3rd party chart from `0.10.0` to latest `0.10.3` (#129) * Update `rabbitmq-ha` 3rd party chart from `1.36.4` to `1.44.1` (#129) - +* Update `mongodb-replicaset` 3rd party chart from `3.9.6` to `3.14.0` (#129) ## v0.27.0 * Added support to toggle etcd-operator as a coordination backend (#127) (by @rrahman-nv) diff --git a/requirements.yaml b/requirements.yaml index f391108e..0d2a8a8a 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -4,7 +4,7 @@ dependencies: repository: https://kubernetes-charts.storage.googleapis.com/ condition: rabbitmq-ha.enabled - name: mongodb-replicaset - version: 3.9.6 + version: 3.14.0 repository: https://kubernetes-charts.storage.googleapis.com/ alias: mongodb-ha condition: mongodb-ha.enabled From a515c6904e790ac25671314077ee9e6a13e739e6 Mon Sep 17 00:00:00 2001 From: armab Date: Thu, 14 May 2020 14:35:08 +0100 Subject: [PATCH 09/14] Update helm to latest v2.16.7 in CI env --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b458dcb..c4cbc384 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ orbs: # Pins Helm to v2.x # TODO: Consider upgrading Helm to v3.0 (https://github.com/StackStorm/stackstorm-ha/issues/98) # https://circleci.com/orbs/registry/orb/circleci/helm - helm: circleci/helm@0.2.0 + helm: circleci/helm@0.2.3 # https://circleci.com/orbs/registry/orb/ccpgames/minikube minikube: ccpgames/minikube@0.0.1 @@ -17,7 +17,7 @@ jobs: working_directory: ~/stackstorm-ha docker: # Pin Helm to v2.x, see https://github.com/StackStorm/stackstorm-ha/issues/98 - - image: lachlanevenson/k8s-helm:v2.16.1 + - image: lachlanevenson/k8s-helm:v2.16.7 steps: - checkout - run: From ae1ab74a43b0063bdf4b0635597d93b1bd16a97d Mon Sep 17 00:00:00 2001 From: armab Date: Thu, 14 May 2020 15:08:16 +0100 Subject: [PATCH 10/14] Update kubernetes orb to latest --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c4cbc384..d54df3fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 # Add additional CircleCI Orbs dependencies orbs: # https://circleci.com/orbs/registry/orb/circleci/kubernetes - kubernetes: circleci/kubernetes@0.10.1 + kubernetes: circleci/kubernetes@0.11.0 # Pins Helm to v2.x # TODO: Consider upgrading Helm to v3.0 (https://github.com/StackStorm/stackstorm-ha/issues/98) # https://circleci.com/orbs/registry/orb/circleci/helm From e0260a3fd0f3da4dafa3e9ad7b764f06dba87e78 Mon Sep 17 00:00:00 2001 From: armab Date: Thu, 14 May 2020 15:20:42 +0100 Subject: [PATCH 11/14] Update minikube to latest v1.10.1 with most recent K8s --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d54df3fa..a9efcfe7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,7 +78,7 @@ jobs: - kubernetes/install - minikube/minikube-install: # https://github.com/kubernetes/minikube/releases - version: v1.5.2 + version: v1.10.1 - run: name: Create new K8s cluster command: sudo -E minikube start --vm-driver=none --cpus $(nproc) --memory 4096 From b2897615f6dadffc69b3d87fa76f59bce78bfc25 Mon Sep 17 00:00:00 2001 From: armab Date: Thu, 14 May 2020 15:36:24 +0100 Subject: [PATCH 12/14] Add a workaround for minikube with K8s 1.18 --- .circleci/config.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a9efcfe7..c2793afe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,9 +79,16 @@ jobs: - minikube/minikube-install: # https://github.com/kubernetes/minikube/releases version: v1.10.1 + - run: + name: Install dependencies + command: | + sudo apt -y update + # K8s 1.18 requires conntrack + # See: https://github.com/kubernetes/minikube/issues/7179 + sudo apt -y install conntrack - run: name: Create new K8s cluster - command: sudo -E minikube start --vm-driver=none --cpus $(nproc) --memory 4096 + command: sudo -E minikube start --vm-driver=none environment: CHANGE_MINIKUBE_NONE_USER: true - helm/install-helm-on-cluster From 6e17b8ba480733544de8d53ad1719034227064cd Mon Sep 17 00:00:00 2001 From: armab Date: Thu, 14 May 2020 15:39:59 +0100 Subject: [PATCH 13/14] Add a workaround for minikube with K8s 1.18 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2793afe..e2ae6c42 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,10 +82,10 @@ jobs: - run: name: Install dependencies command: | - sudo apt -y update + sudo apt update || true # K8s 1.18 requires conntrack # See: https://github.com/kubernetes/minikube/issues/7179 - sudo apt -y install conntrack + sudo apt install -y conntrack - run: name: Create new K8s cluster command: sudo -E minikube start --vm-driver=none From 1d9bcb881b19147b445c8bedb00a2da2b09afe3a Mon Sep 17 00:00:00 2001 From: armab Date: Thu, 14 May 2020 15:55:06 +0100 Subject: [PATCH 14/14] Update changelog for v0.30.0 with CI env changes: new K8s, Helm, Minikube --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b25af212..2d39f6ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ ## In Development - ## v0.30.0 * Pin st2 version to `v3.3dev` as a new latest development version (#129) * Migrate from `py2` `Ubuntu Xenial` to `py3` `Ubuntu Bionic` as a base StackStorm OS (StackStorm/st2-dockerfiles#16, #129) @@ -10,6 +9,7 @@ * Update `etcd-operator` 3rd party chart from `0.10.0` to latest `0.10.3` (#129) * Update `rabbitmq-ha` 3rd party chart from `1.36.4` to `1.44.1` (#129) * Update `mongodb-replicaset` 3rd party chart from `3.9.6` to `3.14.0` (#129) +* Update CI infrastructure env, run tests on updated Helm `v2.16.7`, latest minikube `v1.10.1` and K8s `1.18` (#129) ## v0.27.0 * Added support to toggle etcd-operator as a coordination backend (#127) (by @rrahman-nv)