Skip to content

Commit

Permalink
prepare 5.4.0 (#1228)
Browse files Browse the repository at this point in the history
  • Loading branch information
@NissesSenap
NissesSenap committed Sep 5, 2023
1 parent dbb313c commit 6be5c9b
Show file tree
Hide file tree
Showing 9 changed files with 165 additions and 40 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
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.3.0
VERSION ?= 5.4.0

# Image URL to use all building/pushing image targets
REGISTRY ?= ghcr.io
Expand Down
13 changes: 7 additions & 6 deletions bundle/manifests/grafana-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ metadata:
]
capabilities: Basic Install
categories: Monitoring
containerImage: ghcr.io/grafana-operator/grafana-operator:v5.3.0
createdAt: "2023-07-24T10:00:00Z"
containerImage: ghcr.io/grafana-operator/grafana-operator:v5.4.0
createdAt: "2023-09-05T14: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.3.0
name: grafana-operator.v5.4.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -293,6 +293,7 @@ spec:
- route.openshift.io
resources:
- routes
- routes/custom-host
verbs:
- create
- delete
Expand Down Expand Up @@ -326,7 +327,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
image: ghcr.io/grafana-operator/grafana-operator:v5.3.0
image: ghcr.io/grafana-operator/grafana-operator:v5.4.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -413,5 +414,5 @@ spec:
minKubeVersion: 1.23.0
provider:
name: Community
replaces: grafana-operator.v5.2.0
version: 5.3.0
replaces: grafana-operator.v5.3.0
version: 5.4.0
66 changes: 42 additions & 24 deletions bundle/manifests/grafana.integreatly.org_grafanadashboards.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,34 +97,37 @@ spec:
envs:
items:
properties:
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
name:
type: string
secretKeyRef:
value:
type: string
valueFrom:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
configMapKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
x-kubernetes-map-type: atomic
value:omitempty:
type: string
required:
- name
type: object
Expand Down Expand Up @@ -171,6 +174,21 @@ spec:
type: string
jsonnet:
type: string
jsonnetLib:
properties:
fileName:
type: string
gzipJsonnetProject:
format: byte
type: string
jPath:
items:
type: string
type: array
required:
- fileName
- gzipJsonnetProject
type: object
plugins:
items:
properties:
Expand Down
108 changes: 107 additions & 1 deletion bundle/manifests/grafana.integreatly.org_grafanas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -895,8 +895,33 @@ spec:
format: int32
type: integer
type: object
resizePolicy:
items:
properties:
resourceName:
type: string
restartPolicy:
type: string
required:
- resourceName
- restartPolicy
type: object
type: array
x-kubernetes-list-type: atomic
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand All @@ -914,6 +939,8 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
restartPolicy:
type: string
securityContext:
properties:
allowPrivilegeEscalation:
Expand Down Expand Up @@ -1512,8 +1539,33 @@ spec:
format: int32
type: integer
type: object
resizePolicy:
items:
properties:
resourceName:
type: string
restartPolicy:
type: string
required:
- resourceName
- restartPolicy
type: object
type: array
x-kubernetes-list-type: atomic
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand All @@ -1531,6 +1583,8 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
restartPolicy:
type: string
securityContext:
properties:
allowPrivilegeEscalation:
Expand Down Expand Up @@ -2136,8 +2190,33 @@ spec:
format: int32
type: integer
type: object
resizePolicy:
items:
properties:
resourceName:
type: string
restartPolicy:
type: string
required:
- resourceName
- restartPolicy
type: object
type: array
x-kubernetes-list-type: atomic
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand All @@ -2155,6 +2234,8 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
restartPolicy:
type: string
securityContext:
properties:
allowPrivilegeEscalation:
Expand Down Expand Up @@ -2757,13 +2838,26 @@ spec:
type: string
name:
type: string
namespace:
type: string
required:
- kind
- name
type: object
x-kubernetes-map-type: atomic
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -3474,6 +3568,18 @@ spec:
x-kubernetes-map-type: atomic
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: ghcr.io/grafana-operator/grafana-operator
newTag: v5.3.0
newTag: v5.4.0
6 changes: 3 additions & 3 deletions config/manifests/bases/grafana-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
alm-examples: '[]'
capabilities: Basic Install
categories: Monitoring
containerImage: ghcr.io/grafana-operator/grafana-operator:v5.3.0
createdAt: "2023-07-24T10:00:00Z"
containerImage: ghcr.io/grafana-operator/grafana-operator:v5.4.0
createdAt: "2023-09-05T14:00:00Z"
repository: https://github.com/grafana-operator/grafana-operator
support: Community
name: grafana-operator.v0.0.0
Expand Down Expand Up @@ -64,5 +64,5 @@ spec:
minKubeVersion: 1.23.0
provider:
name: Community
replaces: grafana-operator.v5.2.0
replaces: grafana-operator.v5.3.0
version: 0.0.0
2 changes: 1 addition & 1 deletion deploy/helm/grafana-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0"
appVersion: "v5.4.0"
4 changes: 2 additions & 2 deletions deploy/helm/grafana-operator/README.md
View file
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-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.3.0](https://img.shields.io/badge/AppVersion-v5.3.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.4.0](https://img.shields.io/badge/AppVersion-v5.4.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.3.0
helm upgrade -i grafana-operator oci://ghcr.io/grafana-operator/helm-charts/grafana-operator --version v5.4.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 Down
2 changes: 1 addition & 1 deletion hugo/config.toml
View file
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.3.0"
version = "v5.4.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 6be5c9b

Please sign in to comment.