Update chart to be compatible with new version of grafana crd

Signed-off-by: Eric Sauer <[email protected]>
dora-metrics · Sep 18, 2024 · 7b225d1 · 7b225d1
1 parent 4444f22
commit 7b225d1
Show file tree

Hide file tree

Showing 28 changed files with 79 additions and 79 deletions.
diff --git a/charts/operators/Chart.yaml b/charts/operators/Chart.yaml
@@ -14,4 +14,4 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.0.13-rc.5
+version: 2.0.13-rc.6
diff --git a/charts/operators/values.yaml b/charts/operators/values.yaml
@@ -1,3 +1,3 @@
 ---
-grafana_subscription_version: 5.12.0
-prometheus_subscription_version: 0.56.3
+grafana_subscription_version: ">=5.12.0"
+prometheus_subscription_version: ">=0.56.3"
diff --git a/charts/pelorus/Chart.lock b/charts/pelorus/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: exporters
   repository: file://./charts/exporters
-  version: 2.0.13-rc.5
-digest: sha256:8e2357c1c6a1dd97e1875e6faa59cfa04480ed10fa6b96aee01ed00df4fb0b94
-generated: "2024-09-11T14:40:09.478494302Z"
+  version: 2.0.13-rc.6
+digest: sha256:c8732216313eb1f6ddacb5b7200c9405dd0f24f35ecab0d7c691cc94c9adbd26
+generated: "2024-09-18T19:32:18.988569071Z"
diff --git a/charts/pelorus/Chart.yaml b/charts/pelorus/Chart.yaml
@@ -14,9 +14,9 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.0.13-rc.5
+version: 2.0.13-rc.6
 
 dependencies:
   - name: exporters
-    version: 2.0.13-rc.5
+    version: 2.0.13-rc.6
     repository: file://./charts/exporters
diff --git a/charts/pelorus/charts/exporters/Chart.yaml b/charts/pelorus/charts/exporters/Chart.yaml
@@ -14,4 +14,4 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.0.13-rc.5
+version: 2.0.13-rc.6
diff --git a/charts/pelorus/charts/exporters/templates/_deployment.yaml b/charts/pelorus/charts/exporters/templates/_deployment.yaml
@@ -30,7 +30,7 @@ spec:
       containers:
         - name: {{ .app_name }}
           imagePullPolicy: Always
-          image: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }}
+          image: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.6" }}
           volumeMounts:
             {{- range $config := .custom_certs }}
             - name: custom-cert-volume-{{$config.map_name}}
@@ -62,7 +62,7 @@ spec:
               value: {{ .image_name }}:{{ .image_tag | default "latest" }}
                 {{- end }}
               {{- else }}
-              value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }}
+              value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.6" }}
               {{- end }}
             {{- end }}
 

diff --git a/charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml b/charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml
@@ -23,7 +23,7 @@ spec:
       name: {{ .image_name }}:{{ .image_tag | default "latest" }}
     {{- end }}
 {{- else }}
-      name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }}
+      name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.6" }}
 # .image_name
 {{- end }}
     name: {{ .image_tag | default "stable" }}

diff --git a/charts/pelorus/templates/dashboard-sdp-byapp.yaml b/charts/pelorus/templates/dashboard-sdp-byapp.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: dashboard-sdp-byapp

diff --git a/charts/pelorus/templates/dashboard-sdp.yaml b/charts/pelorus/templates/dashboard-sdp.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: dashboard-sdp

diff --git a/charts/pelorus/templates/grafana-thanos-datasource.yaml b/charts/pelorus/templates/grafana-thanos-datasource.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: integreatly.org/v1beta1
 kind: GrafanaDataSource
 metadata:
   name: prometheus-grafana-datasource

diff --git a/charts/pelorus/templates/grafana.yaml b/charts/pelorus/templates/grafana.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: integreatly.org/v1beta1
 kind: Grafana
 metadata:
   name: grafana-oauth

diff --git a/pelorus-operator/Makefile b/pelorus-operator/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.0.10-rc.5
+VERSION ?= 0.0.10-rc.6
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

diff --git a/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml b/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml
@@ -49,16 +49,16 @@ metadata:
     capabilities: Basic Install
     categories: |
       Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery
-    containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.5
-    createdAt: "2024-09-11T14:40:10Z"
+    containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.6
+    createdAt: "2024-09-18T19:54:34Z"
     description: |
       Tool that helps IT organizations measure their impact on the overall performance of their organization
     operatorframework.io/suggested-namespace: pelorus
     operators.operatorframework.io/builder: operator-sdk-v1.33.0
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
     repository: https://github.com/dora-metrics/pelorus/
     support: Pelorus Community
