Skip to content

Commit

Permalink
Merge pull request #1745 from grafana/chore/bump-release-v5.15.1
Browse files Browse the repository at this point in the history
chore: bump release v5.15.1
  • Loading branch information
theSuess authored Nov 4, 2024
2 parents a9cb1a4 + 759b209 commit 6025362
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/grafana-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 4 additions & 4 deletions deploy/helm/grafana-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand All @@ -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"
}
```

Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion hugo/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6025362

Please sign in to comment.