Skip to content

Commit

Permalink
Merge pull request #1603 from grafana/chore/prep-5.10
Browse files Browse the repository at this point in the history
chore: prep for release 5.10.0
  • Loading branch information
theSuess authored Jul 4, 2024
2 parents 65c8137 + ab3e771 commit fc7a4d3
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: this section almost matches outputs out kubebuilder v3.7.0
###
# Current Operator version
VERSION ?= 5.9.2
VERSION ?= 5.10.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)
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/grafana-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ version: 0.1.4
# 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.9.2"
appVersion: "v5.10.0"
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.

![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.9.2](https://img.shields.io/badge/AppVersion-v5.9.2-informational?style=flat-square)
![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.10.0](https://img.shields.io/badge/AppVersion-v5.10.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.9.2
helm upgrade -i grafana-operator oci://ghcr.io/grafana/helm-charts/grafana-operator --version v5.10.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).
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.9.2"
version = "v5.10.0"
}
```

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.9.2/crds.yaml
kubectl apply --server-side --force-conflicts -f https://github.com/grafana/grafana-operator/releases/download/v5.10.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.
Expand Down
2 changes: 1 addition & 1 deletion hack/add-openshift-annotations.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

OPENSHIFT_VERSIONS="\"v4.11-v4.15\""
OPENSHIFT_VERSIONS="\"v4.11-v4.16\""

{
echo ""
Expand Down
2 changes: 1 addition & 1 deletion hugo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.2"
version = "v5.10.0"

# A link to latest version of the docs. Used in the "version-banner" partial to
# point people to the main doc site.
Expand Down

0 comments on commit fc7a4d3

Please sign in to comment.