From 3166d434c07a9d009412b1d60d93bcdf3ff0294b Mon Sep 17 00:00:00 2001 From: Fabian Mueller Date: Fri, 8 Sep 2023 15:58:37 +0200 Subject: [PATCH 01/11] Get Grafana Image from env; bundle cmd for redhat marketplace --- Makefile | 48 ++++++++++++++++--- PREPARE_RELEASE.md | 25 +++++----- ...rafana-operator.clusterserviceversion.yaml | 2 + config/default/kustomization.yaml | 6 +-- config/manager/kustomization.yaml | 6 ++- config/manager/manager.yaml | 2 + .../grafana/deployment_reconciler.go | 11 ++++- .../templates/deployment.yaml | 4 ++ deploy/helm/grafana-operator/values.yaml | 4 ++ .../cluster_scoped/kustomization.yaml | 4 +- .../namespace_scoped/kustomization.yaml | 4 +- 11 files changed, 85 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 78d7d00ac..8d87d75fa 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,20 @@ # Current Operator version VERSION ?= 5.4.2 +# BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command +BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) + +# USE_IMAGE_DIGESTS defines if images are resolved via tags or digests +# You can enable this value if you would like to use SHA Based Digests +# To enable set flag to true +USE_IMAGE_DIGESTS ?= false +ifeq ($(USE_IMAGE_DIGESTS), true) + BUNDLE_GEN_FLAGS += --use-image-digests +endif + +# Set the Operator SDK version to use. By default, what is installed on the system is used. +# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. +OPERATOR_SDK_VERSION ?= v1.31.0 # Image URL to use all building/pushing image targets REGISTRY ?= ghcr.io REPO ?= grafana-operator @@ -151,6 +165,23 @@ envtest: $(ENVTEST) ## Download envtest-setup locally if necessary. $(ENVTEST): $(LOCALBIN) test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest +.PHONY: operator-sdk +OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk +operator-sdk: ## Download operator-sdk locally if necessary. +ifeq (,$(wildcard $(OPERATOR_SDK))) +ifeq (, $(shell which operator-sdk 2>/dev/null)) + @{ \ + set -e ;\ + mkdir -p $(dir $(OPERATOR_SDK)) ;\ + OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ + curl -sSLo $(OPERATOR_SDK) https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$${OS}_$${ARCH} ;\ + chmod +x $(OPERATOR_SDK) ;\ + } +else +OPERATOR_SDK = $(shell which operator-sdk) +endif +endif + ### # END OF kubebuilder SECTION ### @@ -175,14 +206,19 @@ endif BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) .PHONY: bundle -bundle: manifests kustomize ## Generate bundle manifests and metadata, then validate generated files. - operator-sdk generate kustomize manifests -q +bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files. + $(OPERATOR_SDK) generate kustomize manifests -q cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) - $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) - operator-sdk bundle validate ./bundle + $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) + $(OPERATOR_SDK) bundle validate ./bundle -# e2e +.PHONY: bundle/redhat +bundle/redhat: BUNDLE_GEN_FLAGS += --use-image-digests +bundle/redhat: + $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) + $(OPERATOR_SDK) bundle validate ./bundle +# e2e .PHONY: e2e e2e: kuttl install deploy-kuttl ## Run e2e tests using kuttl. $(KUTTL) test @@ -291,7 +327,7 @@ ifeq (,$(shell which opm 2>/dev/null)) set -e ;\ mkdir -p $(dir $(OPM)) ;\ OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ - curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$${OS}-$${ARCH}-opm ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.23.2/$${OS}-$${ARCH}-opm ;\ chmod +x $(OPM) ;\ } else diff --git a/PREPARE_RELEASE.md b/PREPARE_RELEASE.md index 4e368bbd5..bb8c52d49 100644 --- a/PREPARE_RELEASE.md +++ b/PREPARE_RELEASE.md @@ -15,18 +15,17 @@ After that you need to run `make helm/docs` which will generate the changes to b There is a lot of information on what is needed to manage OLM [compatible operators](https://redhat-connect.gitbook.io/certified-operator-guide/ocp-deployment/operator-metadata/creating-the-csv). - Update the `Makefile` version -- `make generate`, `make manifests` & `make bundle` -- Update `containerImage` field in `config/manifests/bases/grafana-operator.clusterserviceversion.yaml` -- Update `replaces` field in `config/manifests/bases/grafana-operator.clusterserviceversion.yaml` -- Update `CreatedAt` field in `config/manifests/bases/grafana-operator.clusterserviceversion.yaml` - You will have to asses when it's going to get merged and you will be able to do a release. - You should make sure it's the same date. If not you will have to change it - manually when creating PR:s to OLM. - - # This is how the time syntax should look. - $ docker inspect ghcr.io/grafana-operator/grafana-operator:v5.0.0 |jq '.[0].Created' - "2023-11-22T10:34:12.173861869Z" - # 2023-11-22T10:34:12Z is enough +- Run `make generate` & `make manifests` +- Update the following fields under `metadata.annotations` in `config/manifests/bases/grafana-operator.clusterserviceversion.yaml`: + - `containerImage` + - `replaces` + - `createdAt`: You will have to asses when it's going to get merged and you will be able to do a release. You should make sure it's the same date. If not you will have to change it manually when creating PR:s to OLM. + ``` + # This is how the time syntax should look. + $ docker inspect ghcr.io/grafana-operator/grafana-operator:v5.0.0 |jq '.[0].Created' + "2023-11-22T10:34:12.173861869Z" + # 2023-11-22T10:34:12Z is enough + ``` - Run `make bundle` - `Helm` look if any rbac rules have been changed in the last release, if so verify that the rbac rules for the helm chart is correct. This should be done in those PRs but it don't hurt take an extra look. - Create a PR and get it merged @@ -50,6 +49,8 @@ Update `operators/grafana-operator/grafana-operator.package.yaml` with the new t ## RedHat operators +- Run `make bundle/redhat` + Create a new version of the operator under [https://github.com/redhat-openshift-ecosystem/community-operators-prod/tree/main/operators/grafana-operator](https://github.com/redhat-openshift-ecosystem/community-operators-prod/tree/main/operators/grafana-operator) that matches the new tag. diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml index 1b92c88fd..fb23d0176 100644 --- a/bundle/manifests/grafana-operator.clusterserviceversion.yaml +++ b/bundle/manifests/grafana-operator.clusterserviceversion.yaml @@ -323,6 +323,8 @@ spec: - --metrics-bind-address=0.0.0.0:9090 - --leader-elect env: + - name: RELATED_IMAGE_GRAFANA + value: docker.io/grafana/grafana:9.1.6 - name: WATCH_NAMESPACE valueFrom: fieldRef: diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 827fb3e52..4e2932030 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -12,7 +12,7 @@ namePrefix: grafana-operator- #commonLabels: # someName: someValue -bases: +resources: - ../crd - ../rbac - ../manager @@ -23,10 +23,8 @@ bases: #- ../certmanager # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. #- ../prometheus - -resources: # Add metrics service - - metrics_service.yaml +- metrics_service.yaml patchesStrategicMerge: # Protect the /metrics endpoint by putting it behind auth. diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index ef986be44..64e2deff7 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,3 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + resources: - manager.yaml @@ -8,8 +11,7 @@ configMapGenerator: - files: - controller_manager_config.yaml name: manager-config -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization + images: - name: controller newName: ghcr.io/grafana-operator/grafana-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 637544fe8..ed4844aab 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -58,6 +58,8 @@ spec: cpu: 100m memory: 20Mi env: + - name: RELATED_IMAGE_GRAFANA + value: "docker.io/grafana/grafana:9.1.6" - name: WATCH_NAMESPACE valueFrom: fieldRef: diff --git a/controllers/reconcilers/grafana/deployment_reconciler.go b/controllers/reconcilers/grafana/deployment_reconciler.go index ea7b97856..a57bc9569 100644 --- a/controllers/reconcilers/grafana/deployment_reconciler.go +++ b/controllers/reconcilers/grafana/deployment_reconciler.go @@ -3,6 +3,7 @@ package grafana import ( "context" "fmt" + "os" "github.com/grafana-operator/grafana-operator/v5/api/v1beta1" config2 "github.com/grafana-operator/grafana-operator/v5/controllers/config" @@ -132,10 +133,18 @@ func getVolumeMounts(cr *v1beta1.Grafana, scheme *runtime.Scheme) []v1.VolumeMou return mounts } +func setGrafanaImage() string { + grafanaImg := os.Getenv("RELATED_IMAGE_GRAFANA") + if grafanaImg == "" { + grafanaImg = fmt.Sprintf("%s@%s", config2.GrafanaImage, config2.GrafanaVersion) + } + return grafanaImg +} + func getContainers(cr *v1beta1.Grafana, scheme *runtime.Scheme, vars *v1beta1.OperatorReconcileVars, openshiftPlatform bool) []v1.Container { var containers []v1.Container - image := fmt.Sprintf("%s:%s", config2.GrafanaImage, config2.GrafanaVersion) + image := setGrafanaImage() plugins := model.GetPluginsConfigMap(cr, scheme) // env var to restart containers if plugins change diff --git a/deploy/helm/grafana-operator/templates/deployment.yaml b/deploy/helm/grafana-operator/templates/deployment.yaml index db3f2ff0f..77d1a204d 100644 --- a/deploy/helm/grafana-operator/templates/deployment.yaml +++ b/deploy/helm/grafana-operator/templates/deployment.yaml @@ -42,6 +42,10 @@ 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 ae3caa1f0..e7aceb76d 100644 --- a/deploy/helm/grafana-operator/values.yaml +++ b/deploy/helm/grafana-operator/values.yaml @@ -26,6 +26,10 @@ image: # -- image pull secrets imagePullSecrets: [] +env: + # -- grafana image, e.g. docker.io/grafana/grafana:9.1.6 + grafanaImage: "" + nameOverride: "" fullnameOverride: "" diff --git a/deploy/kustomize/overlays/cluster_scoped/kustomization.yaml b/deploy/kustomize/overlays/cluster_scoped/kustomization.yaml index 55b278edb..0fc201889 100644 --- a/deploy/kustomize/overlays/cluster_scoped/kustomization.yaml +++ b/deploy/kustomize/overlays/cluster_scoped/kustomization.yaml @@ -1,7 +1,5 @@ -bases: - - ../../base - namespace: grafana resources: + - ../../base - rbac.yaml diff --git a/deploy/kustomize/overlays/namespace_scoped/kustomization.yaml b/deploy/kustomize/overlays/namespace_scoped/kustomization.yaml index 97971dbda..dd6479d11 100644 --- a/deploy/kustomize/overlays/namespace_scoped/kustomization.yaml +++ b/deploy/kustomize/overlays/namespace_scoped/kustomization.yaml @@ -1,9 +1,7 @@ -bases: - - ../../base - namespace: grafana resources: + - ../../base - rbac.yaml patches: From 79546129ecd5ddb9ec50058dfa7a8e3fcb82726d Mon Sep 17 00:00:00 2001 From: Edvin Norling Date: Tue, 26 Sep 2023 20:23:08 +0200 Subject: [PATCH 02/11] update prepare_release.md --- PREPARE_RELEASE.md | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/PREPARE_RELEASE.md b/PREPARE_RELEASE.md index bb8c52d49..329f4c242 100644 --- a/PREPARE_RELEASE.md +++ b/PREPARE_RELEASE.md @@ -2,16 +2,28 @@ In this repo you will need to perform the following tasks manually -## Documentation +## New release -Currently our documentation needs to be updated in two spots. +Hurray, time for a new release. +Follow the instructions below. + +Currently our **documentation** needs to be updated in two spots. You need to change the version in [hugo/config.toml](hugo/config.toml). You also need to change the version for helm in [deploy/helm/grafana-operator/Chart.yaml](deploy/helm/grafana-operator/Chart.yaml). After that you need to run `make helm/docs` which will generate the changes to become visible on our homepage. +- `Helm` look if any rbac rules have been changed in the last release, if so verify that the rbac rules for the helm chart is correct. This should be done in those PRs but it don't hurt take an extra look. +- Create a PR and get it merged +- Create a new release with the new tag, make sure to compile release notes (github has an option to do this for you) + ## OLM +After version v5.4.1, we no longer update the image version in this repo, but only upstream in the OLM repos. +This to support disconnected mode, for more information see [PR 1234](https://github.com/grafana-operator/grafana-operator/pull/1234). + +After you have cut a new release according to the instructions above + There is a lot of information on what is needed to manage OLM [compatible operators](https://redhat-connect.gitbook.io/certified-operator-guide/ocp-deployment/operator-metadata/creating-the-csv). - Update the `Makefile` version @@ -27,9 +39,6 @@ There is a lot of information on what is needed to manage OLM [compatible operat # 2023-11-22T10:34:12Z is enough ``` - Run `make bundle` -- `Helm` look if any rbac rules have been changed in the last release, if so verify that the rbac rules for the helm chart is correct. This should be done in those PRs but it don't hurt take an extra look. -- Create a PR and get it merged -- Create a new release with the new tag, make sure to compile release notes (github has an option to do this for you) To update the OLM channels you will need to create a PR in the following repos: You will need to sign your commits, and make sure they are squashed before submitting the PR, be aware that these repos also require you to sign certain open-source agreement documents as part of the CI-checks. @@ -37,7 +46,7 @@ You will need to sign your commits, and make sure they are squashed before submi - [community operators](https://github.com/k8s-operatorhub/community-operators) - [RedHat operators](https://github.com/redhat-openshift-ecosystem/community-operators-prod/tree/main/operators) -## Community operators +### Community operators Create a new version of the operator under [https://github.com/k8s-operatorhub/community-operators/tree/main/operators/grafana-operator](https://github.com/k8s-operatorhub/community-operators/tree/main/operators/grafana-operator) @@ -47,7 +56,7 @@ Copy the content of `bundle/manifests/` in the grafana-operator repo from the ta Update `operators/grafana-operator/grafana-operator.package.yaml` with the new tag. -## RedHat operators +### RedHat operators - Run `make bundle/redhat` From 177f77e7db932430f158e8e3fb601bcb7c7891a5 Mon Sep 17 00:00:00 2001 From: Edvin Norling Date: Tue, 26 Sep 2023 20:25:22 +0200 Subject: [PATCH 03/11] remove space makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8d87d75fa..cffd82d52 100644 --- a/Makefile +++ b/Makefile @@ -214,7 +214,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada .PHONY: bundle/redhat bundle/redhat: BUNDLE_GEN_FLAGS += --use-image-digests -bundle/redhat: +bundle/redhat: $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) $(OPERATOR_SDK) bundle validate ./bundle From 5b0aeab5cadd82e0115c81ef5c59732297cc8e22 Mon Sep 17 00:00:00 2001 From: Edvin Norling Date: Tue, 26 Sep 2023 20:29:40 +0200 Subject: [PATCH 04/11] update prepare release --- PREPARE_RELEASE.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/PREPARE_RELEASE.md b/PREPARE_RELEASE.md index 329f4c242..45b195266 100644 --- a/PREPARE_RELEASE.md +++ b/PREPARE_RELEASE.md @@ -13,6 +13,7 @@ You need to change the version in [hugo/config.toml](hugo/config.toml). You also need to change the version for helm in [deploy/helm/grafana-operator/Chart.yaml](deploy/helm/grafana-operator/Chart.yaml). After that you need to run `make helm/docs` which will generate the changes to become visible on our homepage. +- Update the `Makefile` version - `Helm` look if any rbac rules have been changed in the last release, if so verify that the rbac rules for the helm chart is correct. This should be done in those PRs but it don't hurt take an extra look. - Create a PR and get it merged - Create a new release with the new tag, make sure to compile release notes (github has an option to do this for you) @@ -22,16 +23,15 @@ After that you need to run `make helm/docs` which will generate the changes to b After version v5.4.1, we no longer update the image version in this repo, but only upstream in the OLM repos. This to support disconnected mode, for more information see [PR 1234](https://github.com/grafana-operator/grafana-operator/pull/1234). -After you have cut a new release according to the instructions above +After cutting a new release according to the instructions above, run the below instructions in this repo and create a PR to the different upstream repos, there is no need to create a PR to this repo. There is a lot of information on what is needed to manage OLM [compatible operators](https://redhat-connect.gitbook.io/certified-operator-guide/ocp-deployment/operator-metadata/creating-the-csv). -- Update the `Makefile` version - Run `make generate` & `make manifests` - Update the following fields under `metadata.annotations` in `config/manifests/bases/grafana-operator.clusterserviceversion.yaml`: - `containerImage` - `replaces` - - `createdAt`: You will have to asses when it's going to get merged and you will be able to do a release. You should make sure it's the same date. If not you will have to change it manually when creating PR:s to OLM. + - `createdAt`: Make sure that createdAt matches when the image was published. If not you will have to change it manually when creating PR:s to OLM. ``` # This is how the time syntax should look. $ docker inspect ghcr.io/grafana-operator/grafana-operator:v5.0.0 |jq '.[0].Created' @@ -48,6 +48,8 @@ You will need to sign your commits, and make sure they are squashed before submi ### Community operators +- Run `make bundle/redhat` + Create a new version of the operator under [https://github.com/k8s-operatorhub/community-operators/tree/main/operators/grafana-operator](https://github.com/k8s-operatorhub/community-operators/tree/main/operators/grafana-operator) that matches the new tag. From aacc47afa150bdb58e960c692f8aa864c3fc74b5 Mon Sep 17 00:00:00 2001 From: Fabian Mueller Date: Wed, 27 Sep 2023 20:45:38 +0200 Subject: [PATCH 05/11] Add OPM_VERSION variable; update helm docu --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cffd82d52..775720779 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. OPERATOR_SDK_VERSION ?= v1.31.0 + +# Set the version for opm +OPM_VERSION ?= v1.23.2 + # Image URL to use all building/pushing image targets REGISTRY ?= ghcr.io REPO ?= grafana-operator @@ -327,7 +331,7 @@ ifeq (,$(shell which opm 2>/dev/null)) set -e ;\ mkdir -p $(dir $(OPM)) ;\ OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ - curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.23.2/$${OS}-$${ARCH}-opm ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/$(OPM_VERSION)/$${OS}-$${ARCH}-opm ;\ chmod +x $(OPM) ;\ } else From c1a282112a16014a3e5f3c1b63f9d1c7cdd06ee7 Mon Sep 17 00:00:00 2001 From: Fabian Mueller Date: Wed, 27 Sep 2023 22:48:46 +0200 Subject: [PATCH 06/11] Patch Grafana Image from code to manifest --- Makefile | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 775720779..a89984224 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,12 @@ endif # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. OPERATOR_SDK_VERSION ?= v1.31.0 -# Set the version for opm OPM_VERSION ?= v1.23.2 +YQ_VERSION ?= v4.35.2 + +# Read Grafana Image and Version from go code +GRAFANA_IMAGE := $(shell grep 'GrafanaImage' controllers/config/operator_constants.go | sed 's/.*"\(.*\)".*/\1/') +GRAFANA_VERSION := $(shell grep 'GrafanaVersion' controllers/config/operator_constants.go | sed 's/.*"\(.*\)".*/\1/') # Image URL to use all building/pushing image targets REGISTRY ?= ghcr.io @@ -68,12 +72,30 @@ all: manifests test kustomize-crd api-docs help: ## Display this help. @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) +.PHONY: yq +YQ = ./bin/yq +yq: ## Download yq locally if necessary. +ifeq (,$(wildcard $(YQ))) +ifeq (,$(shell which yq 2>/dev/null)) + @{ \ + set -e ;\ + mkdir -p $(dir $(YQ)) ;\ + OSTYPE=$(shell uname | awk '{print tolower($0)}') && ARCH=$(shell go env GOARCH) && \ + curl -sSLo $(YQ) https://github.com/mikefarah/yq/releases/download/$(YQ_VERSION)/yq_$${OSTYPE}_$${ARCH} ;\ + chmod +x $(YQ) ;\ + } +else +YQ = $(shell which yq) +endif +endif + ##@ Development .PHONY: manifests -manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. +manifests: yq controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." crd:maxDescLen=0,generateEmbeddedObjectMeta=false output:crd:artifacts:config=config/crd/bases $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." crd:maxDescLen=0,generateEmbeddedObjectMeta=false output:crd:artifacts:config=deploy/helm/grafana-operator/crds + yq -i '(select(.kind == "Deployment") | .spec.template.spec.containers[0].env[] |= select(.name == "RELATED_IMAGE_GRAFANA").value = "$(GRAFANA_IMAGE):$(GRAFANA_VERSION)"), (select(.kind == "Namespace"))' config/manager/manager.yaml .PHONY: kustomize-crd kustomize-crd: kustomize manifests From 7dab73c531e56599a5eeb3320917a01a18df92f4 Mon Sep 17 00:00:00 2001 From: Edvin Norling Date: Sat, 14 Oct 2023 14:02:41 +0200 Subject: [PATCH 07/11] update docs to use bundle/redhat only --- PREPARE_RELEASE.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/PREPARE_RELEASE.md b/PREPARE_RELEASE.md index 45b195266..2744842c9 100644 --- a/PREPARE_RELEASE.md +++ b/PREPARE_RELEASE.md @@ -38,7 +38,7 @@ There is a lot of information on what is needed to manage OLM [compatible operat "2023-11-22T10:34:12.173861869Z" # 2023-11-22T10:34:12Z is enough ``` -- Run `make bundle` +- Run `make bundle/redhat` To update the OLM channels you will need to create a PR in the following repos: You will need to sign your commits, and make sure they are squashed before submitting the PR, be aware that these repos also require you to sign certain open-source agreement documents as part of the CI-checks. @@ -48,7 +48,6 @@ You will need to sign your commits, and make sure they are squashed before submi ### Community operators -- Run `make bundle/redhat` Create a new version of the operator under [https://github.com/k8s-operatorhub/community-operators/tree/main/operators/grafana-operator](https://github.com/k8s-operatorhub/community-operators/tree/main/operators/grafana-operator) @@ -60,8 +59,6 @@ Update `operators/grafana-operator/grafana-operator.package.yaml` with the new t ### RedHat operators -- Run `make bundle/redhat` - Create a new version of the operator under [https://github.com/redhat-openshift-ecosystem/community-operators-prod/tree/main/operators/grafana-operator](https://github.com/redhat-openshift-ecosystem/community-operators-prod/tree/main/operators/grafana-operator) that matches the new tag. From b76be9d08bf292309abe9f413bf4eef3b08a1489 Mon Sep 17 00:00:00 2001 From: Fabian Mueller Date: Fri, 20 Oct 2023 22:34:07 +0200 Subject: [PATCH 08/11] small fixes; CSV generate by bundle/redhat --- Makefile | 6 +- bundle.Dockerfile | 2 +- ...rafana-operator.clusterserviceversion.yaml | 499 +++++++++--------- bundle/metadata/annotations.yaml | 2 +- config/scorecard/kustomization.yaml | 7 +- 5 files changed, 253 insertions(+), 263 deletions(-) diff --git a/Makefile b/Makefile index a89984224..d9bd3f40a 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.31.0 +OPERATOR_SDK_VERSION ?= v1.32.0 OPM_VERSION ?= v1.23.2 YQ_VERSION ?= v4.35.2 @@ -240,9 +240,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada .PHONY: bundle/redhat bundle/redhat: BUNDLE_GEN_FLAGS += --use-image-digests -bundle/redhat: - $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) - $(OPERATOR_SDK) bundle validate ./bundle +bundle/redhat: bundle # e2e .PHONY: e2e diff --git a/bundle.Dockerfile b/bundle.Dockerfile index ce8457153..d8251f59d 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=grafana-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml index fb23d0176..f7ff20bc8 100644 --- a/bundle/manifests/grafana-operator.clusterserviceversion.yaml +++ b/bundle/manifests/grafana-operator.clusterserviceversion.yaml @@ -106,215 +106,210 @@ spec: apiservicedefinitions: {} customresourcedefinitions: owned: - - description: GrafanaDashboard is the Schema for the grafanadashboards API - displayName: Grafana Dashboard - kind: GrafanaDashboard - name: grafanadashboards.grafana.integreatly.org - version: v1beta1 - - description: GrafanaDatasource is the Schema for the grafanadatasources API - displayName: Grafana Datasource - kind: GrafanaDatasource - name: grafanadatasources.grafana.integreatly.org - version: v1beta1 - - description: GrafanaFolder is the Schema for the grafanafolders API - displayName: Grafana Folder - kind: GrafanaFolder - name: grafanafolders.grafana.integreatly.org - version: v1beta1 - - description: Grafana is the Schema for the grafanas API - displayName: Grafana - kind: Grafana - name: grafanas.grafana.integreatly.org - version: v1beta1 + - description: GrafanaDashboard is the Schema for the grafanadashboards API + displayName: Grafana Dashboard + kind: GrafanaDashboard + name: grafanadashboards.grafana.integreatly.org + version: v1beta1 + - description: GrafanaDatasource is the Schema for the grafanadatasources API + displayName: Grafana Datasource + kind: GrafanaDatasource + name: grafanadatasources.grafana.integreatly.org + version: v1beta1 + - description: GrafanaFolder is the Schema for the grafanafolders API + displayName: Grafana Folder + kind: GrafanaFolder + name: grafanafolders.grafana.integreatly.org + version: v1beta1 + - description: Grafana is the Schema for the grafanas API + displayName: Grafana + kind: Grafana + name: grafanas.grafana.integreatly.org + version: v1beta1 description: Deploys and manages Grafana instances, dashboards and data sources displayName: Grafana Operator icon: - - base64data: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   id="Layer_1"
   x="0px"
   y="0px"
   width="57.799999"
   height="57.799999"
   viewBox="0 0 57.799999 57.8"
   xml:space="preserve"
   sodipodi:docname="logo_small.svg"
   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
   id="metadata3785"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
   id="defs3783" /><sodipodi:namedview
   pagecolor="#ffffff"
   bordercolor="#666666"
   borderopacity="1"
   objecttolerance="10"
   gridtolerance="10"
   guidetolerance="10"
   inkscape:pageopacity="0"
   inkscape:pageshadow="2"
   inkscape:window-width="2560"
   inkscape:window-height="1386"
   id="namedview3781"
   showgrid="false"
   inkscape:zoom="13.858714"
   inkscape:cx="75.412904"
   inkscape:cy="23.077606"
   inkscape:window-x="0"
   inkscape:window-y="0"
   inkscape:window-maximized="1"
   inkscape:current-layer="Layer_1" />
