Apply automatic changes

portswigger-cloud · Nov 5, 2024 · 78bcf64 · 78bcf64
1 parent 0bbfa1d
commit 78bcf64
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 17 deletions.
diff --git a/charts/bitnami-grafana-operator-crds/Chart.yaml b/charts/bitnami-grafana-operator-crds/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: 0.0.0
 name: bitnami-grafana-operator-crds
 type: application
-version: 4.7.4
+version: 4.7.5
diff --git a/charts/bitnami-grafana-operator-crds/templates/grafanaalertrulegroups.integreatly.org.yaml b/charts/bitnami-grafana-operator-crds/templates/grafanaalertrulegroups.integreatly.org.yaml
@@ -1,5 +1,5 @@
 # Source: https://raw.githubusercontent.com/grafana/grafana-operator/v{version}/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanaalertrulegroups.yaml
-# Version: 5.14.0
+# Version: 5.15.1
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -46,6 +46,13 @@ spec:
             properties:
               allowCrossNamespaceImport:
                 type: boolean
+              editable:
+                description: Whether to enable or disable editing of the alert rule
+                  group in Grafana UI
+                type: boolean
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
               folderRef:
                 description: Match GrafanaFolders CRs to infer the uid
                 type: string
@@ -107,6 +114,10 @@ spec:
                 format: duration
                 pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
                 type: string
+              name:
+                description: Name of the alert rule group. If not specified, the resource
+                  name will be used.
+                type: string
               resyncPeriod:
                 default: 10m
                 format: duration

diff --git a/charts/bitnami-grafana-operator-crds/templates/grafanacontactpoints.integreatly.org.yaml b/charts/bitnami-grafana-operator-crds/templates/grafanacontactpoints.integreatly.org.yaml
@@ -1,5 +1,5 @@
 # Source: https://raw.githubusercontent.com/grafana/grafana-operator/v{version}/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanacontactpoints.yaml
-# Version: 5.14.0
+# Version: 5.15.1
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -186,10 +186,15 @@ spec:
                           type: object
                           x-kubernetes-map-type: atomic
                       type: object
+                      x-kubernetes-validations:
+                      - message: Either configMapKeyRef or secretKeyRef must be set
+                        rule: (has(self.configMapKeyRef) && !has(self.secretKeyRef))
+                          || (!has(self.configMapKeyRef) && has(self.secretKeyRef))
                   required:
                   - targetPath
                   - valueFrom
                   type: object
+                maxItems: 99
                 type: array
             required:
             - instanceSelector

diff --git a/charts/bitnami-grafana-operator-crds/templates/grafanadashboards.integreatly.org.yaml b/charts/bitnami-grafana-operator-crds/templates/grafanadashboards.integreatly.org.yaml
@@ -1,5 +1,5 @@
 # Source: https://raw.githubusercontent.com/grafana/grafana-operator/v{version}/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadashboards.yaml
-# Version: 5.14.0
+# Version: 5.15.1
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -157,7 +157,7 @@ spec:
                     name:
                       type: string
                     value:
-                      description: Inline evn value
+                      description: Inline env value
                       type: string
                     valueFrom:
                       description: Reference on value source, might be the reference
@@ -330,6 +330,13 @@ spec:
                 format: duration
                 pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
                 type: string
+              uid:
+                description: Manually specify the uid for the dashboard, overwrites
+                  uids already present in the json model
+                type: string
+                x-kubernetes-validations:
+                - message: spec.uid is immutable
+                  rule: self == oldSelf
               url:
                 description: dashboard url
                 type: string
@@ -400,6 +407,9 @@ spec:
                 declared
               rule: (has(self.folder) && !(has(self.folderRef) || has(self.folderUID)))
                 || !(has(self.folder))
+            - message: spec.uid is immutable
+              rule: ((!has(oldSelf.uid) && !has(self.uid)) || (has(oldSelf.uid) &&
+                has(self.uid)))
           status:
             description: GrafanaDashboardStatus defines the observed state of GrafanaDashboard
             properties:

diff --git a/charts/bitnami-grafana-operator-crds/templates/grafanadatasources.integreatly.org.yaml b/charts/bitnami-grafana-operator-crds/templates/grafanadatasources.integreatly.org.yaml
@@ -1,5 +1,5 @@
 # Source: https://raw.githubusercontent.com/grafana/grafana-operator/v{version}/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadatasources.yaml
-# Version: 5.14.0
+# Version: 5.15.1
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -219,10 +219,15 @@ spec:
                           type: object
                           x-kubernetes-map-type: atomic
                       type: object
+                      x-kubernetes-validations:
+                      - message: Either configMapKeyRef or secretKeyRef must be set
+                        rule: (has(self.configMapKeyRef) && !has(self.secretKeyRef))
+                          || (!has(self.configMapKeyRef) && has(self.secretKeyRef))
                   required:
                   - targetPath
                   - valueFrom
                   type: object
+                maxItems: 99
                 type: array
             required:
             - datasource

