From d9aa69f30e497545aa3a8c55b9cf75513aa9e867 Mon Sep 17 00:00:00 2001 From: Ronnie Hoffmann Date: Sun, 29 Oct 2023 19:00:36 +0100 Subject: [PATCH 1/6] bump to new versions: - circleci/kubernetes@1.3.1 - circleci/helm@3.0.0 - machine image ubuntu-2204:current - minikube v1.31.2 - latests kubernetes versions --- .circleci/config.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4532daf7..f3a7c9dc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,9 +3,9 @@ version: 2.1 # Add additional CircleCI Orbs dependencies orbs: # https://circleci.com/orbs/registry/orb/circleci/kubernetes - kubernetes: circleci/kubernetes@0.11.0 + kubernetes: circleci/kubernetes@1.3.1 # https://circleci.com/orbs/registry/orb/circleci/helm - helm: circleci/helm@1.1.1 + helm: circleci/helm@3.0.0 # https://circleci.com/orbs/registry/orb/ccpgames/minikube minikube: ccpgames/minikube@0.0.1 @@ -21,13 +21,13 @@ jobs: resource_class: large machine: # Available images https://circleci.com/docs/2.0/configuration-reference/#available-machine-images - image: ubuntu-2204:2022.10.2 + image: ubuntu-2204:current steps: - checkout - kubernetes/install - minikube/minikube-install: # https://github.com/kubernetes/minikube/releases - version: v1.29.0 + version: v1.31.2 - run: name: Install Helm v3 command: curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash @@ -63,9 +63,10 @@ workflows: parameters: # https://kubernetes.io/releases kubernetes-version: - - "v1.26.1" - - "v1.25.5" - - "v1.24.9" + - "v1.28.3" + - "v1.27.7" + - "v1.26.10" + - "v1.25.15" # Run periodic nightly Helm tests to ensure there are no regressions e2e-nightly: jobs: @@ -74,9 +75,10 @@ workflows: parameters: # https://kubernetes.io/releases kubernetes-version: - - "v1.26.1" - - "v1.25.5" - - "v1.24.9" + - "v1.28.3" + - "v1.27.7" + - "v1.26.10" + - "v1.25.15" triggers: - schedule: cron: "0 1 * * *" From c943e7fe22e13417407733ca47fb2d4fc91896b6 Mon Sep 17 00:00:00 2001 From: Ronnie Hoffmann Date: Mon, 6 Nov 2023 10:52:48 +0100 Subject: [PATCH 2/6] - increase timeout - remove unsupported k8s - Update CHANGELOG.md --- .circleci/config.yml | 4 +--- CHANGELOG.md | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3a7c9dc..94ffd0cf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,7 +39,7 @@ jobs: command: helm dependency update - run: name: Helm install stackstorm-ha chart - command: helm install --timeout 10m0s --debug --wait --name-template stackstorm-ha . + command: helm install --timeout 20m0s --debug --wait --name-template stackstorm-ha . - run: name: Helm test command: helm test stackstorm-ha @@ -66,7 +66,6 @@ workflows: - "v1.28.3" - "v1.27.7" - "v1.26.10" - - "v1.25.15" # Run periodic nightly Helm tests to ensure there are no regressions e2e-nightly: jobs: @@ -78,7 +77,6 @@ workflows: - "v1.28.3" - "v1.27.7" - "v1.26.10" - - "v1.25.15" triggers: - schedule: cron: "0 1 * * *" diff --git a/CHANGELOG.md b/CHANGELOG.md index ed8488da..e3fd5065 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## In Development +* Bump to latest CircleCI orb versions (by @ZoeLeah) +* Remove unsupported k8s Versions (by @ZoeLeah) * Shift K3s and K8s versions forward. (by @mamercad) * BREAKING: Use the standardized labels recommended in the Helm docs. You can use `migrations/v1.0/standardize-labels.sh` to prepare an existing cluster before running `helm update`. (#351) (by @cognifloyd) * Drop support for `networking.k8s.io/v1beta1` which was removed in kubernetes v1.22 (EOL 2022-10-28) (#353) (by @cognifloyd) From 6320bd5fbf583e78c6943490a55146887758fd94 Mon Sep 17 00:00:00 2001 From: Ronnie Hoffmann Date: Mon, 6 Nov 2023 11:03:55 +0100 Subject: [PATCH 3/6] Update to v1.28.3+k3s1 and increase timeout --- .github/workflows/e2e.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index d5667048..1051ae37 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -28,7 +28,7 @@ jobs: # https://github.com/StackStorm/stackstorm-k8s/issues/342 # https://github.com/k3s-io/k3s/releases k3s-channel: - - "v1.26.1+k3s1" + - "v1.28.3+k3s1" steps: - name: Checkout source uses: actions/checkout@v3 @@ -46,7 +46,7 @@ jobs: - name: Helm install run: | - helm install --timeout 10m0s --debug --wait \ + helm install --timeout 20m0s --debug --wait \ --name-template stackstorm-ha . - name: Helm test From dcf66ab08620f507b46f80faf6262fca82ea9cb6 Mon Sep 17 00:00:00 2001 From: Ronnie Hoffmann Date: Mon, 6 Nov 2023 11:57:21 +0100 Subject: [PATCH 4/6] linting --- migrations/v1.0/standardize-labels.sh | 2 +- tests/unit/ingress_test.yaml | 2 +- tests/unit/overrides_test.yaml | 11 +---------- tests/unit/post_start_script_test.yaml | 1 - tests/unit/service_account_test.yaml | 1 - tests/unit/services_test.yaml | 7 +++---- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/migrations/v1.0/standardize-labels.sh b/migrations/v1.0/standardize-labels.sh index b34fda65..e44dd541 100755 --- a/migrations/v1.0/standardize-labels.sh +++ b/migrations/v1.0/standardize-labels.sh @@ -1,6 +1,6 @@ #!/bin/bash -# We switched to the standard labels recommend in Helm's "Best Practices" doc. +# We switched to the standard labels recommend in Helm's "Best Practices" doc. # https://helm.sh/docs/chart_best_practices/labels/#standard-labels # # This script adds those labels to all the resources in an existing release, diff --git a/tests/unit/ingress_test.yaml b/tests/unit/ingress_test.yaml index a1bb6129..b9b35deb 100644 --- a/tests/unit/ingress_test.yaml +++ b/tests/unit/ingress_test.yaml @@ -8,7 +8,7 @@ tests: - it: Ingress not present if disabled set: ingress: - enabled: false + enabled: false asserts: - hasDocuments: count: 0 diff --git a/tests/unit/overrides_test.yaml b/tests/unit/overrides_test.yaml index 60da9b4c..80a2abeb 100644 --- a/tests/unit/overrides_test.yaml +++ b/tests/unit/overrides_test.yaml @@ -43,7 +43,6 @@ tests: asserts: - hasDocuments: count: 5 - - contains: &overrides_volume path: spec.template.spec.volumes content: @@ -51,20 +50,16 @@ tests: configMap: name: st2ha-st2-overrides-configs documentIndex: 3 # register_content - - - contains: &overrides_mnt path: spec.template.spec.containers[0].volumeMounts content: name: st2-overrides-vol mountPath: /opt/stackstorm/overrides documentIndex: 3 # register_content - - contains: *overrides_mnt documentIndex: 4 #Extra_jobs - contains: *overrides_volume documentIndex: 4 #extra_jobs - - notContains: *overrides_volume documentIndex: 0 - notContains: *overrides_mnt @@ -78,7 +73,7 @@ tests: - notContains: *overrides_mnt documentIndex: 2 - + - it: Deployments with overrides template: deployments.yaml set: @@ -102,14 +97,10 @@ tests: asserts: - hasDocuments: count: 14 - - - contains: *overrides_volume # always included documentIndex: 12 # st2client - contains: *overrides_mnt # always included documentIndex: 12 # st2client - - - notContains: *overrides_volume documentIndex: 1 - notContains: *overrides_mnt diff --git a/tests/unit/post_start_script_test.yaml b/tests/unit/post_start_script_test.yaml index d3856b06..65f51bfd 100644 --- a/tests/unit/post_start_script_test.yaml +++ b/tests/unit/post_start_script_test.yaml @@ -267,4 +267,3 @@ tests: - equal: *assert_lifecycle - contains: *assert_volume_mount - contains: *assert_volume - diff --git a/tests/unit/service_account_test.yaml b/tests/unit/service_account_test.yaml index 52bc261b..e2edd984 100644 --- a/tests/unit/service_account_test.yaml +++ b/tests/unit/service_account_test.yaml @@ -198,4 +198,3 @@ tests: documentIndex: 11 - equal: *assert_sa_custom documentIndex: 13 - diff --git a/tests/unit/services_test.yaml b/tests/unit/services_test.yaml index 9d83c0a5..cff4a058 100644 --- a/tests/unit/services_test.yaml +++ b/tests/unit/services_test.yaml @@ -8,13 +8,13 @@ tests: - it: st2web, st2auth, st2api, st2stream should work without externalName set: st2chatops: - enabled: false + enabled: false asserts: - hasDocuments: count: 4 - isNull: path: spec.externalName - + - it: st2web, st2auth, st2api, st2stream should work with externalName if type is ExternalName set: st2web: @@ -34,7 +34,7 @@ tests: hostname: some-host-name type: ExternalName st2chatops: - enabled: false + enabled: false asserts: - hasDocuments: count: 4 @@ -44,4 +44,3 @@ tests: - equal: path: spec.externalName value: some-host-name - From 669e83fe994853f81528e8c20f2bcc27b394019e Mon Sep 17 00:00:00 2001 From: Ronnie Hoffmann Date: Tue, 7 Nov 2023 12:47:40 +0100 Subject: [PATCH 5/6] Change timeout to 15 minutes --- .circleci/config.yml | 2 +- .github/workflows/e2e.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 94ffd0cf..7441a4f5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,7 +39,7 @@ jobs: command: helm dependency update - run: name: Helm install stackstorm-ha chart - command: helm install --timeout 20m0s --debug --wait --name-template stackstorm-ha . + command: helm install --timeout 15m0s --debug --wait --name-template stackstorm-ha . - run: name: Helm test command: helm test stackstorm-ha diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 1051ae37..a67759f0 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -46,7 +46,7 @@ jobs: - name: Helm install run: | - helm install --timeout 20m0s --debug --wait \ + helm install --timeout 15m0s --debug --wait \ --name-template stackstorm-ha . - name: Helm test From 8b4db8da33585f577d5213d4a271251305a404f0 Mon Sep 17 00:00:00 2001 From: Ronnie Hoffmann Date: Tue, 7 Nov 2023 12:47:53 +0100 Subject: [PATCH 6/6] add more details to CHANGELOG.md --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3fd5065..9f661e5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog ## In Development -* Bump to latest CircleCI orb versions (by @ZoeLeah) -* Remove unsupported k8s Versions (by @ZoeLeah) +* Bump to latest CircleCI orb versions (kubernetes@1.3.1 and helm@3.0.0 by @ZoeLeah) +* Remove unsupported k8s Versions (1.24.x and 1.25.x by @ZoeLeah) +* Update and add new K8s versions (1.28.3, 1.27.7 and 1.26.10 by @ZoeLeah) +* Switch from ubuntu-2204:2022.10.2 to ubuntu-2204:current (by @ZoeLeah) +* Update K3s to v1.28.3+k3s1 (by @ZoeLeah) +* Increase helm install timeout to 15 minutes (by @ZoeLeah) * Shift K3s and K8s versions forward. (by @mamercad) * BREAKING: Use the standardized labels recommended in the Helm docs. You can use `migrations/v1.0/standardize-labels.sh` to prepare an existing cluster before running `helm update`. (#351) (by @cognifloyd) * Drop support for `networking.k8s.io/v1beta1` which was removed in kubernetes v1.22 (EOL 2022-10-28) (#353) (by @cognifloyd)