From e5db021e59d38f916684c2bd8f374dde7805cf9e Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Tue, 6 Jun 2023 11:51:12 +0200 Subject: [PATCH] hack/observability: move charts so they are ignored by go mod MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- hack/observability/.gitignore | 2 +- hack/observability/grafana/chart/kustomization.yaml | 6 ++++++ .../kube-state-metrics/chart/kustomization.yaml | 6 ++++++ hack/observability/loki/kustomization.yaml | 6 ++++++ hack/observability/parca/kustomization.yaml | 6 ++++++ hack/observability/prometheus/kustomization.yaml | 6 ++++++ hack/observability/promtail/kustomization.yaml | 6 ++++++ hack/observability/visualizer/kustomization.yaml | 6 ++++++ 8 files changed, 43 insertions(+), 1 deletion(-) diff --git a/hack/observability/.gitignore b/hack/observability/.gitignore index 1840e9c7b300..5ed0fc64d9ed 100644 --- a/hack/observability/.gitignore +++ b/hack/observability/.gitignore @@ -1,2 +1,2 @@ # ignore cached helm charts -charts +.charts diff --git a/hack/observability/grafana/chart/kustomization.yaml b/hack/observability/grafana/chart/kustomization.yaml index 61baf1084c2d..98a5b13823bd 100644 --- a/hack/observability/grafana/chart/kustomization.yaml +++ b/hack/observability/grafana/chart/kustomization.yaml @@ -5,3 +5,9 @@ helmCharts: namespace: observability valuesFile: values.yaml version: 6.56.5 + +helmGlobals: + # Store chart in ".charts" folder instead of "charts". + # Otherwise "go mod tidy" picks up dependencies of go files contained in the Helm Chart. + # "go mod tidy" ignores folders that begin with ".": https://pkg.go.dev/cmd/go#hdr-Package_lists_and_patterns. + chartHome: .charts diff --git a/hack/observability/kube-state-metrics/chart/kustomization.yaml b/hack/observability/kube-state-metrics/chart/kustomization.yaml index 52ec0dfd377c..76fa30891803 100644 --- a/hack/observability/kube-state-metrics/chart/kustomization.yaml +++ b/hack/observability/kube-state-metrics/chart/kustomization.yaml @@ -5,3 +5,9 @@ helmCharts: releaseName: kube-state-metrics valuesFile: values.yaml version: 5.6.4 + +helmGlobals: + # Store chart in ".charts" folder instead of "charts". + # Otherwise "go mod tidy" picks up dependencies of go files contained in the Helm Chart. + # "go mod tidy" ignores folders that begin with ".": https://pkg.go.dev/cmd/go#hdr-Package_lists_and_patterns. + chartHome: .charts diff --git a/hack/observability/loki/kustomization.yaml b/hack/observability/loki/kustomization.yaml index 79532e4d75d1..8b199abb8912 100644 --- a/hack/observability/loki/kustomization.yaml +++ b/hack/observability/loki/kustomization.yaml @@ -8,3 +8,9 @@ helmCharts: namespace: observability valuesFile: values.yaml version: 5.5.4 + +helmGlobals: + # Store chart in ".charts" folder instead of "charts". + # Otherwise "go mod tidy" picks up dependencies of go files contained in the Helm Chart. + # "go mod tidy" ignores folders that begin with ".": https://pkg.go.dev/cmd/go#hdr-Package_lists_and_patterns. + chartHome: .charts diff --git a/hack/observability/parca/kustomization.yaml b/hack/observability/parca/kustomization.yaml index 7f950b4a134e..60ceb93b9b4c 100644 --- a/hack/observability/parca/kustomization.yaml +++ b/hack/observability/parca/kustomization.yaml @@ -9,3 +9,9 @@ helmCharts: namespace: default valuesFile: values.yaml version: 4.10.0 + +helmGlobals: + # Store chart in ".charts" folder instead of "charts". + # Otherwise "go mod tidy" picks up dependencies of go files contained in the Helm Chart. + # "go mod tidy" ignores folders that begin with ".": https://pkg.go.dev/cmd/go#hdr-Package_lists_and_patterns. + chartHome: .charts diff --git a/hack/observability/prometheus/kustomization.yaml b/hack/observability/prometheus/kustomization.yaml index 1301a03239a1..88bc0cb95a7a 100644 --- a/hack/observability/prometheus/kustomization.yaml +++ b/hack/observability/prometheus/kustomization.yaml @@ -8,3 +8,9 @@ helmCharts: namespace: observability valuesFile: values.yaml version: 22.6.2 + +helmGlobals: + # Store chart in ".charts" folder instead of "charts". + # Otherwise "go mod tidy" picks up dependencies of go files contained in the Helm Chart. + # "go mod tidy" ignores folders that begin with ".": https://pkg.go.dev/cmd/go#hdr-Package_lists_and_patterns. + chartHome: .charts diff --git a/hack/observability/promtail/kustomization.yaml b/hack/observability/promtail/kustomization.yaml index 76885d7eb77e..16b1ea3bb587 100644 --- a/hack/observability/promtail/kustomization.yaml +++ b/hack/observability/promtail/kustomization.yaml @@ -8,3 +8,9 @@ helmCharts: namespace: observability valuesFile: values.yaml version: 6.11.2 + +helmGlobals: + # Store chart in ".charts" folder instead of "charts". + # Otherwise "go mod tidy" picks up dependencies of go files contained in the Helm Chart. + # "go mod tidy" ignores folders that begin with ".": https://pkg.go.dev/cmd/go#hdr-Package_lists_and_patterns. + chartHome: .charts diff --git a/hack/observability/visualizer/kustomization.yaml b/hack/observability/visualizer/kustomization.yaml index 642d7379614d..e261d012e8ea 100644 --- a/hack/observability/visualizer/kustomization.yaml +++ b/hack/observability/visualizer/kustomization.yaml @@ -8,3 +8,9 @@ helmCharts: namespace: observability valuesFile: values.yaml version: 1.1.0 + +helmGlobals: + # Store chart in ".charts" folder instead of "charts". + # Otherwise "go mod tidy" picks up dependencies of go files contained in the Helm Chart. + # "go mod tidy" ignores folders that begin with ".": https://pkg.go.dev/cmd/go#hdr-Package_lists_and_patterns. + chartHome: .charts