Merge branch 'master' into fix-1401

grafana · May 5, 2024 · 3827260 · 3827260
2 parents 4fa7dc5 + 21c32b5
commit 3827260
Show file tree

Hide file tree

Showing 63 changed files with 8,803 additions and 12,400 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 0
       - id: changed-files
         name: Get changed files
-        uses: tj-actions/changed-files@2d756ea4c53f7f6b397767d8723b3a10a9f35bf2 #v44.0.0
+        uses: tj-actions/changed-files@0874344d6ebbaa00a27da73276ae7162fadcaf69 #v44.3.0
         with:
           files_ignore: |
             **/*.md

diff --git a/.github/workflows/pr-validation.yaml b/.github/workflows/pr-validation.yaml
@@ -95,7 +95,7 @@ jobs:
           go-version-file: "go.mod"
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4.0.0
+        uses: golangci/golangci-lint-action@v5.0.0
         with:
           version: "v1.56.2"
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -104,7 +104,7 @@ jobs:
           version: v0.15.1
 
       - name: Install cosign
-        uses: sigstore/cosign-installer@v3.4.0
+        uses: sigstore/cosign-installer@v3.5.0
         with:
           cosign-release: "v2.2.2"
 

diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
-CHAINSAW_VERSION ?= v0.1.6
+CHAINSAW_VERSION ?= v0.1.9
 
 # Checks if chainsaw is in your PATH
 ifneq ($(shell which chainsaw),)
@@ -95,13 +95,14 @@ endif
 
 .PHONY: manifests
 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
+	$(CONTROLLER_GEN) rbac:roleName=manager-role webhook paths="./..." crd:maxDescLen=0,generateEmbeddedObjectMeta=false output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=manager-role webhook paths="./..." crd:maxDescLen=0,generateEmbeddedObjectMeta=false output:crd:artifacts:config=deploy/helm/grafana-operator/crds
+	$(CONTROLLER_GEN) rbac:roleName=manager-role webhook paths="./..." crd output:crd:artifacts:config=config/
 	yq -i '(select(.kind == "Deployment") | .spec.template.spec.containers[0].env[] | select (.name == "RELATED_IMAGE_GRAFANA")).value="$(GRAFANA_IMAGE):$(GRAFANA_VERSION)"' config/manager/manager.yaml
 
 .PHONY: kustomize-crd
 kustomize-crd: kustomize manifests
-	$(KUSTOMIZE) build config/ -o deploy/kustomize/base/crds.yaml
+	$(KUSTOMIZE) build config/crd -o deploy/kustomize/base/crds.yaml
 
 # Generate API reference documentation
 api-docs: gen-crd-api-reference-docs kustomize
@@ -175,7 +176,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.1.1
-CONTROLLER_TOOLS_VERSION ?= v0.12.0
+CONTROLLER_TOOLS_VERSION ?= v0.14.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

diff --git a/api/v1beta1/grafanadashboard_types.go b/api/v1beta1/grafanadashboard_types.go
@@ -94,6 +94,10 @@ type GrafanaDashboardSpec struct {
 
 	// how often the dashboard is refreshed, defaults to 5m if not set
 	// +optional
+	// +kubebuilder:validation:Type=string
+	// +kubebuilder:validation:Format=duration
+	// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$"
+	// +kubebuilder:default="5m"
 	ResyncPeriod string `json:"resyncPeriod,omitempty"`
 
 	// maps required data sources to existing ones

diff --git a/api/v1beta1/grafanadatasource_types.go b/api/v1beta1/grafanadatasource_types.go
@@ -36,11 +36,14 @@ type GrafanaDatasourceInternal struct {
 	Access        string `json:"access,omitempty"`
 	Database      string `json:"database,omitempty"`
 	User          string `json:"user,omitempty"`
-	OrgID         *int64 `json:"orgId,omitempty"`
 	IsDefault     *bool  `json:"isDefault,omitempty"`
 	BasicAuth     *bool  `json:"basicAuth,omitempty"`
 	BasicAuthUser string `json:"basicAuthUser,omitempty"`
-	Editable      *bool  `json:"editable,omitempty"`
+
+	// Deprecated field, it has no effect
+	OrgID *int64 `json:"orgId,omitempty"`
+	// Deprecated field, it has no effect
+	Editable *bool `json:"editable,omitempty"`
 
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:pruning:PreserveUnknownFields
@@ -72,6 +75,10 @@ type GrafanaDatasourceSpec struct {
 
 	// how often the datasource is refreshed, defaults to 5m if not set
 	// +optional
+	// +kubebuilder:validation:Type=string
+	// +kubebuilder:validation:Format=duration
+	// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$"
+	// +kubebuilder:default="5m"
 	ResyncPeriod string `json:"resyncPeriod,omitempty"`
 
 	// allow to import this resources from an operator in a different namespace

diff --git a/api/v1beta1/grafanafolder_types.go b/api/v1beta1/grafanafolder_types.go
@@ -45,6 +45,10 @@ type GrafanaFolderSpec struct {
 
 	// how often the folder is synced, defaults to 5m if not set
 	// +optional
+	// +kubebuilder:validation:Type=string
+	// +kubebuilder:validation:Format=duration
+	// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$"
+	// +kubebuilder:default="5m"
 	ResyncPeriod string `json:"resyncPeriod,omitempty"`
 }
 

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml
@@ -33,13 +33,6 @@ metadata:
           "apiVersion": "grafana.integreatly.org/v1beta1",
           "kind": "GrafanaAlertRuleGroup",
           "metadata": {
-            "labels": {
-              "app.kubernetes.io/created-by": "grafana-operator",
-              "app.kubernetes.io/instance": "grafanaalertrulegroup-sample",
-              "app.kubernetes.io/managed-by": "kustomize",
-              "app.kubernetes.io/name": "grafanaalertrulegroup",
-              "app.kubernetes.io/part-of": "grafana-operator"
-            },
             "name": "grafanaalertrulegroup-sample"
           },
           "spec": {
@@ -126,6 +119,32 @@ metadata:
             ]
           }
         },
+        {
+          "apiVersion": "grafana.integreatly.org/v1beta1",
+          "kind": "GrafanaContactPoint",
+          "metadata": {
+            "labels": {
+              "app.kubernetes.io/created-by": "grafana-operator",
+              "app.kubernetes.io/instance": "grafanacontactpoint-sample",
+              "app.kubernetes.io/managed-by": "kustomize",
+              "app.kubernetes.io/name": "grafanacontactpoint",
+              "app.kubernetes.io/part-of": "grafana-operator"
+            },
+            "name": "grafanacontactpoint-sample"
+          },
+          "spec": {
+            "instanceSelector": {
+              "matchLabels": {
+                "dashboards": "grafana-a"
+              }
+            },
+            "name": "grafanacontactpoint-sample",
+            "settings": {
+              "email": null
+            },
+            "type": "email"
+          }
+        },
         {
           "apiVersion": "grafana.integreatly.org/v1beta1",
           "kind": "GrafanaDashboard",
@@ -150,7 +169,6 @@ metadata:
           "spec": {
             "datasource": {
               "access": "proxy",
-              "editable": true,
               "isDefault": true,
               "jsonData": {
                 "timeInterval": "5s",
@@ -192,13 +210,13 @@ metadata:
     capabilities: Basic Install
     categories: Monitoring
     containerImage: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752
-    createdAt: "2024-03-05T15:09:12Z"
+    createdAt: "2024-04-23T12:57:39Z"
     description: Deploys and manages Grafana instances, dashboards and data sources
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/grafana/grafana-operator
     support: Grafana Labs
-  name: grafana-operator.v5.6.3
+  name: grafana-operator.v5.8.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -209,6 +227,11 @@ spec:
         kind: GrafanaAlertRuleGroup
         name: grafanaalertrulegroups.grafana.integreatly.org
         version: v1beta1
+      - description: GrafanaContactPoint is the Schema for the grafanacontactpoints API
+        displayName: Grafana Contact Point
+        kind: GrafanaContactPoint
+        name: grafanacontactpoints.grafana.integreatly.org
+        version: v1beta1
       - description: GrafanaDashboard is the Schema for the grafanadashboards API
         displayName: Grafana Dashboard
         kind: GrafanaDashboard
@@ -302,6 +325,32 @@ spec:
                 - get
                 - patch
                 - update
+            - apiGroups:
+                - grafana.integreatly.org
+              resources:
+                - grafanacontactpoints
+              verbs:
+                - create
+                - delete
+                - get
+                - list
+                - patch
+                - update
+                - watch
+            - apiGroups:
+                - grafana.integreatly.org
+              resources:
+                - grafanacontactpoints/finalizers
+              verbs:
+                - update
+            - apiGroups:
+                - grafana.integreatly.org
+              resources:
+                - grafanacontactpoints/status
+              verbs:
+                - get
+                - patch
+                - update
             - apiGroups:
                 - grafana.integreatly.org
               resources:
@@ -456,12 +505,12 @@ spec:
                       - --leader-elect
                     env:
                       - name: RELATED_IMAGE_GRAFANA
-                        value: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8
+                        value: docker.io/grafana/grafana@sha256:9a2acaa26a0b302a56d8e113068a1297cf0726fcaff5e6bb77344888e5f1c976
                       - name: WATCH_NAMESPACE
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.annotations['olm.targetNamespaces']
-                    image: ghcr.io/grafana/grafana-operator@sha256:e398d39e48abdd16ae126233bc3b485b0c7f79e9b087fc5db5c164e9d64da276
+                    image: ghcr.io/grafana/grafana-operator@sha256:34229f59e1609764196870aa2672aa1b784e88583ec445ff04e810a8333b72a7
                     imagePullPolicy: Always
                     livenessProbe:
                       httpGet:
@@ -553,9 +602,9 @@ spec:
     name: Grafana Labs
     url: https://grafana.com
   relatedImages:
-    - image: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8
+    - image: docker.io/grafana/grafana@sha256:9a2acaa26a0b302a56d8e113068a1297cf0726fcaff5e6bb77344888e5f1c976
       name: grafana
-    - image: ghcr.io/grafana/grafana-operator@sha256:e398d39e48abdd16ae126233bc3b485b0c7f79e9b087fc5db5c164e9d64da276
+    - image: ghcr.io/grafana/grafana-operator@sha256:34229f59e1609764196870aa2672aa1b784e88583ec445ff04e810a8333b72a7
       name: manager
     - image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752
       name: grafana-operator-97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752-annotation

diff --git a/bundle/manifests/grafana.integreatly.org_grafanaalertrulegroups.yaml b/bundle/manifests/grafana.integreatly.org_grafanaalertrulegroups.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   name: grafanaalertrulegroups.grafana.integreatly.org
 spec: