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

Commit ee30bc8

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #144 from HubertStefanski/bump-amo-1.2.2
Bump Grafana-Operator to v3.5.0 & AMO to 1.3.0
2 parents c1288b5 + c720abc commit ee30bc8

13 files changed

+700
-30
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.4.0
17-
AMO_VERSION=1.2.1
18-
PREV_AMO_VERSION=1.2.0
16+
GRAFANA_OPERATOR_VERSION=v3.5.0
17+
AMO_VERSION=1.3.0
18+
PREV_AMO_VERSION=1.2.1
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/applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml

+45-16
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,62 @@ spec:
1010
plural: applicationmonitorings
1111
singular: applicationmonitoring
1212
scope: Namespaced
13-
version: v1alpha1
13+
subresources:
14+
status: {}
1415
validation:
1516
openAPIV3Schema:
16-
required: ["spec"]
17+
description: ApplicationMonitoring is the Schema for the applicationmonitorings
18+
API
1719
properties:
20+
apiVersion:
21+
description: 'APIVersion defines the versioned schema of this representation
22+
of an object. Servers should convert recognized schemas to the latest
23+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
type: string
25+
kind:
26+
description: 'Kind is a string value representing the REST resource this
27+
object represents. Servers may infer this from the endpoint the client
28+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
29+
type: string
30+
metadata:
31+
type: object
1832
spec:
19-
required: ["labelSelector"]
33+
description: ApplicationMonitoringSpec defines the desired state of ApplicationMonitoring
2034
properties:
21-
labelSelector:
35+
additionalScrapeConfigSecretKey:
2236
type: string
23-
minimum: 1
24-
description: The selector used by the Prometheus and Grafana Operators to discover resources
2537
additionalScrapeConfigSecretName:
2638
type: string
27-
description: The name of the secret from which additional scrape configs will be passed to the prometheus operator
28-
additionalScrapeConfigSecretKey:
39+
alertmanagerInstanceNamespaces:
40+
type: string
41+
labelSelector:
42+
minLength: 1
43+
type: string
44+
prometheusInstanceNamespaces:
2945
type: string
30-
description: The key under which additional scrape configs are stored within the secret
3146
prometheusRetention:
3247
type: string
33-
description: Retention time for prometheus data. See https://prometheus.io/docs/prometheus/latest/storage/
3448
prometheusStorageRequest:
3549
type: string
36-
description: How much storage to assign to a volume claim for persisting Prometheus data. See https://github.com/coreos/prometheus-operator/blob/ca400fdc3edd0af0df896a338eca270e115b74d7/Documentation/api.md#storagespec
37-
prometheusInstanceNamespaces:
38-
type: string
39-
description: The list of namespaces to watch for prometheus custom resources
40-
alertmanagerInstanceNamespaces:
50+
selfSignedCerts:
51+
type: boolean
52+
required:
53+
- labelSelector
54+
type: object
55+
status:
56+
description: ApplicationMonitoringStatus defines the observed state of ApplicationMonitoring
57+
properties:
58+
lastblackboxconfig:
4159
type: string
42-
description: The list of namespaces to watch for alertmanager custom resources
60+
phase:
61+
type: integer
62+
required:
63+
- lastblackboxconfig
64+
- phase
65+
type: object
66+
type: object
67+
version: v1alpha1
68+
versions:
69+
- name: v1alpha1
70+
served: true
71+
storage: true

‎deploy/crds/applicationmonitoring.integreatly.org_blackboxtargets_crd.yaml

+18-7
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,31 @@ spec:
1212
scope: Namespaced
1313
validation:
1414
openAPIV3Schema:
15+
description: BlackboxTarget is the Schema for the blackboxtargets API
1516
properties:
1617
apiVersion:
1718
description: 'APIVersion defines the versioned schema of this representation
1819
of an object. Servers should convert recognized schemas to the latest
19-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
20+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
2021
type: string
2122
kind:
2223
description: 'Kind is a string value representing the REST resource this
2324
object represents. Servers may infer this from the endpoint the client
24-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
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'
2526
type: string
2627
metadata:
2728
type: object
2829
spec:
30+
description: BlackboxTargetSpec defines the desired state of BlackboxTarget
2931
properties:
3032
blackboxTargets:
31-
description: 'Defines an endpoint which can be probed using the Prometheus Blackbox exporter'
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'
3237
items:
38+
description: 'BlackboxtargetStructure contains: A target (url, module
39+
and service name) to be probed by the'
3340
properties:
3441
module:
3542
type: string
@@ -38,21 +45,25 @@ spec:
3845
url:
3946
type: string
4047
required:
41-
- url
42-
- service
4348
- module
49+
- service
50+
- url
4451
type: object
4552
type: array
4653
type: object
4754
status:
55+
description: BlackboxTargetStatus defines the observed state of BlackboxTarget
4856
properties:
4957
phase:
50-
description: 'The field phase is a status field indicating which phase the controller is with regards to reconciling blackbox target resources.'
51-
format: int64
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'
5262
type: integer
5363
required:
5464
- phase
5565
type: object
66+
type: object
5667
version: v1alpha1
5768
versions:
5869
- name: v1alpha1

