Skip to content

Commit 6ca66a0

Browse files
pb82pb82
authored
Merge pull request #478 from pb82/release-v3.10.3
Release v3.10.3
2 parents 9a046db + cf32c55 commit 6ca66a0

9 files changed

+547
-14
lines changed

‎.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,9 @@ tags
7878
.idea
7979
operator-sdk-*
8080
tmp
81+
# When switching branches from 4.x
82+
bin
83+
bundle
84+
config
85+
testbin
86+
vendor

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
ORG?=integreatly
1+
ORG?=grafana-operator
22
NAMESPACE?=grafana
33
PROJECT=grafana-operator
44
REG?=quay.io
55
SHELL=/bin/bash
6-
TAG?=latest
7-
PKG=github.com/integr8ly/grafana-operator
6+
TAG?=v3.10.3
7+
PKG=github.com/grafana-operator/grafana-operator
88
COMPILE_TARGET=./tmp/_output/bin/$(PROJECT)
99

1010
.PHONY: setup/travis

‎deploy/olm-catalog/grafana-operator/3.x.x/3.10.3/grafana-operator.v3.10.3.clusterserviceversion.yaml

+221
Large diffs are not rendered by default.

‎deploy/olm-catalog/grafana-operator/3.x.x/3.10.3/grafanadashboards.integreatly.org.crd.yaml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: grafanadashboards.integreatly.org
5+
spec:
6+
group: integreatly.org
7+
names:
8+
kind: GrafanaDashboard
9+
listKind: GrafanaDashboardList
10+
plural: grafanadashboards
11+
singular: grafanadashboard
12+
scope: Namespaced
13+
subresources:
14+
status: {}
15+
version: v1alpha1
16+
validation:
17+
openAPIV3Schema:
18+
properties:
19+
spec:
20+
properties:
21+
name:
22+
type: string
23+
json:
24+
type: string
25+
jsonnet:
26+
description: Jsonnet source. Has access to grafonnet.
27+
type: string
28+
url:
29+
type: string
30+
description: URL to dashboard json
31+
datasources:
32+
type: array
33+
items:
34+
description: Input datasources to resolve before importing
35+
type: object
36+
plugins:
37+
type: array
38+
items:
39+
description: Grafana Plugin Object
40+
type: object
41+
customFolderName:
42+
description: Folder name that this dashboard will be assigned to.
43+
type: string

‎deploy/olm-catalog/grafana-operator/3.x.x/3.10.3/grafanadatasources.integreatly.org.crd.yaml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: grafanadatasources.integreatly.org
5+
spec:
6+
group: integreatly.org
7+
names:
8+
kind: GrafanaDataSource
9+
listKind: GrafanaDataSourceList
10+
plural: grafanadatasources
11+
singular: grafanadatasource
12+
scope: Namespaced
13+
subresources:
14+
status: {}
15+
version: v1alpha1
16+
validation:
17+
openAPIV3Schema:
18+
properties:
19+
apiVersion:
20+
type: string
21+
kind:
22+
type: string
23+
metadata:
24+
type: object
25+
spec:
26+
required: ["datasources", "name"]
27+
properties:
28+
name:
29+
type: string
30+
minimum: 1
31+
datasources:
32+
type: array
33+
items:
34+
description: Grafana Datasource Object
35+
type: object

‎deploy/olm-catalog/grafana-operator/3.x.x/3.10.3/grafanas.integreatly.org.crd.yaml

