From 1d6e3dc50615bf57a910509c6ebb36157372b109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20S=C3=BC=C3=9F?= Date: Wed, 15 Jan 2025 14:58:22 +0100 Subject: [PATCH] chore: prep for release 5.16.0 --- Makefile | 3 ++- README.md | 2 +- deploy/helm/grafana-operator/Chart.yaml | 4 ++-- deploy/helm/grafana-operator/README.md | 8 ++++---- hugo/config.yaml | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 2fc2d1b74..8b8b818aa 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Current Operator version -VERSION ?= 5.15.1 +VERSION ?= 5.16.0 # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) @@ -420,4 +420,5 @@ prep-release: yq $(YQ) -i '.appVersion="v$(VERSION)"' deploy/helm/grafana-operator/Chart.yaml $(YQ) -i '.params.version="v$(VERSION)"' hugo/config.yaml sed -i 's/--version v5.*/--version v$(VERSION)/g' README.md + sed -i 's/VERSION ?= 5.16.0 make helm/docs diff --git a/README.md b/README.md index e6f58dc63..be36cf9b5 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Whether you’re running one Grafana instance or many, the Grafana Operator simp Deploy the Grafana Operator easily in your cluster using Helm: ```bash -helm upgrade -i grafana-operator oci://ghcr.io/grafana/helm-charts/grafana-operator --version v5.15.1 +helm upgrade -i grafana-operator oci://ghcr.io/grafana/helm-charts/grafana-operator --version v5.16.0 ``` **Option 2: Kustomize & More** diff --git a/deploy/helm/grafana-operator/Chart.yaml b/deploy/helm/grafana-operator/Chart.yaml index 79b88a9e0..e8fa2e343 100644 --- a/deploy/helm/grafana-operator/Chart.yaml +++ b/deploy/helm/grafana-operator/Chart.yaml @@ -12,5 +12,5 @@ description: Helm chart for the Grafana Operator type: application # We keep the version and appVersion in sync as most updates also include # changes to the CRDs which are bundled with the helm resources -version: v5.15.1 -appVersion: "v5.15.1" +version: v5.16.0 +appVersion: "v5.16.0" diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md index dded31c8d..f4f044555 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. -![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.15.1](https://img.shields.io/badge/AppVersion-v5.15.1-informational?style=flat-square) +![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.16.0](https://img.shields.io/badge/AppVersion-v5.16.0-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.15.1 +helm upgrade -i grafana-operator oci://ghcr.io/grafana/helm-charts/grafana-operator --version v5.16.0 ``` Sadly helm OCI charts currently don't support searching for available versions of a helm [oci registry](https://github.com/helm/helm/issues/11000). @@ -30,7 +30,7 @@ resource "helm_release" "grafana_kubernetes_operator" { repository = "oci://ghcr.io/grafana/helm-charts" chart = "grafana-operator" verify = false - version = "v5.15.1" + version = "v5.16.0" } ``` @@ -40,7 +40,7 @@ Helm does not provide functionality to update custom resource definitions. This To avoid issues due to outdated or missing definitions, run the following command before updating an existing installation: ```shell -kubectl apply --server-side --force-conflicts -f https://github.com/grafana/grafana-operator/releases/download/v5.15.1/crds.yaml +kubectl apply --server-side --force-conflicts -f https://github.com/grafana/grafana-operator/releases/download/v5.16.0/crds.yaml ``` The `--server-side` and `--force-conflict` flags are required to avoid running into issues with the `kubectl.kubernetes.io/last-applied-configuration` annotation. diff --git a/hugo/config.yaml b/hugo/config.yaml index 8cad1c95c..71db85ebe 100644 --- a/hugo/config.yaml +++ b/hugo/config.yaml @@ -24,7 +24,7 @@ params: copyright: Grafana Operator Team version_menu: Releases archived_version: false - version: v5.15.1 + version: v5.16.0 url_latest_version: https://example.com github_repo: https://github.com/grafana/grafana-operator github_branch: master