From a9cc7fc584c32826914576814b1cd7b268d24c3f Mon Sep 17 00:00:00 2001 From: Philipp B Date: Thu, 23 Nov 2023 18:26:54 +0100 Subject: [PATCH 1/3] helm chart: fix broken default values after 3166d43 (#1316) Fixes #1315. --- deploy/helm/grafana-operator/README.md | 1 - deploy/helm/grafana-operator/templates/deployment.yaml | 4 ---- deploy/helm/grafana-operator/values.yaml | 7 +++---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md index 7259446f2..1f08ec793 100644 --- a/deploy/helm/grafana-operator/README.md +++ b/deploy/helm/grafana-operator/README.md @@ -38,7 +38,6 @@ It's easier to just manage this configuration outside of the operator. | additionalLabels | object | `{}` | additional labels to add to all resources | | affinity | object | `{}` | pod affinity | | env | list | `[]` | Additional environment variables | -| env.grafanaImage | string | `""` | grafana image, e.g. docker.io/grafana/grafana:9.1.6, overwrites the default grafana image defined in the operator | | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | The image pull policy to use in grafana operator container | | image.repository | string | `"ghcr.io/grafana-operator/grafana-operator"` | grafana operator image repository | diff --git a/deploy/helm/grafana-operator/templates/deployment.yaml b/deploy/helm/grafana-operator/templates/deployment.yaml index 77d1a204d..db3f2ff0f 100644 --- a/deploy/helm/grafana-operator/templates/deployment.yaml +++ b/deploy/helm/grafana-operator/templates/deployment.yaml @@ -42,10 +42,6 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: - {{- if .Values.env.grafanaImage }} - - name: RELATED_IMAGE_GRAFANA - value: {{ .Values.env.grafanaImage }} - {{- end }} - name: WATCH_NAMESPACE {{- if and .Values.namespaceScope (eq .Values.watchNamespaces "") }} value: {{ .Release.Namespace }} diff --git a/deploy/helm/grafana-operator/values.yaml b/deploy/helm/grafana-operator/values.yaml index deb6e0742..0a3df1e58 100644 --- a/deploy/helm/grafana-operator/values.yaml +++ b/deploy/helm/grafana-operator/values.yaml @@ -12,6 +12,9 @@ watchNamespaces: "" # -- Additional environment variables env: [] + # -- grafana image, e.g. docker.io/grafana/grafana:9.1.6, overwrites the default grafana image defined in the operator + # - name: RELATED_IMAGE_GRAFANA + # value: "docker.io/grafana/grafana:9.1.6" # - name: MY_VAR # value: "myvalue" @@ -26,10 +29,6 @@ image: # -- image pull secrets imagePullSecrets: [] -env: - # -- grafana image, e.g. docker.io/grafana/grafana:9.1.6, overwrites the default grafana image defined in the operator - grafanaImage: "" - nameOverride: "" fullnameOverride: "" From 3d39fd3909e3b84b3e5530329f7f5d03b3c655a6 Mon Sep 17 00:00:00 2001 From: Edvin N Date: Thu, 23 Nov 2023 20:10:08 +0100 Subject: [PATCH 2/3] prepare 5.5.1 (#1317) --- Makefile | 2 +- deploy/helm/grafana-operator/Chart.yaml | 2 +- deploy/helm/grafana-operator/README.md | 4 ++-- hugo/config.toml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 91cad8b0b..67129cdd3 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # NOTE: this section almost matches outputs out kubebuilder v3.7.0 ### # Current Operator version -VERSION ?= 5.5.0 +VERSION ?= 5.5.1 # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) diff --git a/deploy/helm/grafana-operator/Chart.yaml b/deploy/helm/grafana-operator/Chart.yaml index a70604084..40081c816 100644 --- a/deploy/helm/grafana-operator/Chart.yaml +++ b/deploy/helm/grafana-operator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.1 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v5.5.0" +appVersion: "v5.5.1" diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md index 1f08ec793..163309d91 100644 --- a/deploy/helm/grafana-operator/README.md +++ b/deploy/helm/grafana-operator/README.md @@ -7,14 +7,14 @@ linkTitle: "Helm installation" [grafana-operator](https://github.com/grafana-operator/grafana-operator) for Kubernetes to manage Grafana instances and grafana resources. -![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.5.0](https://img.shields.io/badge/AppVersion-v5.5.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.5.1](https://img.shields.io/badge/AppVersion-v5.5.1-informational?style=flat-square) ## Installation This is a OCI helm chart, helm started support OCI in version 3.8.0. ```shell -helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.5.0 +helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.5.1 ``` Sadly helm OCI charts currently don't support searching for available versions of a helm [oci registry](https://github.com/helm/helm/issues/11000). diff --git a/hugo/config.toml b/hugo/config.toml index ce8484a43..52b883c61 100644 --- a/hugo/config.toml +++ b/hugo/config.toml @@ -59,7 +59,7 @@ archived_version = false # The version number for the version of the docs represented in this doc set. # Used in the "version-banner" partial to display a version number for the # current doc set. -version = "v5.5.0" +version = "v5.5.1" # A link to latest version of the docs. Used in the "version-banner" partial to # point people to the main doc site. From 8629b6a2ec850db3666ad6a7399fda2ab4ae80dd Mon Sep 17 00:00:00 2001 From: Edvin N Date: Fri, 24 Nov 2023 13:16:38 +0100 Subject: [PATCH 3/3] Run helm template as a basic check of the helm chart (#1318) * Run helm template as a basic check of the helm chart * Update .github/workflows/pr-validation.yaml Co-authored-by: Igor Beliakov <46579601+weisdd@users.noreply.github.com> --------- Co-authored-by: Igor Beliakov <46579601+weisdd@users.noreply.github.com> --- .github/workflows/pr-validation.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/pr-validation.yaml b/.github/workflows/pr-validation.yaml index 99d900663..9fb45d8b1 100644 --- a/.github/workflows/pr-validation.yaml +++ b/.github/workflows/pr-validation.yaml @@ -133,6 +133,13 @@ jobs: with: go-version-file: "go.mod" + - name: Run helm-template + run: | + helm template deploy/helm/grafana-operator/ + + - name: Run helm-lint + run: | + helm lint deploy/helm/grafana-operator/ - name: Run helm-docs run: | make helm/docs