+237
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,237 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: grafanas.integreatly.org
5+
spec:
6+
group: integreatly.org
7+
names:
8+
kind: Grafana
9+
listKind: GrafanaList
10+
plural: grafanas
11+
singular: grafana
12+
scope: Namespaced
13+
subresources:
14+
status: { }
15+
version: v1alpha1
16+
validation:
17+
openAPIV3Schema:
18+
required: [ "spec" ]
19+
properties:
20+
spec:
21+
properties:
22+
containers:
23+
type: array
24+
items:
25+
type: object
26+
description: Additional container to add to the grafana pod
27+
secrets:
28+
type: array
29+
items:
30+
type: string
31+
description: Secret to be mounted as volume into the grafana deployment
32+
configMaps:
33+
type: array
34+
items:
35+
type: string
36+
description: Config map to be mounted as volume into the grafana deployment
37+
logLevel:
38+
type: string
39+
description: Log level of the grafana instance, defaults to info
40+
adminUser:
41+
type: string
42+
description: Default admin user name
43+
adminPassword:
44+
type: string
45+
description: Default admin password
46+
basicAuth:
47+
type: boolean
48+
description: Basic auth enabled
49+
disableLoginForm:
50+
type: boolean
51+
description: Disable login form
52+
disableSignoutMenu:
53+
type: boolean
54+
description: Disable signout menu
55+
anonymous:
56+
type: boolean
57+
description: Anonymous auth enabled
58+
config:
59+
type: object
60+
description: Grafana config
61+
ingress:
62+
type: object
63+
properties:
64+
enabled:
65+
type: boolean
66+
description: Create an ingress / route
67+
ingressClassName:
68+
type: string
69+
description: Ingress class name
70+
path:
71+
type: string
72+
description: Ingress path
73+
pathType:
74+
type: string
75+
description: pathType specifies how ingress paths should be matched
76+
hostname:
77+
type: string
78+
description: The hostname of the ingress / route
79+
annotations:
80+
type: object
81+
description: Additional annotations for the ingress / route
82+
labels:
83+
type: object
84+
description: Additional labels for the ingress / route
85+
targetPort:
86+
type: string
87+
description: Override port to target in the grafana service
88+
service:
89+
type: object
90+
properties:
91+
name:
92+
type: string
93+
description: Override default service name
94+
ports:
95+
type: array
96+
description: Override default ports
97+
items:
98+
type: object
99+
description: A port to add to the grafana service
100+
annotations:
101+
type: object
102+
description: Additional annotations for the service
103+
labels:
104+
type: object
105+
description: Additional labels for the service
106+
type:
107+
type: string
108+
description: Service type (NodePort, ClusterIP or LoadBalancer)
109+
deployment:
110+
type: object
111+
properties:
112+
annotations:
113+
type: object
114+
description: Additional annotations for the service
115+
labels:
116+
type: object
117+
description: Additional labels for the service
118+
nodeSelector:
119+
type: object
120+
description: Additional labels for the running grafana pods in a labeled node.
121+
tolerations:
122+
type: array
123+
description: Additonal labels for running grafana pods in tained nodes.
124+
affinity:
125+
type: object
126+
description: Additonal labels for running grafana pods with affinity properties.
127+
envFrom:
128+
type: array
129+
description: Environment variables from Secret or ConfigMap.
130+
skipCreateAdminAccount:
131+
type: boolean
132+
description: Disable creating a random admin user
133+
priorityClassName:
134+
type: string
135+
description: Pod priority class name
136+
137+
serviceAccount:
138+
type: object
139+
properties:
140+
skip:
141+
type: boolean
142+
description: Disable ServiceAccount creation for grafana
143+
annotations:
144+
type: object
145+
description: Additional annotations for the serviceaccount
146+
labels:
147+
type: object
148+
description: Additional labels for the serviceaccount
149+
client:
150+
type: object
151+
description: Grafana client settings
152+
compat:
153+
type: object
154+
description: Backwards compatibility switches
155+
dashboardLabelSelectors:
156+
type: array
157+
items:
158+
type: object
159+
description: Label selector or match expressions
160+
jsonnet:
161+
type: object
162+
description: Jsonnet library configuration
163+
livenessProbeSpec:
164+
type: object
165+
properties:
166+
initialDelaySeconds:
167+
description: >-
168+
Number of seconds after the container has
169+
started before liveness probes are initiated. More info:
170+
https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
171+
format: int32
172+
type: integer
173+
timeoutSeconds:
174+
description: Number of seconds after which the probe times out. Defaults to 1 second.
175+
Minimum value is 1.
176+
format: int32
177+
type: integer
178+
periodSeconds:
179+
description: >-
180+
How often (in seconds) to perform the probe.
181+
Default to 10 seconds. Minimum value is 1.
182+
format: int32
183+
type: integer
184+
successThreshold:
185+
description: >-
186+
Minimum consecutive successes for the probe
187+
to be considered successful after having failed. Defaults
188+
to 1. Must be 1 for liveness and startup. Minimum value
189+
is 1.
190+
format: int32
191+
type: integer
192+
failureThreshold:
193+
description: >-
194+
When a probe fails, Kubernetes will try failureThreshold times before giving up.
195+
Giving up in case of liveness probe means restarting the container.
196+
In case of readiness probe the Pod will be marked Unready.
197+
Defaults to 3. Minimum value is 1.
198+
format: int32
199+
type: integer
200+
readinessProbeSpec:
201+
type: object
202+
properties:
203+
initialDelaySeconds:
204+
description: >-
205+
Number of seconds after the container has
206+
started before liveness probes are initiated. More info
207+
https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
208+
format: int32
209+
type: integer
210+
timeoutSeconds:
211+
description: >-
212+
Number of seconds after which the probe times out. Defaults to 1 second.
213+
Minimum value is 1.
214+
format: int32
215+
type: integer
216+
periodSeconds:
217+
description: >-
218+
How often (in seconds) to perform the probe.
219+
Default to 10 seconds. Minimum value is 1.
220+
format: int32
221+
type: integer
222+
successThreshold:
223+
description: >-
224+
Minimum consecutive successes for the probe
225+
to be considered successful after having failed. Defaults
226+
to 1. Must be 1 for liveness and startup. Minimum value
227+
is 1.
228+
format: int32
229+
type: integer
230+
failureThreshold:
231+
description: >-
232+
When a probe fails, Kubernetes will try failureThreshold times before giving up.
233+
Giving up in case of liveness probe means restarting the container.
234+
In case of readiness probe the Pod will be marked Unready.
235+
Defaults to 3. Minimum value is 1.
236+
format: int32
237+
type: integer

‎deploy/operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
serviceAccountName: grafana-operator
1818
containers:
1919
- name: grafana-operator
20-
image: quay.io/integreatly/grafana-operator:v3.10.2
20+
image: quay.io/grafana-operator/grafana-operator:v3.10.3
2121
ports:
2222
- containerPort: 60000
2323
name: metrics

0 commit comments

Comments
 (0)