From 0490ea3098bd0e587ebac02507f8189a658e87a0 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:32:49 +0000 Subject: [PATCH 1/8] feat: update test-app to v1.0.0 and architect to v5.11.4 - Update test-app from v0.1.1/v0.1.2 to v1.0.0 to fix PSP-related test failures in k8s 1.29 - Update architect from v5.10.1 to v5.11.4 Co-Authored-By: Marian Steinbach --- .circleci/config.yml | 2 +- integration/test/basic/basic_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1216a675..18daa935 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - architect: giantswarm/architect@5.10.1 + architect: giantswarm/architect@5.11.4 workflows: test: diff --git a/integration/test/basic/basic_test.go b/integration/test/basic/basic_test.go index 570fa128..fcbd2f2a 100644 --- a/integration/test/basic/basic_test.go +++ b/integration/test/basic/basic_test.go @@ -39,7 +39,7 @@ func TestBasic(t *testing.T) { var chartPath string { - tarballURL := "https://giantswarm.github.io/default-catalog/test-app-0.1.1.tgz" + tarballURL := "https://giantswarm.github.io/default-catalog/test-app-1.0.0.tgz" config.Logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("pulling tarball %#q", tarballURL)) chartPath, err = config.HelmClient.PullChartTarball(ctx, tarballURL) @@ -170,7 +170,7 @@ func TestBasic(t *testing.T) { var updatedChartPath string { - tarballURL := "https://giantswarm.github.io/default-catalog/test-app-0.1.2.tgz" + tarballURL := "https://giantswarm.github.io/default-catalog/test-app-1.0.0.tgz" config.Logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("pulling tarball %#q", tarballURL)) updatedChartPath, err = config.HelmClient.PullChartTarball(ctx, tarballURL) From ebbb22995ff0a9f6cf16118905502b45119e4c3a Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:39:38 +0000 Subject: [PATCH 2/8] test: update test expectations for test-app v1.0.0 Co-Authored-By: Marian Steinbach --- integration/test/basic/basic_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/integration/test/basic/basic_test.go b/integration/test/basic/basic_test.go index fcbd2f2a..e57a8e0a 100644 --- a/integration/test/basic/basic_test.go +++ b/integration/test/basic/basic_test.go @@ -60,7 +60,13 @@ func TestBasic(t *testing.T) { } expectedChart := helmclient.Chart{ - Version: "0.1.1", + Version: "1.0.0", + Annotations: map[string]string{ + "application.giantswarm.io/metadata": "https://giantswarm.github.io/default-catalog/test-app-1.0.0.tgz-meta/main.yaml", + "application.giantswarm.io/readme": "https://giantswarm.github.io/default-catalog/test-app-1.0.0.tgz-meta/README.md", + "application.giantswarm.io/team": "honeybadger", + "application.giantswarm.io/values-schema": "https://giantswarm.github.io/default-catalog/test-app-1.0.0.tgz-meta/values.schema.json", + }, } if !cmp.Equal(chart, expectedChart) { t.Fatalf("want matching Chart \n %s", cmp.Diff(chart, expectedChart)) From 65bbd950d2a85e96e8d68c564a2fd303021afb6a Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:40:27 +0000 Subject: [PATCH 3/8] test: update remaining test-app version references to v1.0.0 Co-Authored-By: Marian Steinbach --- integration/test/basic/basic_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration/test/basic/basic_test.go b/integration/test/basic/basic_test.go index e57a8e0a..a384de6a 100644 --- a/integration/test/basic/basic_test.go +++ b/integration/test/basic/basic_test.go @@ -123,7 +123,7 @@ func TestBasic(t *testing.T) { Revision: 1, Status: helmclient.StatusDeployed, Values: values, - Version: "0.1.1", + Version: "1.0.0", } if releaseContent.LastDeployed.IsZero() { @@ -222,7 +222,7 @@ func TestBasic(t *testing.T) { Revision: 2, Status: helmclient.StatusDeployed, Values: updatedValues, - Version: "0.1.2", + Version: "1.0.0", } if releaseContent.LastDeployed.IsZero() { @@ -268,7 +268,7 @@ func TestBasic(t *testing.T) { Revision: 3, Status: helmclient.StatusDeployed, Values: values, - Version: "0.1.1", + Version: "1.0.0", } if releaseContent.LastDeployed.IsZero() { From 5d398172a27b18d1be9d774869d2071e6301d738 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:42:29 +0000 Subject: [PATCH 4/8] style: fix go fmt issues in basic_test.go Co-Authored-By: Marian Steinbach --- integration/test/basic/basic_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/test/basic/basic_test.go b/integration/test/basic/basic_test.go index a384de6a..1afd98e8 100644 --- a/integration/test/basic/basic_test.go +++ b/integration/test/basic/basic_test.go @@ -62,8 +62,8 @@ func TestBasic(t *testing.T) { expectedChart := helmclient.Chart{ Version: "1.0.0", Annotations: map[string]string{ - "application.giantswarm.io/metadata": "https://giantswarm.github.io/default-catalog/test-app-1.0.0.tgz-meta/main.yaml", - "application.giantswarm.io/readme": "https://giantswarm.github.io/default-catalog/test-app-1.0.0.tgz-meta/README.md", + "application.giantswarm.io/metadata": "https://giantswarm.github.io/default-catalog/test-app-1.0.0.tgz-meta/main.yaml", + "application.giantswarm.io/readme": "https://giantswarm.github.io/default-catalog/test-app-1.0.0.tgz-meta/README.md", "application.giantswarm.io/team": "honeybadger", "application.giantswarm.io/values-schema": "https://giantswarm.github.io/default-catalog/test-app-1.0.0.tgz-meta/values.schema.json", }, From 275b7ac4bb7c351b9581e5ff903273947f6e6175 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:45:20 +0000 Subject: [PATCH 5/8] chore: fix go version in go.mod Co-Authored-By: Marian Steinbach --- go.mod | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f155d39a..6695739a 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/giantswarm/helmclient/v4 -go 1.23.0 - -toolchain go1.23.5 +go 1.18 require ( github.com/giantswarm/backoff v1.0.1 From 5a77df96d599bbabd557542c6d799afff4465dbc Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:50:59 +0000 Subject: [PATCH 6/8] chore: fix go version format in go.mod Co-Authored-By: Marian Steinbach --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6695739a..a63b998a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/giantswarm/helmclient/v4 -go 1.18 +go 1.23 require ( github.com/giantswarm/backoff v1.0.1 From c940bef45ff57566e274e9eb0e558cb937dc286d Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:52:05 +0000 Subject: [PATCH 7/8] chore: revert to go 1.18 in go.mod Co-Authored-By: Marian Steinbach --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a63b998a..6695739a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/giantswarm/helmclient/v4 -go 1.23 +go 1.18 require ( github.com/giantswarm/backoff v1.0.1 From 0642ff64cbdf4509700a85d02f4edc186958ca1d Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:53:48 +0000 Subject: [PATCH 8/8] chore: update go version to 1.23.0 Co-Authored-By: Marian Steinbach --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6695739a..fd6ce8f3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/giantswarm/helmclient/v4 -go 1.18 +go 1.23.0 require ( github.com/giantswarm/backoff v1.0.1