From 74078e956db8715d2f1b09ab5b72c89db1ec13ec Mon Sep 17 00:00:00 2001 From: Michael Burman Date: Wed, 16 Nov 2022 13:15:55 +0000 Subject: [PATCH] Upgrade test has to upgrade from 1.12, nothing older will work in Kube 1.25 --- tests/upgrade_operator/kustomization.yaml | 2 +- tests/upgrade_operator/upgrade_operator_suite_test.go | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/upgrade_operator/kustomization.yaml b/tests/upgrade_operator/kustomization.yaml index 46b16e48..f487080d 100644 --- a/tests/upgrade_operator/kustomization.yaml +++ b/tests/upgrade_operator/kustomization.yaml @@ -4,4 +4,4 @@ namespace: test-upgrade-operator apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.8.0 +- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.12.0 diff --git a/tests/upgrade_operator/upgrade_operator_suite_test.go b/tests/upgrade_operator/upgrade_operator_suite_test.go index c8295fa5..74cbaf12 100644 --- a/tests/upgrade_operator/upgrade_operator_suite_test.go +++ b/tests/upgrade_operator/upgrade_operator_suite_test.go @@ -46,13 +46,11 @@ func TestLifecycle(t *testing.T) { RunSpecs(t, testName) } -// InstallOldOperator installs the oldest supported upgrade path (this is the first k8ssandra/cass-operator release) +// InstallOldOperator installs the oldest supported upgrade path (for Kubernetes 1.25) func InstallOldOperator() { - step := "install cass-operator 1.8.0" + step := "install cass-operator 1.12.0" By(step) - // kubectl apply -f https://raw.githubusercontent.com/k8ssandra/cass-operator/v1.7.1/docs/user/cass-operator-manifests.yaml - // kubectl apply -k "github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.8.0" err := kustomize.DeployDir(namespace, "upgrade_operator") Expect(err).ToNot(HaveOccurred()) } @@ -123,7 +121,7 @@ var _ = Describe(testName, func() { // Update Cassandra version to ensure we can still do changes step = "perform cassandra upgrade" - json = "{\"spec\": {\"serverVersion\": \"3.11.12\"}}" + json = "{\"spec\": {\"serverVersion\": \"3.11.14\"}}" k = kubectl.PatchMerge(dcResource, json) ns.ExecAndLog(step, k)