Skip to content
This repository was archived by the owner on Apr 19, 2023. It is now read-only.

Commit 8e1f542

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #155 from obrienrobert/bump-amo-1.4.0
Bump AMO to 1.4.0 and Grafana operator to v3.6.0
2 parents 58339ac + 8c8b6de commit 8e1f542

14 files changed

+1324
-10
lines changed

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ COMPILE_TARGET=./tmp/_output/bin/$(PROJECT)
1313
# You can delete this comment afterwards.
1414
PROMETHEUS_OPERATOR_VERSION=v0.34.0
1515
LOCAL=local
16-
GRAFANA_OPERATOR_VERSION=v3.5.0
17-
AMO_VERSION=1.3.0
18-
PREV_AMO_VERSION=1.2.1
16+
GRAFANA_OPERATOR_VERSION=v3.6.0
17+
AMO_VERSION=1.4.0
18+
PREV_AMO_VERSION=1.3.0
1919

2020
AUTH_TOKEN=$(shell curl -sH "Content-Type: application/json" -XPOST https://quay.io/cnr/api/v1/users/login -d '{"user": {"username": "$(QUAY_USERNAME)", "password": "${QUAY_PASSWORD}"}}' | jq -r '.token')
2121

‎deploy/crds/grafana_crd.yaml

+22-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ spec:
8787
description: Override default ports
8888
items:
8989
type: object
90-
descripton: A port to add to the grafana service
90+
description: A port to add to the grafana service
9191
annotations:
9292
type: object
9393
description: Additional annotations for the service
@@ -106,6 +106,24 @@ spec:
106106
labels:
107107
type: object
108108
description: Additional labels for the service
109+
nodeSelector:
110+
type: object
111+
description: Additional labels for the running grafana pods in a labeled node.
112+
tolerations:
113+
type: array
114+
description: Additonal labels for running grafana pods in tained nodes.
115+
affinity:
116+
type: object
117+
description: Additonal labels for running grafana pods with affinity properties.
118+
envFrom:
119+
type: array
120+
description: Environment variables from Secret or ConfigMap.
121+
skipCreateAdminAccount:
122+
type: boolean
123+
description: Disable creating a random admin user
124+
priorityClassName:
125+
type: string
126+
description: Pod priority class name
109127
serviceAccount:
110128
type: object
111129
properties:
@@ -126,3 +144,6 @@ spec:
126144
items:
127145
type: object
128146
description: Label selector or match expressions
147+
jsonnet:
148+
type: object
149+
description: Jsonnet library configuration

‎deploy/crds/grafana_dashboard_crd.yaml

+15-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,22 @@ spec:
2222
type: string
2323
json:
2424
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
2536
plugins:
2637
type: array
2738
items:
2839
description: Grafana Plugin Object
29-
type: object
40+
type: object
41+
customFolderName:
42+
description: Folder name that this dashboard will be assigned to.
43+
type: string

‎deploy/examples/ApplicationMonitoring.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ spec:
1111
prometheusInstanceNamespaces: application-monitoring
1212
alertmanagerInstanceNamespaces: application-monitoring
1313
selfSignedCerts: true
14-
priorityClassName: "rhoam-pod-priority"
14+
priorityClassName: ""
1515

‎deploy/olm-catalog/application-monitoring-operator/1.4.0/application-monitoring-operator.v1.4.0.clusterserviceversion.yaml

+336
Large diffs are not rendered by default.

‎deploy/olm-catalog/application-monitoring-operator/1.4.0/applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml

+645
Large diffs are not rendered by default.

‎deploy/olm-catalog/application-monitoring-operator/1.4.0/applicationmonitoring.integreatly.org_blackboxtargets_crd.yaml

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: blackboxtargets.applicationmonitoring.integreatly.org
5+
spec:
6+
group: applicationmonitoring.integreatly.org
7+
names:
8+
kind: BlackboxTarget
9+
listKind: BlackboxTargetList
10+
plural: blackboxtargets
11+
singular: blackboxtarget
12+
scope: Namespaced
13+
validation:
14+
openAPIV3Schema:
15+
description: BlackboxTarget is the Schema for the blackboxtargets API
16+
properties:
17+
apiVersion:
18+
description: 'APIVersion defines the versioned schema of this representation
19+
of an object. Servers should convert recognized schemas to the latest
20+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
21+
type: string
22+
kind:
23+
description: 'Kind is a string value representing the REST resource this
24+
object represents. Servers may infer this from the endpoint the client
25+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
26+
type: string
27+
metadata:
28+
type: object
29+
spec:
30+
description: BlackboxTargetSpec defines the desired state of BlackboxTarget
31+
properties:
32+
blackboxTargets:
33+
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
34+
Important: Run "operator-sdk generate k8s" to regenerate code after
35+
modifying this file Add custom validation using kubebuilder tags:
36+
https://book.kubebuilder.io/beyond_basics/generating_crd.html'
37+
items:
38+
description: 'BlackboxtargetStructure contains: A target (url, module
39+
and service name) to be probed by the'
40+
properties:
41+
module:
42+
type: string
43+
service:
44+
type: string
45+
url:
46+
type: string
47+
required:
48+
- module
49+
- service
50+
- url
51+
type: object
52+
type: array
53+
type: object
54+
status:
55+
description: BlackboxTargetStatus defines the observed state of BlackboxTarget
56+
properties:
57+
phase:
58+
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
59+
of cluster Important: Run "operator-sdk generate k8s" to regenerate
60+
code after modifying this file Add custom validation using kubebuilder
61+
tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html'
62+
type: integer
63+
required:
64+
- phase
65+
type: object
66+
type: object
67+
version: v1alpha1
68+
versions:
69+
- name: v1alpha1
70+
served: true
71+
storage: true

