Skip to content

Commit 3f4444a

Browse files
committed
Add three more recent Kubernetes versions
1 parent 1efc1b8 commit 3f4444a

File tree

4 files changed

+23
-6
lines changed

4 files changed

+23
-6
lines changed

.circleci/config.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ orbs:
1212
jobs:
1313
# Spin up minikube K8s cluster and run Helm chart & e2e tests on it
1414
e2e-minikube:
15+
parameters:
16+
minikube-version:
17+
type: string
1518
# 'large' 4 vCPUs & 15GB RAM CircleCI machine executor
1619
# required to deploy heavy 'stackstorm-ha' Helm release with RabbitMQ, MongoDB, Redis clusters and 25+ st2 Pods.
1720
# https://circleci.com/docs/2.0/configuration-reference/#machine-executor-linux
@@ -24,7 +27,7 @@ jobs:
2427
- kubernetes/install
2528
- minikube/minikube-install:
2629
# https://github.com/kubernetes/minikube/releases
27-
version: v1.15.1
30+
version: << parameters.minikube-version >>
2831
- run:
2932
name: Install dependencies
3033
command: |
@@ -64,11 +67,23 @@ workflows:
6467
version: 2
6568
e2e:
6669
jobs:
67-
- e2e-minikube
70+
- e2e-minikube:
71+
matrix:
72+
parameters:
73+
minikube-version: # https://github.com/kubernetes/minikube/releases
74+
- v1.22.0
75+
- v1.21.0
76+
- v1.20.0
6877
# Run periodic nightly Helm tests to ensure there are no regressions
6978
e2e-nightly:
7079
jobs:
71-
- e2e-minikube
80+
- e2e-minikube:
81+
matrix:
82+
parameters:
83+
minikube-version: # https://github.com/kubernetes/minikube/releases
84+
- v1.22.0
85+
- v1.21.0
86+
- v1.20.0
7287
triggers:
7388
- schedule:
7489
cron: "0 1 * * *"

.github/workflows/e2e.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ jobs:
2626
matrix:
2727
# TODO: Document which versions we support and cover them.
2828
# https://github.com/StackStorm/stackstorm-k8s/issues/342
29+
# https://github.com/k3s-io/k3s/releases
2930
k3s-channel:
30-
- "v1.25.4+k3s1"
31+
- "v1.26.0+k3s1"
3132
steps:
3233
- name: Checkout source
3334
uses: actions/checkout@v3
@@ -55,7 +56,7 @@ jobs:
5556
- name: Helm upgrade with RBAC enabled
5657
run: |
5758
helm upgrade --set st2.rbac.enabled=true \
58-
--timeout 5m0s --debug --wait stackstorm-ha .
59+
--timeout 10m0s --debug --wait stackstorm-ha .
5960
6061
- name: Helm test
6162
run: |

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changelog
22

33
## In Development
4+
* Cover the three most recent Kubernetes versions. (#342) (by @mamercad)
45
* Update the GitHub badges. (#345) (by @mamercad)
56
* Reorganizing and renaming the CI workflows and jobs. (#344) (by @mamercad)
67
* Add support for providing `ingressClassName`. (#336) (by @mamercad)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RabbitMQ HA, MongoDB HA Replicaset and Redis cluster that st2 replies on for MQ,
1313
It's more than welcome to fine-tune each component settings to fit specific availability/scalability demands.
1414

1515
## Requirements
16-
* [Kubernetes](https://kubernetes.io/docs/setup/pick-right-solution/) cluster
16+
* [Supported](https://kubernetes.io/releases/) [Kubernetes](https://kubernetes.io/docs/setup/) cluster
1717
* [Helm](https://docs.helm.sh/using_helm/#install-helm) `v3.5` or greater
1818

1919
## Usage

0 commit comments

Comments
 (0)