From 89d647e9540d443cb6eff37bfb86eaf55f3eff5d Mon Sep 17 00:00:00 2001 From: Hubert Stefanski <35736504+HubertStefanski@users.noreply.github.com> Date: Tue, 12 Sep 2023 11:11:39 +0200 Subject: [PATCH] prepare v5.4.1 (#1243) * prepare v5.4.1 * make helm/docs for v5.4.1 --- Makefile | 2 +- bundle.Dockerfile | 2 +- .../grafana-operator.clusterserviceversion.yaml | 14 +++++++------- bundle/metadata/annotations.yaml | 2 +- config/manager/kustomization.yaml | 2 +- .../grafana-operator.clusterserviceversion.yaml | 6 +++--- deploy/helm/grafana-operator/Chart.yaml | 2 +- deploy/helm/grafana-operator/README.md | 4 ++-- deploy/kustomize/base/deployment.yaml | 2 +- hugo/config.toml | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index e23dedc7f..e9750b36a 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # NOTE: this section almost matches outputs out kubebuilder v3.7.0 ### # Current Operator version -VERSION ?= 5.4.0 +VERSION ?= 5.4.1 # Image URL to use all building/pushing image targets REGISTRY ?= ghcr.io diff --git a/bundle.Dockerfile b/bundle.Dockerfile index ec4293974..ce8457153 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=grafana-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.2 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml index 3280e4cf3..713ddaf0d 100644 --- a/bundle/manifests/grafana-operator.clusterserviceversion.yaml +++ b/bundle/manifests/grafana-operator.clusterserviceversion.yaml @@ -94,13 +94,13 @@ metadata: ] capabilities: Basic Install categories: Monitoring - containerImage: ghcr.io/grafana-operator/grafana-operator:v5.4.0 - createdAt: "2023-09-05T14:00:00Z" - operators.operatorframework.io/builder: operator-sdk-v1.22.2 + containerImage: ghcr.io/grafana-operator/grafana-operator:v5.4.1 + createdAt: "2023-09-12T08:52:02Z" + operators.operatorframework.io/builder: operator-sdk-v1.31.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana-operator/grafana-operator support: Community - name: grafana-operator.v5.4.0 + name: grafana-operator.v5.4.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -327,7 +327,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: ghcr.io/grafana-operator/grafana-operator:v5.4.0 + image: ghcr.io/grafana-operator/grafana-operator:v5.4.1 imagePullPolicy: Always livenessProbe: httpGet: @@ -414,5 +414,5 @@ spec: minKubeVersion: 1.23.0 provider: name: Community - replaces: grafana-operator.v5.3.0 - version: 5.4.0 + replaces: grafana-operator.v5.4.0 + version: 5.4.1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index c8cc95e18..75ed44a70 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,7 +5,7 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: grafana-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.2 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 133fab669..bcca73619 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/grafana-operator/grafana-operator - newTag: v5.4.0 + newTag: v5.4.1 diff --git a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml index 80df95665..f9f07f2d5 100644 --- a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml @@ -5,8 +5,8 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Monitoring - containerImage: ghcr.io/grafana-operator/grafana-operator:v5.4.0 - createdAt: "2023-09-05T14:00:00Z" + containerImage: ghcr.io/grafana-operator/grafana-operator:v5.4.1 + createdAt: "2023-09-12T08:09:00.92Z" repository: https://github.com/grafana-operator/grafana-operator support: Community name: grafana-operator.v0.0.0 @@ -64,5 +64,5 @@ spec: minKubeVersion: 1.23.0 provider: name: Community - replaces: grafana-operator.v5.3.0 + replaces: grafana-operator.v5.4.0 version: 0.0.0 diff --git a/deploy/helm/grafana-operator/Chart.yaml b/deploy/helm/grafana-operator/Chart.yaml index 06c633af5..67518d652 100644 --- a/deploy/helm/grafana-operator/Chart.yaml +++ b/deploy/helm/grafana-operator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.1 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v5.4.0" +appVersion: "v5.4.1" diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md index c520732d7..e4f062703 100644 --- a/deploy/helm/grafana-operator/README.md +++ b/deploy/helm/grafana-operator/README.md @@ -7,14 +7,14 @@ linkTitle: "Helm installation" [grafana-operator](https://github.com/grafana-operator/grafana-operator) for Kubernetes to manage Grafana instances and grafana resources. -![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.4.0](https://img.shields.io/badge/AppVersion-v5.4.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.4.1](https://img.shields.io/badge/AppVersion-v5.4.1-informational?style=flat-square) ## Installation This is a OCI helm chart, helm started support OCI in version 3.8.0. ```shell -helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.4.0 +helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.4.1 ``` Sadly helm OCI charts currently don't support searching for available versions of a helm [oci registry](https://github.com/helm/helm/issues/11000). diff --git a/deploy/kustomize/base/deployment.yaml b/deploy/kustomize/base/deployment.yaml index 1eacda917..65ba72599 100644 --- a/deploy/kustomize/base/deployment.yaml +++ b/deploy/kustomize/base/deployment.yaml @@ -22,7 +22,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=0.0.0.0:9090 - --leader-elect - image: ghcr.io/grafana-operator/grafana-operator:v5.3.0 + image: ghcr.io/grafana-operator/grafana-operator:v5.4.1 imagePullPolicy: Always ports: - containerPort: 9090 diff --git a/hugo/config.toml b/hugo/config.toml index e14599358..957073e16 100644 --- a/hugo/config.toml +++ b/hugo/config.toml @@ -59,7 +59,7 @@ archived_version = false # The version number for the version of the docs represented in this doc set. # Used in the "version-banner" partial to display a version number for the # current doc set. -version = "v5.4.0" +version = "v5.4.1" # A link to latest version of the docs. Used in the "version-banner" partial to # point people to the main doc site.