diff --git a/charts/operators/Chart.yaml b/charts/operators/Chart.yaml index 08d80a32c..17864ccd2 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.12-rc.5 +version: 2.0.12 diff --git a/charts/pelorus/Chart.lock b/charts/pelorus/Chart.lock index feb30a352..57b960a71 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.12-rc.5 -digest: sha256:973b67bad48bb2c69a74e5b2cdab93a6f5099f2c4b04db8b0c92b897ede57398 -generated: "2024-05-20T11:54:13.332781492-03:00" + version: 2.0.12 +digest: sha256:5c8bd23146040c7cf0cf6773a7683b76d7e1fe13ebb3d72aa2061ea9c5924159 +generated: "2024-05-27T17:03:56.379849633-03:00" diff --git a/charts/pelorus/Chart.yaml b/charts/pelorus/Chart.yaml index a792a59c0..8afa401e7 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.12-rc.5 +version: 2.0.12 dependencies: - name: exporters - version: 2.0.12-rc.5 + version: 2.0.12 repository: file://./charts/exporters diff --git a/charts/pelorus/charts/exporters/Chart.yaml b/charts/pelorus/charts/exporters/Chart.yaml index 982ef6b31..31da3c830 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.12-rc.5 +version: 2.0.12 diff --git a/charts/pelorus/charts/exporters/templates/_deploymentconfig.yaml b/charts/pelorus/charts/exporters/templates/_deploymentconfig.yaml index c4219c1dd..f02f71d27 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.12-rc.5" }} + value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.12" }} {{- 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 c727a842c..563421c8c 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.12-rc.5" }} + name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.12" }} # .image_name {{- end }} name: {{ .image_tag | default "stable" }} diff --git a/docs/Development.md b/docs/Development.md index 34efe6662..674fa9b60 100644 --- a/docs/Development.md +++ b/docs/Development.md @@ -244,7 +244,7 @@ If not defined specifically, exporters are using pre-built container images with #### Pre-built Quay images -Each pull request involving `exporters` folder that is merged results in new exporters images that are tagged with the commit hash (for example, `d6f6e6fa1c9d48ca1deeaf1c72585b94964cbf31` for the following [Pull Request](https://github.com/dora-metrics/pelorus/commit/d6f6e6fa1c9d48ca1deeaf1c72585b94964cbf31)) and with the exporters version (for example, `v2.0.11`). The newest images have the additional `latest` tag. +Each pull request involving `exporters` folder that is merged results in new exporters images that are tagged with the commit hash (for example, `d6f6e6fa1c9d48ca1deeaf1c72585b94964cbf31` for the following [Pull Request](https://github.com/dora-metrics/pelorus/commit/d6f6e6fa1c9d48ca1deeaf1c72585b94964cbf31)) and with the exporters version (for example, `v2.0.12`). The newest images have the additional `latest` tag. Each new Pelorus [release](https://github.com/dora-metrics/pelorus/releases) results in new exporters images that are tagged with all the previous tags and also `stable` tag. @@ -298,7 +298,7 @@ exporters: - app_name: jira-failure-exporter exporter_type: failure - image_tag: v2.0.11 # Specific release + image_tag: v2.0.12 # Specific release env_from_secrets: - jira-credentials env_from_configmaps: diff --git a/pelorus-operator/Makefile b/pelorus-operator/Makefile index 338abdb77..5d667e004 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.9-rc.5 +VERSION ?= 0.0.9 # 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 9e1c89130..04d155318 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.9-rc.5 - createdAt: "2024-05-20T14:54:18Z" + containerImage: quay.io/pelorus/pelorus-operator:0.0.9 + createdAt: "2024-05-27T20:04:01Z" 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.9-rc.5 + name: pelorus-operator.v0.0.9 namespace: placeholder spec: apiservicedefinitions: {} @@ -210,6 +210,15 @@ spec: - clusterroles verbs: - '*' + - apiGroups: + - "" + resources: + - configmaps + - secrets + - serviceaccounts + - services + verbs: + - '*' - apiGroups: - rbac.authorization.k8s.io resources: @@ -251,15 +260,6 @@ spec: - routes verbs: - '*' - - apiGroups: - - "" - resources: - - configmaps - - secrets - - serviceaccounts - - services - verbs: - - '*' - apiGroups: - operators.coreos.com resources: @@ -393,7 +393,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.9-rc.5 + image: quay.io/pelorus/pelorus-operator:0.0.9 livenessProbe: httpGet: path: /healthz @@ -495,7 +495,7 @@ spec: provider: name: Red Hat url: https://redhat.com - version: 0.0.9-rc.5 + version: 0.0.9 replaces: pelorus-operator.v0.0.8 skips: - pelorus-operator.v0.0.8 diff --git a/pelorus-operator/config/manager/kustomization.yaml b/pelorus-operator/config/manager/kustomization.yaml index 32872ed77..8ca665c97 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.9-rc.5 + newTag: 0.0.9 diff --git a/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml b/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml index ff31392c8..c68a95061 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.9-rc.5 + containerImage: quay.io/pelorus/pelorus-operator:0.0.9 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 11facca27..e49ea10cb 100644 --- a/pelorus-operator/config/rbac/role.yaml +++ b/pelorus-operator/config/rbac/role.yaml @@ -52,6 +52,15 @@ rules: resources: - "clusterrolebindings" - "clusterroles" +- verbs: + - "*" + apiGroups: + - "" + resources: + - "configmaps" + - "secrets" + - "serviceaccounts" + - "services" - verbs: - "*" apiGroups: @@ -93,14 +102,5 @@ 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 b036b7381..3785d9ee2 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.12-rc.5 -digest: sha256:973b67bad48bb2c69a74e5b2cdab93a6f5099f2c4b04db8b0c92b897ede57398 -generated: "2024-05-20T11:54:13.771326491-03:00" + version: 2.0.12 +digest: sha256:5c8bd23146040c7cf0cf6773a7683b76d7e1fe13ebb3d72aa2061ea9c5924159 +generated: "2024-05-27T17:03:56.894029532-03:00" diff --git a/pelorus-operator/helm-charts/pelorus/Chart.yaml b/pelorus-operator/helm-charts/pelorus/Chart.yaml index dd1093ee3..d922dd01e 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.12-rc.5 + version: 2.0.12 description: A Helm chart for Kubernetes name: pelorus type: application -version: 2.0.12-rc.5 +version: 2.0.12 diff --git a/pelorus-operator/helm-charts/pelorus/charts/exporters/Chart.yaml b/pelorus-operator/helm-charts/pelorus/charts/exporters/Chart.yaml index 982ef6b31..31da3c830 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.12-rc.5 +version: 2.0.12 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 c4219c1dd..f02f71d27 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.12-rc.5" }} + value: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.12" }} {{- 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 c727a842c..563421c8c 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.12-rc.5" }} + name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.12" }} # .image_name {{- end }} name: {{ .image_tag | default "stable" }}