From 6920d16a9ccb84ef358523fd9e7cdde287e05f8c Mon Sep 17 00:00:00 2001 From: Edvin N Date: Sat, 10 Feb 2024 19:10:08 +0100 Subject: [PATCH] cut 5.6.3 and fix OLM (#1405) * prepare 5.6.3 * add skips to olm --- Makefile | 2 +- .../manifests/grafana-operator.clusterserviceversion.yaml | 6 ++++-- deploy/helm/grafana-operator/Chart.yaml | 2 +- deploy/helm/grafana-operator/README.md | 4 ++-- hugo/config.toml | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c7084c3dc..90e1d52d8 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.6.2 +VERSION ?= 5.6.3 # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml index b9b88c407..2c48e143e 100644 --- a/bundle/manifests/grafana-operator.clusterserviceversion.yaml +++ b/bundle/manifests/grafana-operator.clusterserviceversion.yaml @@ -431,5 +431,7 @@ spec: name: manager - image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 name: grafana-operator-97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752-annotation - replaces: grafana-operator.v5.6.0 - version: 5.6.1 + replaces: grafana-operator.v5.6.2 + skips: + - grafana-operator.v5.6.1 + version: 5.6.3 diff --git a/deploy/helm/grafana-operator/Chart.yaml b/deploy/helm/grafana-operator/Chart.yaml index a3f0ff970..ac468270b 100644 --- a/deploy/helm/grafana-operator/Chart.yaml +++ b/deploy/helm/grafana-operator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.3 # 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.6.2" +appVersion: "v5.6.3" diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md index 95e3e19e8..094d4c2a4 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/grafana-operator) for Kubernetes to manage Grafana instances and grafana resources. -![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.6.2](https://img.shields.io/badge/AppVersion-v5.6.2-informational?style=flat-square) +![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.6.3](https://img.shields.io/badge/AppVersion-v5.6.3-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/helm-charts/grafana-operator --version v5.6.2 +helm upgrade -i grafana-operator oci://ghcr.io/grafana/helm-charts/grafana-operator --version v5.6.3 ``` 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/hugo/config.toml b/hugo/config.toml index 463ef1ec0..83647e449 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.6.2" +version = "v5.6.3" # A link to latest version of the docs. Used in the "version-banner" partial to # point people to the main doc site.