diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a536f90a5..d48cef8c4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -93,7 +93,7 @@ jobs: - name: Update helm repo index.yaml run: | cd helm-charts - "${CR_TOOL_PATH}/cr" index --config ../source/deploy/helm/cr.yaml --token "${{ env.AUTHTOKEN }}" --index-path "${CR_INDEX_PATH}" --package-path ../source/deploy/helm/grafana-operator-${{ github.ref_name }}.tgz --push + "${CR_TOOL_PATH}/cr" index --config ../source/deploy/helm/cr.yaml --token "${{ env.AUTHTOKEN }}" --index-path "${CR_INDEX_PATH}" --package-path ../source/deploy/helm/ --push kustomize: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 72994eadb..cdd8d8ed7 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Current Operator version -VERSION ?= 5.15.0 +VERSION ?= 5.15.1 # 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/README.md b/README.md index 9f2cbd1a7..e6f58dc63 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.0 +helm upgrade -i grafana-operator oci://ghcr.io/grafana/helm-charts/grafana-operator --version v5.15.1 ``` **Option 2: Kustomize & More** diff --git a/deploy/helm/grafana-operator/Chart.yaml b/deploy/helm/grafana-operator/Chart.yaml index 7012bb152..79b88a9e0 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.0 -appVersion: "v5.15.0" +version: v5.15.1 +appVersion: "v5.15.1" diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md index 69e940de1..dded31c8d 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.0](https://img.shields.io/badge/AppVersion-v5.15.0-informational?style=flat-square) +![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) ## 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.0 +helm upgrade -i grafana-operator oci://ghcr.io/grafana/helm-charts/grafana-operator --version v5.15.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). @@ -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.0" + version = "v5.15.1" } ``` @@ -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.0/crds.yaml +kubectl apply --server-side --force-conflicts -f https://github.com/grafana/grafana-operator/releases/download/v5.15.1/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 288aad8e8..8cad1c95c 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.0 + version: v5.15.1 url_latest_version: https://example.com github_repo: https://github.com/grafana/grafana-operator github_branch: master