From 7413e5bbdc901f81915f9525e99c71c5c67145ef Mon Sep 17 00:00:00 2001 From: Eric Sauer Date: Thu, 5 Sep 2024 16:25:40 -0400 Subject: [PATCH] Upgrade grafana and prometheus versions to latest available (#1157) Signed-off-by: Eric Sauer --- charts/operators/Chart.yaml | 2 +- .../templates/grafana-subscription.yaml | 2 +- charts/operators/values.yaml | 4 +-- charts/pelorus/Chart.lock | 6 ++-- charts/pelorus/Chart.yaml | 4 +-- charts/pelorus/charts/exporters/Chart.yaml | 2 +- .../templates/_deploymentconfig.yaml | 2 +- .../templates/_imagestream_from_image.yaml | 2 +- .../pelorus/templates/prometheus-service.yaml | 2 +- pelorus-operator/Makefile | 2 +- ...elorus-operator.clusterserviceversion.yaml | 28 +++++++++---------- .../bundle/metadata/properties.yaml | 4 +-- .../config/manager/kustomization.yaml | 2 +- ...elorus-operator.clusterserviceversion.yaml | 2 +- pelorus-operator/config/rbac/role.yaml | 18 ++++++------ .../helm-charts/pelorus/Chart.lock | 6 ++-- .../helm-charts/pelorus/Chart.yaml | 4 +-- .../pelorus/charts/exporters/Chart.yaml | 2 +- .../templates/_deploymentconfig.yaml | 2 +- .../templates/_imagestream_from_image.yaml | 2 +- .../pelorus/templates/prometheus-service.yaml | 2 +- .../01_prometheus_grafana_dependencies.diff | 4 +-- 22 files changed, 52 insertions(+), 52 deletions(-) diff --git a/charts/operators/Chart.yaml b/charts/operators/Chart.yaml index 8205416dd..2931e13aa 100644 --- 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.2 +version: 2.0.13-rc.3 diff --git a/charts/operators/templates/grafana-subscription.yaml b/charts/operators/templates/grafana-subscription.yaml index 2ed532d87..3057d76d0 100644 --- a/charts/operators/templates/grafana-subscription.yaml +++ b/charts/operators/templates/grafana-subscription.yaml @@ -4,7 +4,7 @@ kind: Subscription metadata: name: grafana-operator spec: - channel: v4 + channel: v5 installPlanApproval: Manual name: grafana-operator source: community-operators diff --git a/charts/operators/values.yaml b/charts/operators/values.yaml index ba30e1216..d067dc89a 100644 --- a/charts/operators/values.yaml +++ b/charts/operators/values.yaml @@ -1,3 +1,3 @@ --- -grafana_subscription_version: 4.8.0 -prometheus_subscription_version: 0.47.0 +grafana_subscription_version: 5.12.0 +prometheus_subscription_version: 0.56.3 diff --git a/charts/pelorus/Chart.lock b/charts/pelorus/Chart.lock index e23679c12..6ec5375ec 100644 --- 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.2 -digest: sha256:acffc6b35d891be294bdee3d59cf41ec462bf8433cdf72347c4bcf604ff14a99 -generated: "2024-07-25T20:08:20.392336664Z" + version: 2.0.13-rc.3 +digest: sha256:742d458f384de076ddbb4a0cf2d4b4127ef1365c319212c7d64a315157fd94f5 +generated: "2024-09-05T13:30:14.412659258Z" diff --git a/charts/pelorus/Chart.yaml b/charts/pelorus/Chart.yaml index d81979957..3a12c807b 100644 --- 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.2 +version: 2.0.13-rc.3 dependencies: - name: exporters - version: 2.0.13-rc.2 + version: 2.0.13-rc.3 repository: file://./charts/exporters diff --git a/charts/pelorus/charts/exporters/Chart.yaml b/charts/pelorus/charts/exporters/Chart.yaml index a17fa21f4..abbe96436 100644 --- 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.2 +version: 2.0.13-rc.3 diff --git a/charts/pelorus/charts/exporters/templates/_deploymentconfig.yaml b/charts/pelorus/charts/exporters/templates/_deploymentconfig.yaml index dbae2ef1d..cccbe9622 100644 --- a/charts/pelorus/charts/exporters/templates/_deploymentconfig.yaml +++ b/charts/pelorus/charts/exporters/templates/_deploymentconfig.yaml @@ -67,7 +67,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.2" }} + value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.3" }} {{- end }} {{- end }} diff --git a/charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml b/charts/pelorus/charts/exporters/templates/_imagestream_from_image.yaml index f40058b0a..ffa21a5b2 100644 --- 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.2" }} + name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.3" }} # .image_name {{- end }} name: {{ .image_tag | default "stable" }} diff --git a/charts/pelorus/templates/prometheus-service.yaml b/charts/pelorus/templates/prometheus-service.yaml index 114dad248..a37775139 100644 --- a/charts/pelorus/templates/prometheus-service.yaml +++ b/charts/pelorus/templates/prometheus-service.yaml @@ -18,7 +18,7 @@ spec: protocol: TCP targetPort: web-tls selector: - app: prometheus + app.kubernetes.io/name: prometheus prometheus: prometheus-pelorus sessionAffinity: ClientIP sessionAffinityConfig: diff --git a/pelorus-operator/Makefile b/pelorus-operator/Makefile index 625f70705..c7c1c6e23 100644 --- 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.2 +VERSION ?= 0.0.10-rc.3 # 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 index aa4be2bb4..030c2810b 100644 --- a/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml +++ b/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml @@ -49,8 +49,8 @@ metadata: capabilities: Basic Install categories: | Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery - containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.2 - createdAt: "2024-08-05T20:19:51Z" + containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.3 + createdAt: "2024-09-05T18:53:43Z" description: | Tool that helps IT organizations measure their impact on the overall performance of their organization operatorframework.io/suggested-namespace: pelorus @@ -58,7 +58,7 @@ metadata: 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.2 + name: pelorus-operator.v0.0.10-rc.3 namespace: placeholder spec: apiservicedefinitions: {} @@ -210,15 +210,6 @@ spec: - clusterroles verbs: - '*' - - apiGroups: - - "" - resources: - - configmaps - - secrets - - serviceaccounts - - services - verbs: - - '*' - apiGroups: - rbac.authorization.k8s.io resources: @@ -252,6 +243,15 @@ spec: - routes verbs: - '*' + - apiGroups: + - "" + resources: + - configmaps + - secrets + - serviceaccounts + - services + verbs: + - '*' - apiGroups: - operators.coreos.com resources: @@ -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.2 + image: quay.io/pelorus/pelorus-operator:0.0.10-rc.3 livenessProbe: httpGet: path: /healthz @@ -487,7 +487,7 @@ spec: provider: name: Red Hat url: https://redhat.com - version: 0.0.10-rc.2 + version: 0.0.10-rc.3 replaces: pelorus-operator.v0.0.9 skips: - pelorus-operator.v0.0.9 diff --git a/pelorus-operator/bundle/metadata/properties.yaml b/pelorus-operator/bundle/metadata/properties.yaml index 870d1269c..2aa7d6ac4 100644 --- a/pelorus-operator/bundle/metadata/properties.yaml +++ b/pelorus-operator/bundle/metadata/properties.yaml @@ -2,8 +2,8 @@ dependencies: - type: olm.package value: packageName: prometheus - version: "0.47.0" + version: "0.56.3" - type: olm.package value: packageName: grafana-operator - version: "4.8.0" + version: "5.12.0" diff --git a/pelorus-operator/config/manager/kustomization.yaml b/pelorus-operator/config/manager/kustomization.yaml index e731a613c..d64f3c560 100644 --- a/pelorus-operator/config/manager/kustomization.yaml +++ b/pelorus-operator/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/pelorus/pelorus-operator - newTag: 0.0.10-rc.2 + newTag: 0.0.10-rc.3 diff --git a/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml b/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml index 93b9a997e..318415514 100644 --- 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.2 + containerImage: quay.io/pelorus/pelorus-operator:0.0.10-rc.3 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 index 6d92eefc6..7c4efddfe 100644 --- a/pelorus-operator/config/rbac/role.yaml +++ b/pelorus-operator/config/rbac/role.yaml @@ -52,15 +52,6 @@ rules: resources: - "clusterrolebindings" - "clusterroles" -- verbs: - - "*" - apiGroups: - - "" - resources: - - "configmaps" - - "secrets" - - "serviceaccounts" - - "services" - verbs: - "*" apiGroups: @@ -94,5 +85,14 @@ rules: - "route.openshift.io" resources: - "routes" +- verbs: + - "*" + apiGroups: + - "" + resources: + - "configmaps" + - "secrets" + - "serviceaccounts" + - "services" #+kubebuilder:scaffold:rules diff --git a/pelorus-operator/helm-charts/pelorus/Chart.lock b/pelorus-operator/helm-charts/pelorus/Chart.lock index 58a8049cb..9b299c4ad 100644 --- 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.2 -digest: sha256:acffc6b35d891be294bdee3d59cf41ec462bf8433cdf72347c4bcf604ff14a99 -generated: "2024-08-05T20:19:50.521060343Z" + version: 2.0.13-rc.3 +digest: sha256:742d458f384de076ddbb4a0cf2d4b4127ef1365c319212c7d64a315157fd94f5 +generated: "2024-09-05T18:53:43.104094598Z" diff --git a/pelorus-operator/helm-charts/pelorus/Chart.yaml b/pelorus-operator/helm-charts/pelorus/Chart.yaml index bbe292c56..08cc2620e 100644 --- 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.2 + version: 2.0.13-rc.3 description: A Helm chart for Kubernetes name: pelorus type: application -version: 2.0.13-rc.2 +version: 2.0.13-rc.3 diff --git a/pelorus-operator/helm-charts/pelorus/charts/exporters/Chart.yaml b/pelorus-operator/helm-charts/pelorus/charts/exporters/Chart.yaml index a17fa21f4..abbe96436 100644 --- 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.2 +version: 2.0.13-rc.3 diff --git a/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_deploymentconfig.yaml b/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_deploymentconfig.yaml index dbae2ef1d..cccbe9622 100644 --- a/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_deploymentconfig.yaml +++ b/pelorus-operator/helm-charts/pelorus/charts/exporters/templates/_deploymentconfig.yaml @@ -67,7 +67,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.2" }} + value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.3" }} {{- 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 index f40058b0a..ffa21a5b2 100644 --- 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.2" }} + name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.13-rc.3" }} # .image_name {{- end }} name: {{ .image_tag | default "stable" }} diff --git a/pelorus-operator/helm-charts/pelorus/templates/prometheus-service.yaml b/pelorus-operator/helm-charts/pelorus/templates/prometheus-service.yaml index 114dad248..a37775139 100644 --- a/pelorus-operator/helm-charts/pelorus/templates/prometheus-service.yaml +++ b/pelorus-operator/helm-charts/pelorus/templates/prometheus-service.yaml @@ -18,7 +18,7 @@ spec: protocol: TCP targetPort: web-tls selector: - app: prometheus + app.kubernetes.io/name: prometheus prometheus: prometheus-pelorus sessionAffinity: ClientIP sessionAffinityConfig: 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 index e9ad3decf..c75fe02f9 100644 --- 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.47.0" ++ version: "0.56.3" +- type: olm.package + value: + packageName: grafana-operator -+ version: "4.8.0" ++ version: "5.12.0"