From 0948d1440d2dbbed3a48149e19d1d32e8c89a7b7 Mon Sep 17 00:00:00 2001 From: fluxcdbot Date: Fri, 10 May 2024 15:20:11 +0000 Subject: [PATCH 1/2] Update toolkit components - helm-controller to v1.0.1 https://github.com/fluxcd/helm-controller/blob/v1.0.1/CHANGELOG.md Signed-off-by: GitHub --- go.mod | 2 +- go.sum | 4 ++-- manifests/bases/helm-controller/kustomization.yaml | 4 ++-- manifests/crds/kustomization.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 40b4605d82..7eeeae090b 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/distribution/distribution/v3 v3.0.0-alpha.1 github.com/fluxcd/cli-utils v0.36.0-flux.7 github.com/fluxcd/go-git-providers v0.20.1 - github.com/fluxcd/helm-controller/api v1.0.0 + github.com/fluxcd/helm-controller/api v1.0.1 github.com/fluxcd/image-automation-controller/api v0.38.0 github.com/fluxcd/image-reflector-controller/api v0.32.0 github.com/fluxcd/kustomize-controller/api v1.3.0 diff --git a/go.sum b/go.sum index 1fce9e2e5b..a335067734 100644 --- a/go.sum +++ b/go.sum @@ -157,8 +157,8 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg= github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo= github.com/fluxcd/go-git-providers v0.20.1 h1:ER10UUup3y/lAyANvMjgaYI/9av/upetF2PTi3aCqvs= github.com/fluxcd/go-git-providers v0.20.1/go.mod h1:FhBThaf3/kyKCBg4v0mKcQqQB2rPDv/L8baH3+nFtHc= -github.com/fluxcd/helm-controller/api v1.0.0 h1:sn7bNtqBPwn2Y5H4UBBUHFiE2G0tSLfsENVaOipNXpo= -github.com/fluxcd/helm-controller/api v1.0.0/go.mod h1:/6AD5a2qjo/ttxVM8GR33syLZwqigta60DCLdy8GrME= +github.com/fluxcd/helm-controller/api v1.0.1 h1:Gn9qEVuif6D5+gHmVwTEZkR4+nmLOcOhKx4Sw2gL2EA= +github.com/fluxcd/helm-controller/api v1.0.1/go.mod h1:/6AD5a2qjo/ttxVM8GR33syLZwqigta60DCLdy8GrME= github.com/fluxcd/image-automation-controller/api v0.38.0 h1:+phX67uf0INGDC4sghsPPNUiE8taVp7AcWgJH8LkiUk= github.com/fluxcd/image-automation-controller/api v0.38.0/go.mod h1:FfWWRxG03514+MUNJ+uN6fXzjwdbqsJqCggukIZ1tx8= github.com/fluxcd/image-reflector-controller/api v0.32.0 h1:mb/v9JzRHcjLcnGqmgsq0+yCcoOyae/TrOWae9T87PE= diff --git a/manifests/bases/helm-controller/kustomization.yaml b/manifests/bases/helm-controller/kustomization.yaml index 0bfb596d1c..5f08e8473a 100644 --- a/manifests/bases/helm-controller/kustomization.yaml +++ b/manifests/bases/helm-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- https://github.com/fluxcd/helm-controller/releases/download/v1.0.0/helm-controller.crds.yaml -- https://github.com/fluxcd/helm-controller/releases/download/v1.0.0/helm-controller.deployment.yaml +- https://github.com/fluxcd/helm-controller/releases/download/v1.0.1/helm-controller.crds.yaml +- https://github.com/fluxcd/helm-controller/releases/download/v1.0.1/helm-controller.deployment.yaml - account.yaml transformers: - labels.yaml diff --git a/manifests/crds/kustomization.yaml b/manifests/crds/kustomization.yaml index c1e5953add..93b2483375 100644 --- a/manifests/crds/kustomization.yaml +++ b/manifests/crds/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization resources: - https://github.com/fluxcd/source-controller/releases/download/v1.3.0/source-controller.crds.yaml - https://github.com/fluxcd/kustomize-controller/releases/download/v1.3.0/kustomize-controller.crds.yaml -- https://github.com/fluxcd/helm-controller/releases/download/v1.0.0/helm-controller.crds.yaml +- https://github.com/fluxcd/helm-controller/releases/download/v1.0.1/helm-controller.crds.yaml - https://github.com/fluxcd/notification-controller/releases/download/v1.3.0/notification-controller.crds.yaml - https://github.com/fluxcd/image-reflector-controller/releases/download/v0.32.0/image-reflector-controller.crds.yaml - https://github.com/fluxcd/image-automation-controller/releases/download/v0.38.0/image-automation-controller.crds.yaml From 6edf2bc5a2dcd76a76543cfaeabc95bfd7ed4aff Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Fri, 10 May 2024 18:29:37 +0300 Subject: [PATCH 2/2] Update `helm-controller/api` to v1.0.1 Signed-off-by: Stefan Prodan --- cmd/flux/create_helmrelease.go | 2 +- tests/integration/go.mod | 2 +- tests/integration/go.sum | 4 ++-- tests/integration/oci_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/flux/create_helmrelease.go b/cmd/flux/create_helmrelease.go index 70d2b7390a..56c5edb0e6 100644 --- a/cmd/flux/create_helmrelease.go +++ b/cmd/flux/create_helmrelease.go @@ -182,7 +182,7 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error { }, TargetNamespace: helmReleaseArgs.targetNamespace, - Chart: helmv2.HelmChartTemplate{ + Chart: &helmv2.HelmChartTemplate{ Spec: helmv2.HelmChartTemplateSpec{ Chart: helmReleaseArgs.chart, Version: helmReleaseArgs.chartVersion, diff --git a/tests/integration/go.mod b/tests/integration/go.mod index 893d91ce30..1873221306 100644 --- a/tests/integration/go.mod +++ b/tests/integration/go.mod @@ -6,7 +6,7 @@ require ( cloud.google.com/go/pubsub v1.38.0 github.com/Azure/azure-event-hubs-go/v3 v3.6.2 github.com/chainguard-dev/git-urls v1.0.2 - github.com/fluxcd/helm-controller/api v1.0.0 + github.com/fluxcd/helm-controller/api v1.0.1 github.com/fluxcd/image-automation-controller/api v0.38.0 github.com/fluxcd/image-reflector-controller/api v0.32.0 github.com/fluxcd/kustomize-controller/api v1.3.0 diff --git a/tests/integration/go.sum b/tests/integration/go.sum index c730ef67ab..180de21633 100644 --- a/tests/integration/go.sum +++ b/tests/integration/go.sum @@ -112,8 +112,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg= github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo= -github.com/fluxcd/helm-controller/api v1.0.0 h1:sn7bNtqBPwn2Y5H4UBBUHFiE2G0tSLfsENVaOipNXpo= -github.com/fluxcd/helm-controller/api v1.0.0/go.mod h1:/6AD5a2qjo/ttxVM8GR33syLZwqigta60DCLdy8GrME= +github.com/fluxcd/helm-controller/api v1.0.1 h1:Gn9qEVuif6D5+gHmVwTEZkR4+nmLOcOhKx4Sw2gL2EA= +github.com/fluxcd/helm-controller/api v1.0.1/go.mod h1:/6AD5a2qjo/ttxVM8GR33syLZwqigta60DCLdy8GrME= github.com/fluxcd/image-automation-controller/api v0.38.0 h1:+phX67uf0INGDC4sghsPPNUiE8taVp7AcWgJH8LkiUk= github.com/fluxcd/image-automation-controller/api v0.38.0/go.mod h1:FfWWRxG03514+MUNJ+uN6fXzjwdbqsJqCggukIZ1tx8= github.com/fluxcd/image-reflector-controller/api v0.32.0 h1:mb/v9JzRHcjLcnGqmgsq0+yCcoOyae/TrOWae9T87PE= diff --git a/tests/integration/oci_test.go b/tests/integration/oci_test.go index d50b69a683..cfacbfc062 100644 --- a/tests/integration/oci_test.go +++ b/tests/integration/oci_test.go @@ -70,7 +70,7 @@ func TestOCIHelmRelease(t *testing.T) { helmRelease := helmv2.HelmRelease{ ObjectMeta: metav1.ObjectMeta{Name: testID, Namespace: testID}, Spec: helmv2.HelmReleaseSpec{ - Chart: helmv2.HelmChartTemplate{ + Chart: &helmv2.HelmChartTemplate{ Spec: helmv2.HelmChartTemplateSpec{ Interval: &metav1.Duration{ Duration: 10 * time.Minute,