From f7e8daec6235994b827fbddb113095d6fd34046c Mon Sep 17 00:00:00 2001 From: Denis O Date: Sun, 5 Nov 2023 12:01:20 -0800 Subject: [PATCH 1/5] Helm installation fix --- .circleci/config.yml | 2 +- modules/helm/install_test.go | 1 + modules/helm/upgrade_test.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0061c2cb9..fc18740a9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ env: &env GO111MODULE: auto K8S_VERSION: v1.18.20 # Same as EKS MINIKUBE_VERSION: v1.22.0 - HELM_VERSION: v3.8.0 + HELM_VERSION: v3.13.1 KUBECONFIG: /home/circleci/.kube/config BIN_BUILD_PARALLELISM: 3 diff --git a/modules/helm/install_test.go b/modules/helm/install_test.go index 5c0c4bf5e..147b87024 100644 --- a/modules/helm/install_test.go +++ b/modules/helm/install_test.go @@ -54,6 +54,7 @@ func TestRemoteChartInstall(t *testing.T) { SetValues: map[string]string{ "service.type": "NodePort", }, + Version: remoteChartVersion, } // Add the stable repo under a random name so as not to touch existing repo configs diff --git a/modules/helm/upgrade_test.go b/modules/helm/upgrade_test.go index c4da70da9..6e1b470d8 100644 --- a/modules/helm/upgrade_test.go +++ b/modules/helm/upgrade_test.go @@ -46,6 +46,7 @@ func TestRemoteChartInstallUpgradeRollback(t *testing.T) { SetValues: map[string]string{ "service.type": "NodePort", }, + Version: remoteChartVersion, } // Add the stable repo under a random name so as not to touch existing repo configs From 5431f6b2c45d974fc3cd9eefae4e98351600853b Mon Sep 17 00:00:00 2001 From: Denis O Date: Sun, 5 Nov 2023 12:29:55 -0800 Subject: [PATCH 2/5] version update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc18740a9..804737026 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ env: &env OPA_VERSION: v0.33.1 GO_VERSION: 1.21.1 GO111MODULE: auto - K8S_VERSION: v1.18.20 # Same as EKS + K8S_VERSION: v1.22.0 # Same as EKS MINIKUBE_VERSION: v1.22.0 HELM_VERSION: v3.13.1 KUBECONFIG: /home/circleci/.kube/config From 0bb2866293439f553e3ba71be5cc47368868208d Mon Sep 17 00:00:00 2001 From: Denis O Date: Sun, 5 Nov 2023 12:52:28 -0800 Subject: [PATCH 3/5] Updated K8S version used in tests --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 804737026..04689689b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ env: &env OPA_VERSION: v0.33.1 GO_VERSION: 1.21.1 GO111MODULE: auto - K8S_VERSION: v1.22.0 # Same as EKS + K8S_VERSION: v1.22.17 # Same as EKS MINIKUBE_VERSION: v1.22.0 HELM_VERSION: v3.13.1 KUBECONFIG: /home/circleci/.kube/config From e10815ae85fa3b74f8f35a0cb04748b3621750e2 Mon Sep 17 00:00:00 2001 From: Denis O Date: Sun, 5 Nov 2023 12:57:50 -0800 Subject: [PATCH 4/5] updated version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04689689b..3367c6527 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ env: &env OPA_VERSION: v0.33.1 GO_VERSION: 1.21.1 GO111MODULE: auto - K8S_VERSION: v1.22.17 # Same as EKS + K8S_VERSION: v1.20 # Same as EKS MINIKUBE_VERSION: v1.22.0 HELM_VERSION: v3.13.1 KUBECONFIG: /home/circleci/.kube/config From b9c40d19d5c88e1378ea9dd0a43693731db095f1 Mon Sep 17 00:00:00 2001 From: Denis O Date: Sun, 5 Nov 2023 12:58:46 -0800 Subject: [PATCH 5/5] version update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3367c6527..162c7a90b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ env: &env OPA_VERSION: v0.33.1 GO_VERSION: 1.21.1 GO111MODULE: auto - K8S_VERSION: v1.20 # Same as EKS + K8S_VERSION: v1.20.0 # Same as EKS MINIKUBE_VERSION: v1.22.0 HELM_VERSION: v3.13.1 KUBECONFIG: /home/circleci/.kube/config