‎deploy/olm-catalog/application-monitoring-operator/1.3.0/application-monitoring-operator.v1.3.0.clusterserviceversion.yaml

+336
Large diffs are not rendered by default.

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

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: applicationmonitorings.applicationmonitoring.integreatly.org
5+
spec:
6+
group: applicationmonitoring.integreatly.org
7+
names:
8+
kind: ApplicationMonitoring
9+
listKind: ApplicationMonitoringList
10+
plural: applicationmonitorings
11+
singular: applicationmonitoring
12+
scope: Namespaced
13+
version: v1alpha1
14+
validation:
15+
openAPIV3Schema:
16+
required: ["spec"]
17+
properties:
18+
spec:
19+
required: ["labelSelector"]
20+
properties:
21+
labelSelector:
22+
type: string
23+
minimum: 1
24+
description: The selector used by the Prometheus and Grafana Operators to discover resources
25+
additionalScrapeConfigSecretName:
26+
type: string
27+
description: The name of the secret from which additional scrape configs will be passed to the prometheus operator
28+
additionalScrapeConfigSecretKey:
29+
type: string
30+
description: The key under which additional scrape configs are stored within the secret
31+
prometheusRetention:
32+
type: string
33+
description: Retention time for prometheus data. See https://prometheus.io/docs/prometheus/latest/storage/
34+
prometheusStorageRequest:
35+
type: string
36+
description: How much storage to assign to a volume claim for persisting Prometheus data. See https://github.com/coreos/prometheus-operator/blob/ca400fdc3edd0af0df896a338eca270e115b74d7/Documentation/api.md#storagespec
37+
prometheusInstanceNamespaces:
38+
type: string
39+
description: The list of namespaces to watch for prometheus custom resources
40+
alertmanagerInstanceNamespaces:
41+
type: string
42+
description: The list of namespaces to watch for alertmanager custom resources

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

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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+
properties:
16+
apiVersion:
17+
description: 'APIVersion defines the versioned schema of this representation
18+
of an object. Servers should convert recognized schemas to the latest
19+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
20+
type: string
21+
kind:
22+
description: 'Kind is a string value representing the REST resource this
23+
object represents. Servers may infer this from the endpoint the client
24+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
25+
type: string
26+
metadata:
27+
type: object
28+
spec:
29+
properties:
30+
blackboxTargets:
31+
description: 'Defines an endpoint which can be probed using the Prometheus Blackbox exporter'
32+
items:
33+
properties:
34+
module:
35+
type: string
36+
service:
37+
type: string
38+
url:
39+
type: string
40+
required:
41+
- url
42+
- service
43+
- module
44+
type: object
45+
type: array
46+
type: object
47+
status:
48+
properties:
49+
phase:
50+
description: 'The field phase is a status field indicating which phase the controller is with regards to reconciling blackbox target resources.'
51+
format: int64
52+
type: integer
53+
required:
54+
- phase
55+
type: object
56+
version: v1alpha1
57+
versions:
58+
- name: v1alpha1
59+
served: true
60+
storage: true

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

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
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+
descripton: 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+
serviceAccount:
110+
type: object
111+
properties:
112+
annotations:
113+
type: object
114+
description: Additional annotations for the serviceaccount
115+
labels:
116+
type: object
117+
description: Additional labels for the serviceaccount
118+
client:
119+
type: object
120+
description: Grafana client settings
121+
compat:
122+
type: object
123+
description: Backwards compatibility switches
124+
dashboardLabelSelectors:
125+
type: array
126+
items:
127+
type: object
128+
description: Label selector or match expressions

0 commit comments

Comments
 (0)