From b29547d564bb7105aca3fc35d111f36342a1cb01 Mon Sep 17 00:00:00 2001 From: Peter Braun Date: Mon, 24 Jul 2023 18:38:18 +0200 Subject: [PATCH] Prepare v5.3.0 (#1180) --- Makefile | 2 +- .../grafana-operator.clusterserviceversion.yaml | 12 ++++++------ .../grafana.integreatly.org_grafanadashboards.yaml | 2 +- .../grafana.integreatly.org_grafanadatasources.yaml | 2 +- .../grafana.integreatly.org_grafanafolders.yaml | 5 ++++- .../manifests/grafana.integreatly.org_grafanas.yaml | 2 +- config/manager/kustomization.yaml | 2 +- .../grafana-operator.clusterserviceversion.yaml | 6 +++--- deploy/helm/grafana-operator/Chart.yaml | 2 +- deploy/helm/grafana-operator/README.md | 4 ++-- deploy/kustomize/base/deployment.yaml | 2 +- hugo/config.toml | 2 +- 12 files changed, 23 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index a10a214d4..40d520869 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.2.0 +VERSION ?= 5.3.0 # Image URL to use all building/pushing image targets REGISTRY ?= ghcr.io diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml index 792b873b6..e4d4a3011 100644 --- a/bundle/manifests/grafana-operator.clusterserviceversion.yaml +++ b/bundle/manifests/grafana-operator.clusterserviceversion.yaml @@ -94,13 +94,13 @@ metadata: ] capabilities: Basic Install categories: Monitoring - containerImage: ghcr.io/grafana-operator/grafana-operator:v5.2.0 - createdAt: "2023-07-12T10:00:00Z" + containerImage: ghcr.io/grafana-operator/grafana-operator:v5.3.0 + createdAt: "2023-07-24T10:00:00Z" operators.operatorframework.io/builder: operator-sdk-v1.22.2 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana-operator/grafana-operator support: Community - name: grafana-operator.v5.2.0 + name: grafana-operator.v5.3.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -326,7 +326,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: ghcr.io/grafana-operator/grafana-operator:v5.2.0 + image: ghcr.io/grafana-operator/grafana-operator:v5.3.0 imagePullPolicy: Always livenessProbe: httpGet: @@ -413,5 +413,5 @@ spec: minKubeVersion: 1.23.0 provider: name: Red Hat - replaces: grafana-operator.v5.1.0 - version: 5.2.0 + replaces: grafana-operator.v5.2.0 + version: 5.3.0 diff --git a/bundle/manifests/grafana.integreatly.org_grafanadashboards.yaml b/bundle/manifests/grafana.integreatly.org_grafanadashboards.yaml index df01c02c5..a036db72c 100644 --- a/bundle/manifests/grafana.integreatly.org_grafanadashboards.yaml +++ b/bundle/manifests/grafana.integreatly.org_grafanadashboards.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null name: grafanadashboards.grafana.integreatly.org spec: diff --git a/bundle/manifests/grafana.integreatly.org_grafanadatasources.yaml b/bundle/manifests/grafana.integreatly.org_grafanadatasources.yaml index 98b49cb3d..66c7164bf 100644 --- a/bundle/manifests/grafana.integreatly.org_grafanadatasources.yaml +++ b/bundle/manifests/grafana.integreatly.org_grafanadatasources.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null name: grafanadatasources.grafana.integreatly.org spec: diff --git a/bundle/manifests/grafana.integreatly.org_grafanafolders.yaml b/bundle/manifests/grafana.integreatly.org_grafanafolders.yaml index 42699f4f5..fe5524252 100644 --- a/bundle/manifests/grafana.integreatly.org_grafanafolders.yaml +++ b/bundle/manifests/grafana.integreatly.org_grafanafolders.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null name: grafanafolders.grafana.integreatly.org spec: @@ -74,6 +74,9 @@ spec: type: boolean hash: type: string + lastResync: + format: date-time + type: string type: object type: object served: true diff --git a/bundle/manifests/grafana.integreatly.org_grafanas.yaml b/bundle/manifests/grafana.integreatly.org_grafanas.yaml index 44170e996..7e6e3c1bc 100644 --- a/bundle/manifests/grafana.integreatly.org_grafanas.yaml +++ b/bundle/manifests/grafana.integreatly.org_grafanas.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null name: grafanas.grafana.integreatly.org spec: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 4c461891a..a8669c006 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/grafana-operator/grafana-operator - newTag: v5.2.0 + newTag: v5.3.0 diff --git a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml index 08989d86b..6716a3cad 100644 --- a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml @@ -5,8 +5,8 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Monitoring - containerImage: ghcr.io/grafana-operator/grafana-operator:v5.2.0 - createdAt: "2023-07-12T10:00:00Z" + containerImage: ghcr.io/grafana-operator/grafana-operator:v5.3.0 + createdAt: "2023-07-24T10:00:00Z" repository: https://github.com/grafana-operator/grafana-operator support: Community name: grafana-operator.v0.0.0 @@ -64,5 +64,5 @@ spec: minKubeVersion: 1.23.0 provider: name: Red Hat - replaces: grafana-operator.v5.1.0 + replaces: grafana-operator.v5.2.0 version: 0.0.0 diff --git a/deploy/helm/grafana-operator/Chart.yaml b/deploy/helm/grafana-operator/Chart.yaml index 7739cc349..418e291b4 100644 --- a/deploy/helm/grafana-operator/Chart.yaml +++ b/deploy/helm/grafana-operator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.1 # 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.2.0" +appVersion: "v5.3.0" diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md index 5fca59fb4..3aa13dae4 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-operator/grafana-operator) for Kubernetes to manage Grafana instances and grafana resources. -![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.2.0](https://img.shields.io/badge/AppVersion-v5.2.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5.3.0](https://img.shields.io/badge/AppVersion-v5.3.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-operator/helm-charts/grafana-operator --version v5.2.0 +helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.3.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). diff --git a/deploy/kustomize/base/deployment.yaml b/deploy/kustomize/base/deployment.yaml index a3b388601..3752c5299 100644 --- a/deploy/kustomize/base/deployment.yaml +++ b/deploy/kustomize/base/deployment.yaml @@ -22,7 +22,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=0.0.0.0:9090 - --leader-elect - image: ghcr.io/grafana-operator/grafana-operator:v5.0.0 + image: ghcr.io/grafana-operator/grafana-operator:v5.3.0 imagePullPolicy: Always ports: - containerPort: 9090 diff --git a/hugo/config.toml b/hugo/config.toml index e4c542144..3ff699c0f 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.2.0" +version = "v5.3.0" # A link to latest version of the docs. Used in the "version-banner" partial to # point people to the main doc site.