diff --git a/charts/bitnami-grafana-operator-crds/templates/grafanafolders.integreatly.org.yaml b/charts/bitnami-grafana-operator-crds/templates/grafanafolders.integreatly.org.yaml
@@ -1,5 +1,5 @@
 # Source: https://raw.githubusercontent.com/grafana/grafana-operator/v{version}/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml
-# Version: 5.14.0
+# Version: 5.15.1
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -51,11 +51,11 @@ spec:
             description: GrafanaFolderSpec defines the desired state of GrafanaFolder
             properties:
               allowCrossNamespaceImport:
-                description: allow to import this resources from an operator in a
-                  different namespace
+                description: Enable matching Grafana instances outside the current
+                  namespace
                 type: boolean
               instanceSelector:
-                description: selects Grafanas for import
+                description: Selects Grafanas for import
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
@@ -112,17 +112,25 @@ spec:
                   be created
                 type: string
               permissions:
-                description: raw json with folder permissions
+                description: Raw json with folder permissions, potentially exported
+                  from Grafana
                 type: string
               resyncPeriod:
                 default: 5m
-                description: how often the folder is synced, defaults to 5m if not
+                description: How often the folder is synced, defaults to 5m if not
                   set
                 format: duration
                 pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
                 type: string
               title:
+                description: Display name of the folder in Grafana
+                type: string
+              uid:
+                description: Manually specify the UID the Folder is created with
                 type: string
+                x-kubernetes-validations:
+                - message: spec.uid is immutable
+                  rule: self == oldSelf
             required:
             - instanceSelector
             type: object
@@ -131,6 +139,9 @@ spec:
               rule: (has(self.parentFolderUID) && !(has(self.parentFolderRef))) ||
                 (has(self.parentFolderRef) && !(has(self.parentFolderUID))) || !(has(self.parentFolderRef)
                 && (has(self.parentFolderUID)))
+            - message: spec.uid is immutable
+              rule: ((!has(oldSelf.uid) && !has(self.uid)) || (has(oldSelf.uid) &&
+                has(self.uid)))
           status:
             description: GrafanaFolderStatus defines the observed state of GrafanaFolder
             properties:

diff --git a/.../bitnami-grafana-operator-crds/templates/grafananotificationpolicies.integreatly.org.yaml b/.../bitnami-grafana-operator-crds/templates/grafananotificationpolicies.integreatly.org.yaml
@@ -1,5 +1,5 @@
 # Source: https://raw.githubusercontent.com/grafana/grafana-operator/v{version}/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafananotificationpolicies.yaml
-# Version: 5.14.0
+# Version: 5.15.1
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -45,6 +45,13 @@ spec:
             description: GrafanaNotificationPolicySpec defines the desired state of
               GrafanaNotificationPolicy
             properties:
+              editable:
+                description: Whether to enable or disable editing of the notification
+                  policy in Grafana UI
+                type: boolean
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
               instanceSelector:
                 description: selects Grafanas for import
                 properties:

diff --git a/charts/bitnami-grafana-operator-crds/templates/grafanas.integreatly.org.yaml b/charts/bitnami-grafana-operator-crds/templates/grafanas.integreatly.org.yaml
@@ -1,5 +1,5 @@
 # Source: https://raw.githubusercontent.com/grafana/grafana-operator/v{version}/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanas.yaml
-# Version: 5.14.0
+# Version: 5.15.1
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -69,6 +69,32 @@ spec:
                   timeout:
                     nullable: true
                     type: integer
+                  tls:
+                    description: TLS Configuration used to talk with the grafana instance.
+                    properties:
+                      certSecretRef:
+                        description: Use a secret as a reference to give TLS Certificate
+                          information
+                        properties:
+                          name:
+                            description: name is unique within a namespace to reference
+                              a secret resource.
+                            type: string
+                          namespace:
+                            description: namespace defines the space within which
+                              the secret name must be unique.
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      insecureSkipVerify:
+                        description: Disable the CA check of the server
+                        type: boolean
+                    type: object
+                    x-kubernetes-validations:
+                    - message: insecureSkipVerify and certSecretRef cannot be set
+                        at the same time
+                      rule: (has(self.insecureSkipVerify) && !(has(self.certSecretRef)))
+                        || (has(self.certSecretRef) && !(has(self.insecureSkipVerify)))
                 type: object
               config:
                 additionalProperties:
@@ -8226,8 +8252,7 @@ spec:
                     type: object
                     x-kubernetes-map-type: atomic
                   tls:
-                    description: TLS Configuration used to talk with the external
-                      grafana instance.
+                    description: DEPRECATED, use top level `tls` instead.
                     properties:
                       certSecretRef:
                         description: Use a secret as a reference to give TLS Certificate

diff --git a/charts/bitnami-labs-sealed-secrets-crds/Chart.yaml b/charts/bitnami-labs-sealed-secrets-crds/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: 0.0.0
 name: bitnami-labs-sealed-secrets-crds
 type: application
-version: 2.16.1
+version: 2.16.2