‎deploy/olm-catalog/application-monitoring-operator/1.4.0/grafana_crd.yaml

+149
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
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+
path:
68+
type: string
69+
description: Ingress path
70+
hostname:
71+
type: string
72+
description: The hostname of the ingress / route
73+
annotations:
74+
type: object
75+
description: Additional annotations for the ingress / route
76+
labels:
77+
type: object
78+
description: Additional labels for the ingress / route
79+
targetPort:
80+
type: string
81+
description: Override port to target in the grafana service
82+
service:
83+
type: object
84+
properties:
85+
ports:
86+
type: array
87+
description: Override default ports
88+
items:
89+
type: object
90+
description: A port to add to the grafana service
91+
annotations:
92+
type: object
93+
description: Additional annotations for the service
94+
labels:
95+
type: object
96+
description: Additional labels for the service
97+
type:
98+
type: string
99+
description: Service type (NodePort, ClusterIP or LoadBalancer)
100+
deployment:
101+
type: object
102+
properties:
103+
annotations:
104+
type: object
105+
description: Additional annotations for the service
106+
labels:
107+
type: object
108+
description: Additional labels for the service
109+
nodeSelector:
110+
type: object
111+
description: Additional labels for the running grafana pods in a labeled node.
112+
tolerations:
113+
type: array
114+
description: Additonal labels for running grafana pods in tained nodes.
115+
affinity:
116+
type: object
117+
description: Additonal labels for running grafana pods with affinity properties.
118+
envFrom:
119+
type: array
120+
description: Environment variables from Secret or ConfigMap.
121+
skipCreateAdminAccount:
122+
type: boolean
123+
description: Disable creating a random admin user
124+
priorityClassName:
125+
type: string
126+
description: Pod priority class name
127+
serviceAccount:
128+
type: object
129+
properties:
130+
annotations:
131+
type: object
132+
description: Additional annotations for the serviceaccount
133+
labels:
134+
type: object
135+
description: Additional labels for the serviceaccount
136+
client:
137+
type: object
138+
description: Grafana client settings
139+
compat:
140+
type: object
141+
description: Backwards compatibility switches
142+
dashboardLabelSelectors:
143+
type: array
144+
items:
145+
type: object
146+
description: Label selector or match expressions
147+
jsonnet:
148+
type: object
149+
description: Jsonnet library configuration

‎deploy/olm-catalog/application-monitoring-operator/1.4.0/grafana_dashboard_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/application-monitoring-operator/1.4.0/grafana_datasource_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/application-monitoring-operator/application-monitoring-operator.package.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
channels:
2-
- currentCSV: application-monitoring-operator.v1.3.0
2+
- currentCSV: application-monitoring-operator.v1.4.0
33
name: integreatly
44
defaultChannel: integreatly
55
packageName: application-monitoring-operator

0 commit comments

Comments
 (0)