Merge branch 'master' into dependabot/go_modules/github.com/grafana/g…

…rafana-api-golang-client-0.20.1
grafana · Jun 5, 2023 · 0480267 · 0480267
2 parents b65a87b + a581da4
commit 0480267
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 17 deletions.
diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md
@@ -14,7 +14,7 @@ linkTitle: "Helm 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.0.0-rc0
+helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.0.0-rc3
 ```
 
 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/deploy/helm/grafana-operator/README.md.gotmpl b/deploy/helm/grafana-operator/README.md.gotmpl
@@ -14,7 +14,7 @@ linkTitle: "Helm 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.0.0-rc0
+helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.0.0-rc3
 ```
 
 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/docs/blog/flux-gitops/grafana-operator.yaml b/docs/blog/flux-gitops/grafana-operator.yaml
@@ -7,7 +7,7 @@ spec:
   interval: 10m
   url: oci://ghcr.io/grafana-operator/kustomize/grafana-operator
   ref:
-    tag: v5.0.0-rc1
+    tag: v5.0.0-rc3
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
@@ -19,7 +19,7 @@ spec:
   targetNamespace: grafana
   images:
     - name: ghcr.io/grafana-operator/grafana-operator
-      newTag: v5.0.0-rc1
+      newTag: v5.0.0-rc3
   prune: true
   sourceRef:
     kind: OCIRepository

diff --git a/docs/blog/kustomize-installation.md b/docs/blog/kustomize-installation.md
@@ -131,7 +131,7 @@ If you want to install the grafana-operator without using GitOps, you can also d
 For example, you can run the following Flux command to download the artifact and unpack it. Then you can run a normal kubectl apply command.
 
 ```shell
-flux pull artifact oci://ghcr.io/grafana-operator/kustomize/grafana-operator:v5.0.0-rc1 --output ./grafana-opreator
+flux pull artifact oci://ghcr.io/grafana-operator/kustomize/grafana-operator:v5.0.0-rc3 -output ./grafana-opreator
 ```
 
 But of course we recommend that you manage your grafana-operator installation through your GitOps solution, no matter if it's Flux or some other solution.

diff --git a/docs/blog/v5-getting-started.md b/docs/blog/v5-getting-started.md
@@ -6,7 +6,7 @@ linkTitle: "Version 5 getting started"
 description: "How to get started with version 5 of the operator?"
 ---
 
-This blog is initially written for version 5-rc0, we will try to continuously update it to match any changes that we do before releasing version 5.0.0.
+This blog is initially written for version 5-rc3, we will try to continuously update it to match any changes that we do before releasing version 5.0.0.
 
 It might be a good idea to read through the [version 5 introduction](v5-intro.md) which goes through a bit more about the new concepts that we have introduced in this version.
 In this blog we will focus on how to install version 5 of the grafana-operator.
@@ -78,7 +78,7 @@ We are hosting our Helm chart in an OCI repo so it's a bit different from what y
 notice the `oci://` part of the URL.
 
 ```shell
-helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.0.0-rc0 -n grafana-operator
+helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.0.0-rc3 -n grafana-operator
 ```
 
 ## Use operator

diff --git a/docs/docs/datasources.md b/docs/docs/datasources.md
@@ -27,8 +27,17 @@ kind: GrafanaDatasource
 metadata:
   name: grafanadatasource-sample
 spec:
-  secrets:
-    - credentials # Reference to the secret name
+  valuesFrom:
+    - targetPath: "user"
+      valueFrom:
+        secretKeyRef:
+          name: "credentials"
+          key: "PROMETHEUS_USERNAME"
+    - targetPath: "secureJsonData.password"
+      valueFrom:
+        secretKeyRef:
+          name: "credentials"
+          key: "PROMETHEUS_PASSWORD"
   instanceSelector:
     matchLabels:
       dashboards: "grafana"

diff --git a/docs/docs/grafana.md b/docs/docs/grafana.md
@@ -36,14 +36,15 @@ The operator is able to work with external Grafana instances (pretty much any Sa
 The `grafana.spec.external` allows you to set a URL and provide credentials for external Grafana. Example:
 
 ```yaml
+---
 kind: Secret
- apiVersion: v1
- metadata:
-   name: grafana-admin-credentials
- stringData:
-   GF_SECURITY_ADMIN_USER: root # Username
-   GF_SECURITY_ADMIN_PASSWORD: secret # Password
- type: Opaque
+apiVersion: v1
+metadata:
+  name: grafana-admin-credentials
+stringData:
+  GF_SECURITY_ADMIN_USER: root # Username
+  GF_SECURITY_ADMIN_PASSWORD: secret # Password
+type: Opaque
 ---
 apiVersion: grafana.integreatly.org/v1beta1
 kind: Grafana

diff --git a/docs/docs/installation/kustomize.md b/docs/docs/installation/kustomize.md
@@ -16,7 +16,7 @@ After you have downloaded Flux you can use `flux pull artifact` to download the
 
 ```shell
 mkdir grafana-operator
-flux pull artifact oci://ghcr.io/grafana-operator/kustomize/grafana-operator:v5.0.0-rc1 --output ./grafana-operator/
+flux pull artifact oci://ghcr.io/grafana-operator/kustomize/grafana-operator:v5.0.0-rc3 --output ./grafana-operator/
 ```
 
 This will provide you the manifest files unpacked and ready to use.