Skip to content

Commit 6d8e12a

Browse files
authored
Merge pull request #129 from StackStorm/bionic-upgrade
Switch to st2 3.3dev with py3, Ubuntu Bionic 18.04 and MongoDB 4 (Chart v0.30.0)
2 parents 088fe56 + faeac1a commit 6d8e12a

File tree

6 files changed

+29
-14
lines changed

6 files changed

+29
-14
lines changed

.circleci/config.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ version: 2.1
33
# Add additional CircleCI Orbs dependencies
44
orbs:
55
# https://circleci.com/orbs/registry/orb/circleci/kubernetes
6-
kubernetes: circleci/kubernetes@0.10.1
6+
kubernetes: circleci/kubernetes@0.11.0
77
# Pins Helm to v2.x
88
# TODO: Consider upgrading Helm to v3.0 (https://github.com/StackStorm/stackstorm-ha/issues/98)
99
# https://circleci.com/orbs/registry/orb/circleci/helm
10-
helm: circleci/[email protected].0
10+
helm: circleci/[email protected].3
1111
# https://circleci.com/orbs/registry/orb/ccpgames/minikube
1212
minikube: ccpgames/[email protected]
1313

@@ -17,7 +17,7 @@ jobs:
1717
working_directory: ~/stackstorm-ha
1818
docker:
1919
# Pin Helm to v2.x, see https://github.com/StackStorm/stackstorm-ha/issues/98
20-
- image: lachlanevenson/k8s-helm:v2.16.1
20+
- image: lachlanevenson/k8s-helm:v2.16.7
2121
steps:
2222
- checkout
2323
- run:
@@ -78,10 +78,17 @@ jobs:
7878
- kubernetes/install
7979
- minikube/minikube-install:
8080
# https://github.com/kubernetes/minikube/releases
81-
version: v1.5.2
81+
version: v1.10.1
82+
- run:
83+
name: Install dependencies
84+
command: |
85+
sudo apt update || true
86+
# K8s 1.18 requires conntrack
87+
# See: https://github.com/kubernetes/minikube/issues/7179
88+
sudo apt install -y conntrack
8289
- run:
8390
name: Create new K8s cluster
84-
command: sudo -E minikube start --vm-driver=none --cpus $(nproc) --memory 4096
91+
command: sudo -E minikube start --vm-driver=none
8592
environment:
8693
CHANGE_MINIKUBE_NONE_USER: true
8794
- helm/install-helm-on-cluster

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## In Development
44

5+
## v0.30.0
6+
* Pin st2 version to `v3.3dev` as a new latest development version (#129)
7+
* Migrate from `py2` `Ubuntu Xenial` to `py3` `Ubuntu Bionic` as a base StackStorm OS (StackStorm/st2-dockerfiles#16, #129)
8+
* Switch from MongoDB `3.4` to `4.0` for the mongodb-ha Helm chart (#129)
9+
* Update `etcd-operator` 3rd party chart from `0.10.0` to latest `0.10.3` (#129)
10+
* Update `rabbitmq-ha` 3rd party chart from `1.36.4` to `1.44.1` (#129)
11+
* Update `mongodb-replicaset` 3rd party chart from `3.9.6` to `3.14.0` (#129)
12+
* Update CI infrastructure env, run tests on updated Helm `v2.16.7`, latest minikube `v1.10.1` and K8s `1.18` (#129)
513

614
## v0.28.0
715
* Added support for custom image repository (#131) (by @ytjohn)

Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
# Update StackStorm version here to rely on other Docker images tags
3-
appVersion: 3.2dev
3+
appVersion: 3.3dev
44
name: stackstorm-ha
5-
version: 0.28.0
5+
version: 0.30.0
66
description: StackStorm K8s Helm Chart, optimized for running StackStorm in HA environment.
77
home: https://stackstorm.com/#product
88
icon: https://avatars1.githubusercontent.com/u/4969009

requirements.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dependencies:
22
- name: rabbitmq-ha
3-
version: 1.36.4
3+
version: 1.44.1
44
repository: https://kubernetes-charts.storage.googleapis.com/
55
condition: rabbitmq-ha.enabled
66
- name: mongodb-replicaset
7-
version: 3.9.6
7+
version: 3.14.0
88
repository: https://kubernetes-charts.storage.googleapis.com/
99
alias: mongodb-ha
1010
condition: mongodb-ha.enabled
@@ -13,7 +13,7 @@ dependencies:
1313
repository: https://kubernetes-charts.storage.googleapis.com/
1414
condition: external-dns.enabled
1515
- name: etcd-operator
16-
version: 0.10.0
16+
version: 0.10.3
1717
repository: https://kubernetes-charts.storage.googleapis.com/
1818
condition: etcd-operator.enabled
1919

tests/st2tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ load "${BATS_HELPERS_DIR}/bats-file/load.bash"
77
@test 'st2 version deployed and python env are as expected' {
88
run st2 --version
99
assert_success
10-
# st2 3.1dev (7079635), on Python 2.7.12
10+
# st2 3.3dev (9ea417346), on Python 3.6.9
1111
assert_line --partial "st2 ${ST2_VERSION}"
12-
assert_line --partial 'on Python 2.7.12'
12+
assert_line --partial 'on Python 3.6.9'
1313
}
1414

1515
@test 'ST2_AUTH_URL service endpoint is accessible and working' {

values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ mongodb-ha:
425425
# Specify your external [database] connection parameters under st2.config
426426
enabled: true
427427
image:
428-
# StackStorm currently supports maximum MongoDB v3.4
429-
tag: 3.4
428+
# StackStorm currently supports maximum MongoDB v4.0
429+
tag: "4.0"
430430
auth:
431431
enabled: true
432432
# NB! It's highly recommended to change ALL defaults!

0 commit comments

Comments
 (0)