<style
   type="text/css"
   id="style3769">
	.st0{fill:#E6E7E8;}
	.st1{fill:url(#SVGID_1_);}
</style>

<linearGradient
   id="SVGID_1_"
   gradientUnits="userSpaceOnUse"
   x1="26.700001"
   y1="-9.8501997"
   x2="26.700001"
   y2="43.166"
   gradientTransform="matrix(1,0,0,-1,2,60.000002)">
	<stop
   offset="0"
   style="stop-color:#FFF100"
   id="stop3773" />
	<stop
   offset="1"
   style="stop-color:#F05A28"
   id="stop3775" />
</linearGradient>
<path
   class="st1"
   d="m 55.1,25.500002 c -0.1,-1 -0.3,-2.1 -0.6,-3.3 -0.3,-1.2 -0.8,-2.6 -1.5,-4 -0.7,-1.4 -1.6,-2.9 -2.8,-4.3 -0.5,-0.6 -1,-1.1 -1.5,-1.6 0.8,-3.2000004 -1,-6.0000004 -1,-6.0000004 -3.1,-0.2 -5.1,1 -5.8,1.5 -0.1,-0.1 -0.2,-0.1 -0.4,-0.2 -0.5,-0.2 -1,-0.4 -1.6,-0.6 -0.6,-0.2 -1.1,-0.3 -1.7,-0.5 -0.6,-0.1 -1.2,-0.3 -1.8,-0.3 -0.1,0 -0.2,0 -0.3,0 C 34.8,1.8000016 30.9,1.5258789e-6 30.9,1.5258789e-6 26.6,2.8000016 25.7,6.6000016 25.7,6.6000016 c 0,0 0,0.1 0,0.2 -0.2,0.1 -0.5,0.1 -0.7,0.2 -0.3,0.1 -0.7,0.2 -1,0.3 -0.3,0.1 -0.7,0.3 -1,0.4 -0.7,0.3 -1.3,0.6 -1.9,1 -0.6,0.3 -1.2,0.7 -1.8,1.1 -0.1,0 -0.2,-0.1 -0.2,-0.1 -6,-2.3 -11.4,0.5000004 -11.4,0.5000004 -0.5,6.4 2.4,10.4 3,11.2 -0.1,0.4 -0.3,0.8 -0.4,1.2 -0.4,1.4 -0.8,2.9 -1,4.5 0,0.2 -0.1,0.4 -0.1,0.7 -5.6,2.7 -7.2,8.4 -7.2,8.4 4.6,5.3 10,5.7 10,5.7 v 0 c 0.7,1.2 1.5,2.4 2.4,3.5 0.4,0.5 0.8,0.9 1.2,1.3 -1.7,4.8 0.2,8.9 0.2,8.9 5.2,0.2 8.6,-2.3 9.3,-2.8 0.5,0.2 1,0.3 1.6,0.5 1.6,0.4 3.2,0.6 4.8,0.7 0.4,0 0.8,0 1.2,0 h 0.2 0.1 0.3 0.3 v 0 c 2.4,3.5 6.7,4 6.7,4 3.4,-3.6 3.2,-7.2 3.2,-7.2 l -0.1,-0.1 c 0.7,-0.5 1.3,-1 1.9,-1.5 1.2,-1.1 2.3,-2.4 3.2,-3.7 0.1,-0.1 0.2,-0.3 0.2,-0.4 3.4,0.2 5.9,-2.1 5.9,-2.1 -0.6,-4 -3.1,-5.7 -3.1,-5.7 h -0.1 c 0,-0.2 0,-0.5 0.1,-0.7 0,-0.4 0,-0.8 0,-1.2 v -0.3 -0.1 -0.1 c 0,-0.1 0,-0.1 0,-0.1 v -0.2 -0.3 c 0,-0.1 0,-0.2 0,-0.3 0,-0.1 0,-0.2 0,-0.3 v -0.3 -0.3 c -0.1,-0.4 -0.1,-0.8 -0.2,-1.2 -0.4,-1.5 -1,-3 -1.8,-4.3 -0.8,-1.3 -1.8,-2.5 -2.9,-3.5 -1.1,-1 -2.4,-1.8 -3.7,-2.4 -1.3,-0.6 -2.7,-1 -4.1,-1.1 -0.7,-0.1 -1.4,-0.1 -2,-0.1 h -0.3 -0.1 -0.1 -0.1 -0.3 c -0.1,0 -0.2,0 -0.3,0 -0.3,0 -0.7,0.1 -1,0.1 -1.4,0.3 -2.7,0.7 -3.8,1.4 -1.1,0.7 -2.1,1.5 -2.9,2.5 -0.8,1 -1.4,2 -1.9,3.1 -0.4,1.1 -0.7,2.2 -0.7,3.3 0,0.3 0,0.6 0,0.8 0,0.1 0,0.1 0,0.2 v 0.2 c 0,0.1 0,0.3 0,0.4 0.1,0.6 0.2,1.1 0.3,1.6 0.3,1 0.8,2 1.4,2.8 0.6,0.8 1.3,1.5 2.1,2 0.8,0.5 1.6,0.9 2.4,1.1 0.8,0.2 1.6,0.3 2.3,0.3 0.1,0 0.2,0 0.3,0 h 0.1 0.1 c 0.1,0 0.2,0 0.2,0 0,0 0,0 0.1,0 h 0.1 0.1 c 0.1,0 0.2,0 0.3,0 0.1,0 0.2,0 0.3,-0.1 0.2,0 0.3,-0.1 0.5,-0.1 0.3,-0.1 0.6,-0.2 0.9,-0.4 0.3,-0.1 0.5,-0.3 0.8,-0.5 0.1,-0.1 0.1,-0.1 0.2,-0.2 0.3,-0.2 0.3,-0.6 0.1,-0.8 -0.2,-0.2 -0.5,-0.3 -0.7,-0.1 -0.2,-0.2 -0.2,-0.1 -0.3,-0.1 -0.2,0.1 -0.4,0.2 -0.7,0.3 -0.2,0.1 -0.5,0.1 -0.8,0.2 -0.1,0 -0.3,0 -0.4,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.2,0 -0.2,0 v 0 0 H 34.1 34 c -0.1,0 -0.1,0 -0.2,0 -0.6,-0.1 -1.2,-0.3 -1.7,-0.5 -0.6,-0.3 -1.1,-0.6 -1.6,-1.1 -0.5,-0.4 -0.9,-1 -1.3,-1.6 -0.3,-0.6 -0.6,-1.3 -0.7,-2 -0.1,-0.3 -0.1,-0.7 -0.1,-1.1 0,-0.1 0,-0.2 0,-0.3 v 0 0 -0.1 -0.1 c 0,-0.2 0,-0.4 0.1,-0.6 0.3,-1.5 1,-3 2.2,-4.2 0.3,-0.3 0.6,-0.5 1,-0.8 0.3,-0.2 0.7,-0.4 1.1,-0.6 0.4,-0.2 0.8,-0.3 1.2,-0.4 0.4,-0.1 0.8,-0.2 1.2,-0.2 0.2,0 0.4,0 0.6,0 0.1,0 0.1,0 0.1,0 h 0.2 0.1 v 0 0 h 0.2 c 0.5,0 0.9,0.1 1.4,0.2 0.9,0.2 1.8,0.5 2.6,1 1.6,0.9 3,2.3 3.9,4 0.4,0.8 0.7,1.8 0.9,2.7 0,0.2 0.1,0.5 0.1,0.7 v 0.2 0.2 c 0,0.1 0,0.1 0,0.2 0,0.1 0,0.1 0,0.2 v 0.2 0.2 c 0,0.1 0,0.3 0,0.4 0,0.3 0,0.5 -0.1,0.8 0,0.3 -0.1,0.5 -0.1,0.8 -0.1,0.1 -0.1,0.3 -0.2,0.6 -0.1,0.5 -0.3,1 -0.5,1.5 -0.4,1 -0.9,1.9 -1.5,2.7 -1.2,1.7 -2.9,3.1 -4.8,3.9 -1,0.4 -2,0.7 -3,0.9 -0.5,0.1 -1,0.1 -1.6,0.2 h -0.1 -0.1 -0.2 -0.3 -0.1 c 0.1,0 0,0 0,0 h -0.1 c -0.3,0 -0.6,0 -0.8,0 -1.1,-0.1 -2.2,-0.3 -3.3,-0.6 -1.1,-0.3 -2.1,-0.7 -3.1,-1.2 -2,-1 -3.7,-2.5 -5.1,-4.2 -0.7,-0.9 -1.3,-1.8 -1.8,-2.8 -0.5,-1 -0.9,-2 -1.2,-3 -0.3,-1 -0.5,-2.1 -0.5,-3.2 v -0.2 -0.1 0 -0.1 -0.2 0 -0.1 -0.1 -0.3 0 0 -0.1 c 0,-0.1 0,-0.3 0,-0.4 0,-0.5 0.1,-1.1 0.1,-1.6 0.1,-0.5 0.2,-1.1 0.3,-1.6 0.1,-0.5 0.2,-1.1 0.4,-1.6 0.3,-1.1 0.7,-2.1 1.1,-3.1 0.9,-2 2.1,-3.7 3.5,-5.1 0.4,-0.3 0.7,-0.7 1.1,-1 0.4,-0.3 0.8,-0.6 1.2,-0.9 0.4,-0.3 0.8,-0.5 1.3,-0.7 0.2,-0.1 0.4,-0.2 0.7,-0.3 0.1,0 0.2,-0.1 0.3,-0.1 0.1,-0.1 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.4,-0.5 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,-0.1 0.4,-0.1 0.2,-0.1 0.5,-0.1 0.7,-0.2 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,0 0.4,-0.1 h 0.2 0.2 c 0.1,0 0.2,0 0.4,-0.1 0.1,0 0.3,0 0.4,-0.1 0.1,0 0.3,0 0.4,0 0.1,0 0.2,0 0.3,0 h 0.2 0.1 0.1 c 0.1,0 0.3,0 0.4,0 h 0.2 c 0,0 0.1,0 0,0 v 0 h 0.1 c 0.1,0 0.2,0 0.4,0 0.5,0 0.9,0 1.4,0 0.9,0 1.8,0.1 2.7,0.3 1.8,0.3 3.4,0.9 4.9,1.6 1.5,0.7 2.9,1.6 4,2.6 0.1,0.1 0.1,0.1 0.2,0.2 0.1,0.1 0.1,0.1 0.2,0.2 0.1,0.1 0.3,0.3 0.4,0.4 0.1,0.1 0.3,0.3 0.4,0.4 0.1,0.1 0.3,0.3 0.4,0.4 0.5,0.5 1,1.1 1.4,1.6 0.8,1.1 1.5,2.1 2,3.2 0,0.1 0.1,0.1 0.1,0.2 0,0.1 0.1,0.1 0.1,0.2 0.1,0.1 0.1,0.3 0.2,0.4 0.1,0.1 0.1,0.2 0.2,0.4 0.1,0.1 0.1,0.2 0.2,0.4 0.2,0.5 0.4,0.9 0.5,1.4 0.2,0.7 0.4,1.3 0.6,1.9 0.1,0.2 0.3,0.4 0.5,0.3 0.2,0 0.4,-0.2 0.4,-0.4 -0.2,-1.1 -0.2,-1.8 -0.3,-2.6 z"
   id="path3778"
   inkscape:connector-curvature="0"
   style="fill:url(#SVGID_1_)" />
</svg> - mediatype: image/svg+xml + - base64data: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   id="Layer_1"
   x="0px"
   y="0px"
   width="57.799999"
   height="57.799999"
   viewBox="0 0 57.799999 57.8"
   xml:space="preserve"
   sodipodi:docname="logo_small.svg"
   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
   id="metadata3785"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
   id="defs3783" /><sodipodi:namedview
   pagecolor="#ffffff"
   bordercolor="#666666"
   borderopacity="1"
   objecttolerance="10"
   gridtolerance="10"
   guidetolerance="10"
   inkscape:pageopacity="0"
   inkscape:pageshadow="2"
   inkscape:window-width="2560"
   inkscape:window-height="1386"
   id="namedview3781"
   showgrid="false"
   inkscape:zoom="13.858714"
   inkscape:cx="75.412904"
   inkscape:cy="23.077606"
   inkscape:window-x="0"
   inkscape:window-y="0"
   inkscape:window-maximized="1"
   inkscape:current-layer="Layer_1" />
<style
   type="text/css"
   id="style3769">
	.st0{fill:#E6E7E8;}
	.st1{fill:url(#SVGID_1_);}
</style>

<linearGradient
   id="SVGID_1_"
   gradientUnits="userSpaceOnUse"
   x1="26.700001"
   y1="-9.8501997"
   x2="26.700001"
   y2="43.166"
   gradientTransform="matrix(1,0,0,-1,2,60.000002)">
	<stop
   offset="0"
   style="stop-color:#FFF100"
   id="stop3773" />
	<stop
   offset="1"
   style="stop-color:#F05A28"
   id="stop3775" />
</linearGradient>
<path
   class="st1"
   d="m 55.1,25.500002 c -0.1,-1 -0.3,-2.1 -0.6,-3.3 -0.3,-1.2 -0.8,-2.6 -1.5,-4 -0.7,-1.4 -1.6,-2.9 -2.8,-4.3 -0.5,-0.6 -1,-1.1 -1.5,-1.6 0.8,-3.2000004 -1,-6.0000004 -1,-6.0000004 -3.1,-0.2 -5.1,1 -5.8,1.5 -0.1,-0.1 -0.2,-0.1 -0.4,-0.2 -0.5,-0.2 -1,-0.4 -1.6,-0.6 -0.6,-0.2 -1.1,-0.3 -1.7,-0.5 -0.6,-0.1 -1.2,-0.3 -1.8,-0.3 -0.1,0 -0.2,0 -0.3,0 C 34.8,1.8000016 30.9,1.5258789e-6 30.9,1.5258789e-6 26.6,2.8000016 25.7,6.6000016 25.7,6.6000016 c 0,0 0,0.1 0,0.2 -0.2,0.1 -0.5,0.1 -0.7,0.2 -0.3,0.1 -0.7,0.2 -1,0.3 -0.3,0.1 -0.7,0.3 -1,0.4 -0.7,0.3 -1.3,0.6 -1.9,1 -0.6,0.3 -1.2,0.7 -1.8,1.1 -0.1,0 -0.2,-0.1 -0.2,-0.1 -6,-2.3 -11.4,0.5000004 -11.4,0.5000004 -0.5,6.4 2.4,10.4 3,11.2 -0.1,0.4 -0.3,0.8 -0.4,1.2 -0.4,1.4 -0.8,2.9 -1,4.5 0,0.2 -0.1,0.4 -0.1,0.7 -5.6,2.7 -7.2,8.4 -7.2,8.4 4.6,5.3 10,5.7 10,5.7 v 0 c 0.7,1.2 1.5,2.4 2.4,3.5 0.4,0.5 0.8,0.9 1.2,1.3 -1.7,4.8 0.2,8.9 0.2,8.9 5.2,0.2 8.6,-2.3 9.3,-2.8 0.5,0.2 1,0.3 1.6,0.5 1.6,0.4 3.2,0.6 4.8,0.7 0.4,0 0.8,0 1.2,0 h 0.2 0.1 0.3 0.3 v 0 c 2.4,3.5 6.7,4 6.7,4 3.4,-3.6 3.2,-7.2 3.2,-7.2 l -0.1,-0.1 c 0.7,-0.5 1.3,-1 1.9,-1.5 1.2,-1.1 2.3,-2.4 3.2,-3.7 0.1,-0.1 0.2,-0.3 0.2,-0.4 3.4,0.2 5.9,-2.1 5.9,-2.1 -0.6,-4 -3.1,-5.7 -3.1,-5.7 h -0.1 c 0,-0.2 0,-0.5 0.1,-0.7 0,-0.4 0,-0.8 0,-1.2 v -0.3 -0.1 -0.1 c 0,-0.1 0,-0.1 0,-0.1 v -0.2 -0.3 c 0,-0.1 0,-0.2 0,-0.3 0,-0.1 0,-0.2 0,-0.3 v -0.3 -0.3 c -0.1,-0.4 -0.1,-0.8 -0.2,-1.2 -0.4,-1.5 -1,-3 -1.8,-4.3 -0.8,-1.3 -1.8,-2.5 -2.9,-3.5 -1.1,-1 -2.4,-1.8 -3.7,-2.4 -1.3,-0.6 -2.7,-1 -4.1,-1.1 -0.7,-0.1 -1.4,-0.1 -2,-0.1 h -0.3 -0.1 -0.1 -0.1 -0.3 c -0.1,0 -0.2,0 -0.3,0 -0.3,0 -0.7,0.1 -1,0.1 -1.4,0.3 -2.7,0.7 -3.8,1.4 -1.1,0.7 -2.1,1.5 -2.9,2.5 -0.8,1 -1.4,2 -1.9,3.1 -0.4,1.1 -0.7,2.2 -0.7,3.3 0,0.3 0,0.6 0,0.8 0,0.1 0,0.1 0,0.2 v 0.2 c 0,0.1 0,0.3 0,0.4 0.1,0.6 0.2,1.1 0.3,1.6 0.3,1 0.8,2 1.4,2.8 0.6,0.8 1.3,1.5 2.1,2 0.8,0.5 1.6,0.9 2.4,1.1 0.8,0.2 1.6,0.3 2.3,0.3 0.1,0 0.2,0 0.3,0 h 0.1 0.1 c 0.1,0 0.2,0 0.2,0 0,0 0,0 0.1,0 h 0.1 0.1 c 0.1,0 0.2,0 0.3,0 0.1,0 0.2,0 0.3,-0.1 0.2,0 0.3,-0.1 0.5,-0.1 0.3,-0.1 0.6,-0.2 0.9,-0.4 0.3,-0.1 0.5,-0.3 0.8,-0.5 0.1,-0.1 0.1,-0.1 0.2,-0.2 0.3,-0.2 0.3,-0.6 0.1,-0.8 -0.2,-0.2 -0.5,-0.3 -0.7,-0.1 -0.2,-0.2 -0.2,-0.1 -0.3,-0.1 -0.2,0.1 -0.4,0.2 -0.7,0.3 -0.2,0.1 -0.5,0.1 -0.8,0.2 -0.1,0 -0.3,0 -0.4,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.2,0 -0.2,0 v 0 0 H 34.1 34 c -0.1,0 -0.1,0 -0.2,0 -0.6,-0.1 -1.2,-0.3 -1.7,-0.5 -0.6,-0.3 -1.1,-0.6 -1.6,-1.1 -0.5,-0.4 -0.9,-1 -1.3,-1.6 -0.3,-0.6 -0.6,-1.3 -0.7,-2 -0.1,-0.3 -0.1,-0.7 -0.1,-1.1 0,-0.1 0,-0.2 0,-0.3 v 0 0 -0.1 -0.1 c 0,-0.2 0,-0.4 0.1,-0.6 0.3,-1.5 1,-3 2.2,-4.2 0.3,-0.3 0.6,-0.5 1,-0.8 0.3,-0.2 0.7,-0.4 1.1,-0.6 0.4,-0.2 0.8,-0.3 1.2,-0.4 0.4,-0.1 0.8,-0.2 1.2,-0.2 0.2,0 0.4,0 0.6,0 0.1,0 0.1,0 0.1,0 h 0.2 0.1 v 0 0 h 0.2 c 0.5,0 0.9,0.1 1.4,0.2 0.9,0.2 1.8,0.5 2.6,1 1.6,0.9 3,2.3 3.9,4 0.4,0.8 0.7,1.8 0.9,2.7 0,0.2 0.1,0.5 0.1,0.7 v 0.2 0.2 c 0,0.1 0,0.1 0,0.2 0,0.1 0,0.1 0,0.2 v 0.2 0.2 c 0,0.1 0,0.3 0,0.4 0,0.3 0,0.5 -0.1,0.8 0,0.3 -0.1,0.5 -0.1,0.8 -0.1,0.1 -0.1,0.3 -0.2,0.6 -0.1,0.5 -0.3,1 -0.5,1.5 -0.4,1 -0.9,1.9 -1.5,2.7 -1.2,1.7 -2.9,3.1 -4.8,3.9 -1,0.4 -2,0.7 -3,0.9 -0.5,0.1 -1,0.1 -1.6,0.2 h -0.1 -0.1 -0.2 -0.3 -0.1 c 0.1,0 0,0 0,0 h -0.1 c -0.3,0 -0.6,0 -0.8,0 -1.1,-0.1 -2.2,-0.3 -3.3,-0.6 -1.1,-0.3 -2.1,-0.7 -3.1,-1.2 -2,-1 -3.7,-2.5 -5.1,-4.2 -0.7,-0.9 -1.3,-1.8 -1.8,-2.8 -0.5,-1 -0.9,-2 -1.2,-3 -0.3,-1 -0.5,-2.1 -0.5,-3.2 v -0.2 -0.1 0 -0.1 -0.2 0 -0.1 -0.1 -0.3 0 0 -0.1 c 0,-0.1 0,-0.3 0,-0.4 0,-0.5 0.1,-1.1 0.1,-1.6 0.1,-0.5 0.2,-1.1 0.3,-1.6 0.1,-0.5 0.2,-1.1 0.4,-1.6 0.3,-1.1 0.7,-2.1 1.1,-3.1 0.9,-2 2.1,-3.7 3.5,-5.1 0.4,-0.3 0.7,-0.7 1.1,-1 0.4,-0.3 0.8,-0.6 1.2,-0.9 0.4,-0.3 0.8,-0.5 1.3,-0.7 0.2,-0.1 0.4,-0.2 0.7,-0.3 0.1,0 0.2,-0.1 0.3,-0.1 0.1,-0.1 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.4,-0.5 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,-0.1 0.4,-0.1 0.2,-0.1 0.5,-0.1 0.7,-0.2 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,0 0.4,-0.1 h 0.2 0.2 c 0.1,0 0.2,0 0.4,-0.1 0.1,0 0.3,0 0.4,-0.1 0.1,0 0.3,0 0.4,0 0.1,0 0.2,0 0.3,0 h 0.2 0.1 0.1 c 0.1,0 0.3,0 0.4,0 h 0.2 c 0,0 0.1,0 0,0 v 0 h 0.1 c 0.1,0 0.2,0 0.4,0 0.5,0 0.9,0 1.4,0 0.9,0 1.8,0.1 2.7,0.3 1.8,0.3 3.4,0.9 4.9,1.6 1.5,0.7 2.9,1.6 4,2.6 0.1,0.1 0.1,0.1 0.2,0.2 0.1,0.1 0.1,0.1 0.2,0.2 0.1,0.1 0.3,0.3 0.4,0.4 0.1,0.1 0.3,0.3 0.4,0.4 0.1,0.1 0.3,0.3 0.4,0.4 0.5,0.5 1,1.1 1.4,1.6 0.8,1.1 1.5,2.1 2,3.2 0,0.1 0.1,0.1 0.1,0.2 0,0.1 0.1,0.1 0.1,0.2 0.1,0.1 0.1,0.3 0.2,0.4 0.1,0.1 0.1,0.2 0.2,0.4 0.1,0.1 0.1,0.2 0.2,0.4 0.2,0.5 0.4,0.9 0.5,1.4 0.2,0.7 0.4,1.3 0.6,1.9 0.1,0.2 0.3,0.4 0.5,0.3 0.2,0 0.4,-0.2 0.4,-0.4 -0.2,-1.1 -0.2,-1.8 -0.3,-2.6 z"
   id="path3778"
   inkscape:connector-curvature="0"
   style="fill:url(#SVGID_1_)" />
</svg> + mediatype: image/svg+xml install: spec: clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - configmaps - - persistentvolumeclaims - - secrets - - serviceaccounts - - services - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - "" - resources: - - events - verbs: - - create - - get - - list - - patch - - watch - - apiGroups: - - apps - resources: - - deployments - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - grafana.integreatly.org - resources: - - grafanadashboards - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - grafana.integreatly.org - resources: - - grafanadashboards/finalizers - verbs: - - update - - apiGroups: - - grafana.integreatly.org - resources: - - grafanadashboards/status - verbs: - - get - - patch - - update - - apiGroups: - - grafana.integreatly.org - resources: - - grafanadatasources - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - grafana.integreatly.org - resources: - - grafanadatasources/finalizers - verbs: - - update - - apiGroups: - - grafana.integreatly.org - resources: - - grafanadatasources/status - verbs: - - get - - patch - - update - - apiGroups: - - grafana.integreatly.org - resources: - - grafanafolders - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - grafana.integreatly.org - resources: - - grafanafolders/finalizers - verbs: - - update - - apiGroups: - - grafana.integreatly.org - resources: - - grafanafolders/status - verbs: - - get - - patch - - update - - apiGroups: - - grafana.integreatly.org - resources: - - grafanas - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - grafana.integreatly.org - resources: - - grafanas/finalizers - verbs: - - update - - apiGroups: - - grafana.integreatly.org - resources: - - grafanas/status - verbs: - - get - - patch - - update - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - route.openshift.io - resources: - - routes - - routes/custom-host - verbs: - - create - - delete - - get - - list - - update - - watch - serviceAccountName: grafana-operator-controller-manager + - rules: + - apiGroups: + - "" + resources: + - configmaps + - persistentvolumeclaims + - secrets + - serviceaccounts + - services + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - get + - list + - patch + - watch + - apiGroups: + - apps + resources: + - deployments + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - grafana.integreatly.org + resources: + - grafanadashboards + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - grafana.integreatly.org + resources: + - grafanadashboards/finalizers + verbs: + - update + - apiGroups: + - grafana.integreatly.org + resources: + - grafanadashboards/status + verbs: + - get + - patch + - update + - apiGroups: + - grafana.integreatly.org + resources: + - grafanadatasources + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - grafana.integreatly.org + resources: + - grafanadatasources/finalizers + verbs: + - update + - apiGroups: + - grafana.integreatly.org + resources: + - grafanadatasources/status + verbs: + - get + - patch + - update + - apiGroups: + - grafana.integreatly.org + resources: + - grafanafolders + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - grafana.integreatly.org + resources: + - grafanafolders/finalizers + verbs: + - update + - apiGroups: + - grafana.integreatly.org + resources: + - grafanafolders/status + verbs: + - get + - patch + - update + - apiGroups: + - grafana.integreatly.org + resources: + - grafanas + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - grafana.integreatly.org + resources: + - grafanas/finalizers + verbs: + - update + - apiGroups: + - grafana.integreatly.org + resources: + - grafanas/status + verbs: + - get + - patch + - update + - apiGroups: + - networking.k8s.io + resources: + - ingresses + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - route.openshift.io + resources: + - routes + - routes/custom-host + verbs: + - create + - delete + - get + - list + - update + - watch + serviceAccountName: grafana-operator-controller-manager deployments: - - label: - control-plane: controller-manager - name: grafana-operator-controller-manager - spec: - replicas: 1 - selector: - matchLabels: - control-plane: controller-manager - strategy: {} - template: - metadata: - labels: + - label: + control-plane: controller-manager + name: grafana-operator-controller-manager + spec: + replicas: 1 + selector: + matchLabels: control-plane: controller-manager spec: containers: @@ -356,62 +351,60 @@ spec: cpu: 100m memory: 20Mi securityContext: - allowPrivilegeEscalation: false - securityContext: - runAsNonRoot: true - serviceAccountName: grafana-operator-controller-manager - terminationGracePeriodSeconds: 10 + runAsNonRoot: true + serviceAccountName: grafana-operator-controller-manager + terminationGracePeriodSeconds: 10 permissions: - - rules: - - apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - list - - watch - - create - - update - - patch - - delete - - apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - get - - list - - watch - - create - - update - - patch - - delete - - apiGroups: - - "" - resources: - - events - verbs: - - create - - patch - serviceAccountName: grafana-operator-controller-manager + - rules: + - apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch + - create + - update + - patch + - delete + - apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - get + - list + - watch + - create + - update + - patch + - delete + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch + serviceAccountName: grafana-operator-controller-manager strategy: deployment installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: true - type: AllNamespaces + - supported: true + type: OwnNamespace + - supported: true + type: SingleNamespace + - supported: true + type: MultiNamespace + - supported: true + type: AllNamespaces keywords: - - Grafana - - Metrics - - Observability + - Grafana + - Metrics + - Observability links: - - name: Grafana Operator - url: https://grafana-operator.github.io/grafana-operator + - name: Grafana Operator + url: https://grafana-operator.github.io/grafana-operator maturity: alpha minKubeVersion: 1.23.0 provider: diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 75ed44a70..403d1480f 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,7 +5,7 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: grafana-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/config/scorecard/kustomization.yaml b/config/scorecard/kustomization.yaml index 50cd2d084..7b144f995 100644 --- a/config/scorecard/kustomization.yaml +++ b/config/scorecard/kustomization.yaml @@ -1,16 +1,15 @@ resources: - bases/config.yaml -patchesJson6902: +patches: - path: patches/basic.config.yaml target: group: scorecard.operatorframework.io - version: v1alpha3 kind: Configuration name: config + version: v1alpha3 - path: patches/olm.config.yaml target: group: scorecard.operatorframework.io - version: v1alpha3 kind: Configuration name: config -#+kubebuilder:scaffold:patchesJson6902 + version: v1alpha3 From 4559275410100433f950666f14653a97d15a53a2 Mon Sep 17 00:00:00 2001 From: Fabian Mueller Date: Sun, 22 Oct 2023 18:44:35 +0200 Subject: [PATCH 09/11] remove containerImage annotation --- .../manifests/bases/grafana-operator.clusterserviceversion.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml index af01b164d..e8c9dbe93 100644 --- a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml @@ -5,7 +5,6 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Monitoring - containerImage: ghcr.io/grafana-operator/grafana-operator:v5.4.2 createdAt: "2023-09-12T08:09:00.92Z" repository: https://github.com/grafana-operator/grafana-operator support: Community From 08d2f33334acd402920fcee3cb23b6f7368acafd Mon Sep 17 00:00:00 2001 From: Fabian Mueller Date: Mon, 6 Nov 2023 21:50:30 +0100 Subject: [PATCH 10/11] update to latest release --- ...rafana-operator.clusterserviceversion.yaml | 95 +++++++++++-------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml index f7ff20bc8..2dda78f35 100644 --- a/bundle/manifests/grafana-operator.clusterserviceversion.yaml +++ b/bundle/manifests/grafana-operator.clusterserviceversion.yaml @@ -94,9 +94,8 @@ metadata: ] capabilities: Basic Install categories: Monitoring - containerImage: ghcr.io/grafana-operator/grafana-operator:v5.4.2 - createdAt: "2023-09-12T08:09:00.92Z" - operators.operatorframework.io/builder: operator-sdk-v1.31.0 + createdAt: "2023-11-06T20:49:26Z" + operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana-operator/grafana-operator support: Community @@ -311,45 +310,52 @@ spec: selector: matchLabels: control-plane: controller-manager - spec: - containers: - - args: - - --health-probe-bind-address=:8081 - - --metrics-bind-address=0.0.0.0:9090 - - --leader-elect - env: - - name: RELATED_IMAGE_GRAFANA - value: docker.io/grafana/grafana:9.1.6 - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - image: ghcr.io/grafana-operator/grafana-operator:v5.4.2 - imagePullPolicy: Always - livenessProbe: - httpGet: - path: /healthz - port: 8081 - initialDelaySeconds: 15 - periodSeconds: 20 - name: manager - ports: - - containerPort: 9090 - name: metrics - protocol: TCP - readinessProbe: - httpGet: - path: /readyz - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 10 - resources: - limits: - cpu: 200m - memory: 550Mi - requests: - cpu: 100m - memory: 20Mi + strategy: {} + template: + metadata: + labels: + control-plane: controller-manager + spec: + containers: + - args: + - --health-probe-bind-address=:8081 + - --metrics-bind-address=0.0.0.0:9090 + - --leader-elect + env: + - name: RELATED_IMAGE_GRAFANA + value: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8 + - name: WATCH_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.annotations['olm.targetNamespaces'] + image: ghcr.io/grafana-operator/grafana-operator@sha256:bd4faa4e8b721fbbc8e7bde096347e4b123e85a01ab437c021664120ac3c00c6 + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 8081 + initialDelaySeconds: 15 + periodSeconds: 20 + name: manager + ports: + - containerPort: 9090 + name: metrics + protocol: TCP + readinessProbe: + httpGet: + path: /readyz + port: 8081 + initialDelaySeconds: 5 + periodSeconds: 10 + resources: + limits: + cpu: 200m + memory: 550Mi + requests: + cpu: 100m + memory: 20Mi + securityContext: + allowPrivilegeEscalation: false securityContext: runAsNonRoot: true serviceAccountName: grafana-operator-controller-manager @@ -409,5 +415,10 @@ spec: minKubeVersion: 1.23.0 provider: name: Community + relatedImages: + - image: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8 + name: grafana + - image: ghcr.io/grafana-operator/grafana-operator@sha256:bd4faa4e8b721fbbc8e7bde096347e4b123e85a01ab437c021664120ac3c00c6 + name: manager replaces: grafana-operator.v5.4.1 version: 5.4.2 From 26e13b1b91bf4b9a495bfbcff0aac92cb0c761a6 Mon Sep 17 00:00:00 2001 From: Edvin Norling Date: Tue, 14 Nov 2023 14:09:19 +0100 Subject: [PATCH 11/11] fix helm docs --- deploy/helm/grafana-operator/README.md | 1 + deploy/helm/grafana-operator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md index 7cfa28a3c..2a05098d8 100644 --- a/deploy/helm/grafana-operator/README.md +++ b/deploy/helm/grafana-operator/README.md @@ -38,6 +38,7 @@ 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/values.yaml b/deploy/helm/grafana-operator/values.yaml index e7aceb76d..deb6e0742 100644 --- a/deploy/helm/grafana-operator/values.yaml +++ b/deploy/helm/grafana-operator/values.yaml @@ -27,7 +27,7 @@ image: imagePullSecrets: [] env: - # -- grafana image, e.g. docker.io/grafana/grafana:9.1.6 + # -- grafana image, e.g. docker.io/grafana/grafana:9.1.6, overwrites the default grafana image defined in the operator grafanaImage: "" nameOverride: ""