-  name: pelorus-operator.v0.0.10-rc.5
+  name: pelorus-operator.v0.0.10-rc.6
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -211,45 +211,45 @@ spec:
           verbs:
           - '*'
         - apiGroups:
-          - image.openshift.io
+          - ""
           resources:
-          - imagestreams
+          - configmaps
+          - secrets
+          - serviceaccounts
+          - services
           verbs:
           - '*'
         - apiGroups:
-          - monitoring.coreos.com
+          - rbac.authorization.k8s.io
           resources:
-          - prometheuses
-          - prometheusrules
-          - servicemonitors
+          - rolebindings
+          - roles
           verbs:
           - '*'
         - apiGroups:
-          - route.openshift.io
+          - apps
           resources:
-          - routes
+          - deployments
           verbs:
           - '*'
         - apiGroups:
-          - ""
+          - image.openshift.io
           resources:
-          - configmaps
-          - secrets
-          - serviceaccounts
-          - services
+          - imagestreams
           verbs:
           - '*'
         - apiGroups:
-          - rbac.authorization.k8s.io
+          - monitoring.coreos.com
           resources:
-          - rolebindings
-          - roles
+          - prometheuses
+          - prometheusrules
+          - servicemonitors
           verbs:
           - '*'
         - apiGroups:
-          - apps
+          - route.openshift.io
           resources:
-          - deployments
+          - routes
           verbs:
           - '*'
         - apiGroups:
@@ -385,7 +385,7 @@ spec:
                 - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
                 - --leader-election-id=pelorus-operator
-                image: quay.io/pelorus/pelorus-operator:0.0.10-rc.5
+                image: quay.io/etsauer/pelorus-operator:0.0.10-rc.6
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -487,7 +487,7 @@ spec:
   provider:
     name: Red Hat
     url: https://redhat.com
-  version: 0.0.10-rc.5
+  version: 0.0.10-rc.6
   replaces: pelorus-operator.v0.0.9
   skips:
     - pelorus-operator.v0.0.9

diff --git a/pelorus-operator/config/manager/kustomization.yaml b/pelorus-operator/config/manager/kustomization.yaml
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: quay.io/pelorus/pelorus-operator
-  newTag: 0.0.10-rc.5
+  newName: quay.io/etsauer/pelorus-operator
+  newTag: 0.0.10-rc.6
diff --git a/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml b/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml
@@ -6,7 +6,7 @@ metadata:
     capabilities: Basic Install
     categories: |
       Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery
-    containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.5
+    containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.6
     description: |
       Tool that helps IT organizations measure their impact on the overall performance of their organization
     operatorframework.io/suggested-namespace: pelorus

diff --git a/pelorus-operator/config/rbac/role.yaml b/pelorus-operator/config/rbac/role.yaml
@@ -55,44 +55,44 @@ rules:
 - verbs:
   - "*"
   apiGroups:
-  - "image.openshift.io"
+  - ""
   resources:
-  - "imagestreams"
+  - "configmaps"
+  - "secrets"
+  - "serviceaccounts"
+  - "services"
 - verbs:
   - "*"
   apiGroups:
-  - "monitoring.coreos.com"
+  - "rbac.authorization.k8s.io"
   resources:
-  - "prometheuses"
-  - "prometheusrules"
-  - "servicemonitors"
+  - "rolebindings"
+  - "roles"
 - verbs:
   - "*"
   apiGroups:
-  - "route.openshift.io"
+  - "apps"
   resources:
-  - "routes"
+  - "deployments"
 - verbs:
   - "*"
   apiGroups:
-  - ""
+  - "image.openshift.io"
   resources:
-  - "configmaps"
-  - "secrets"
-  - "serviceaccounts"
-  - "services"
+  - "imagestreams"
 - verbs:
   - "*"
   apiGroups:
-  - "rbac.authorization.k8s.io"
+  - "monitoring.coreos.com"
   resources:
-  - "rolebindings"
-  - "roles"
+  - "prometheuses"
+  - "prometheusrules"
+  - "servicemonitors"
 - verbs:
   - "*"
   apiGroups:
-  - "apps"
+  - "route.openshift.io"
   resources:
-  - "deployments"
+  - "routes"
 
 #+kubebuilder:scaffold:rules
diff --git a/pelorus-operator/helm-charts/pelorus/Chart.lock b/pelorus-operator/helm-charts/pelorus/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: exporters
   repository: file://./charts/exporters
-  version: 2.0.13-rc.5
-digest: sha256:8e2357c1c6a1dd97e1875e6faa59cfa04480ed10fa6b96aee01ed00df4fb0b94
-generated: "2024-09-11T14:40:09.706222738Z"
+  version: 2.0.13-rc.6
+digest: sha256:c8732216313eb1f6ddacb5b7200c9405dd0f24f35ecab0d7c691cc94c9adbd26
+generated: "2024-09-18T19:54:33.546217966Z"
diff --git a/pelorus-operator/helm-charts/pelorus/Chart.yaml b/pelorus-operator/helm-charts/pelorus/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 dependencies:
 - name: exporters
   repository: file://./charts/exporters
-  version: 2.0.13-rc.5
+  version: 2.0.13-rc.6
 description: A Helm chart for Kubernetes
 name: pelorus
 type: application
-version: 2.0.13-rc.5
+version: 2.0.13-rc.6
diff --git a/pelorus-operator/helm-charts/pelorus/charts/exporters/Chart.yaml b/pelorus-operator/helm-charts/pelorus/charts/exporters/Chart.yaml
@@ -14,4 +14,4 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.0.13-rc.5
+version: 2.0.13-rc.6
diff --git a/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_deployment.yaml b/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_deployment.yaml
@@ -30,7 +30,7 @@ spec:
       containers:
         - name: {{ .app_name }}
           imagePullPolicy: Always
-          image: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }}
+          image: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.6" }}
           volumeMounts:
             {{- range $config := .custom_certs }}
             - name: custom-cert-volume-{{$config.map_name}}
@@ -62,7 +62,7 @@ spec:
               value: {{ .image_name }}:{{ .image_tag | default "latest" }}
                 {{- end }}
               {{- else }}
-              value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }}
+              value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.6" }}
               {{- end }}
             {{- end }}
 

diff --git a/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml b/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml
@@ -23,7 +23,7 @@ spec:
       name: {{ .image_name }}:{{ .image_tag | default "latest" }}
     {{- end }}
 {{- else }}
-      name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.5" }}
+      name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.6" }}
 # .image_name
 {{- end }}
     name: {{ .image_tag | default "stable" }}

diff --git a/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp-byapp.yaml b/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp-byapp.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: dashboard-sdp-byapp

diff --git a/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp.yaml b/pelorus-operator/helm-charts/pelorus/templates/dashboard-sdp.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: dashboard-sdp

diff --git a/pelorus-operator/helm-charts/pelorus/templates/grafana-thanos-datasource.yaml b/pelorus-operator/helm-charts/pelorus/templates/grafana-thanos-datasource.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: integreatly.org/v1beta1
 kind: GrafanaDataSource
 metadata:
   name: prometheus-grafana-datasource

diff --git a/pelorus-operator/helm-charts/pelorus/templates/grafana.yaml b/pelorus-operator/helm-charts/pelorus/templates/grafana.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: integreatly.org/v1beta1
 kind: Grafana
 metadata:
   name: grafana-oauth

diff --git a/scripts/chart-test.sh b/scripts/chart-test.sh
@@ -73,14 +73,14 @@ fi
 GRAFANA_VER_HELM=$(grep grafana_subscription_version charts/operators/values.yaml | cut -d':' -f2 | tr -d ' ')
 PROMETHEUS_VER_HELM=$(grep prometheus_subscription_version charts/operators/values.yaml | cut -d':' -f2 | tr -d ' ')
 
-if ! grep \""$GRAFANA_VER_HELM"\" pelorus-operator/bundle/metadata/properties.yaml >/dev/null; then
+if ! grep "$GRAFANA_VER_HELM" pelorus-operator/bundle/metadata/properties.yaml >/dev/null; then
   echo "ERROR: Grafana version $GRAFANA_VER_HELM not found in the pelorus-operator/bundle/metadata/properties.yaml"
   exit 1
 else
   echo "OK: Grafana version $GRAFANA_VER_HELM in sync with the pelorus-operator/bundle/metadata/properties.yaml"
 fi
 
-if ! grep \""$PROMETHEUS_VER_HELM"\" pelorus-operator/bundle/metadata/properties.yaml >/dev/null; then
+if ! grep "$PROMETHEUS_VER_HELM" pelorus-operator/bundle/metadata/properties.yaml >/dev/null; then
   echo "ERROR: Prometheus version $PROMETHEUS_VER_HELM not found in the pelorus-operator/bundle/metadata/properties.yaml"
   exit 1
 else

diff --git a/scripts/pelorus-operator-patches/bundle-patches/01_prometheus_grafana_dependencies.diff b/scripts/pelorus-operator-patches/bundle-patches/01_prometheus_grafana_dependencies.diff
@@ -5,9 +5,9 @@
 +- type: olm.package
 +  value:
 +    packageName: prometheus
-+    version: "0.56.3"
++    version: ">=0.56.3"
 +- type: olm.package
 +  value:
 +    packageName: grafana-operator
-+    version: "5.12.0"
++    version: ">=5.12.0"