Skip to content

Commit 0f47789

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #647 from EmilyM1/add-metering-to-OLM
Add Metering Operator to catalog
2 parents 67f26f5 + a4c7a9e commit 0f47789

10 files changed

+985
-0
lines changed

‎deploy/chart/catalog_resources/rh-operators/metering-operator.v0.12.0.clusterserviceversion.yaml

Lines changed: 324 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,324 @@
1+
#! validate-crd: deploy/chart/templates/0000_30_02-clusterserviceversion.crd.yaml
2+
#! parse-kind: ClusterServiceVersion
3+
apiVersion: operators.coreos.com/v1alpha1
4+
kind: ClusterServiceVersion
5+
metadata:
6+
name: metering-operator.v0.12.0
7+
namespace: placeholder
8+
labels:
9+
operator-metering: "true"
10+
spec:
11+
displayName: Metering
12+
description: Metering can generate reports based on historical usage data from a cluster, providing accountability for how resources have been used.
13+
keywords: [metering metrics reporting]
14+
version: 0.12.0
15+
maturity: alpha
16+
maintainers:
17+
- email: [email protected]
18+
name: Red Hat
19+
provider:
20+
name: Red Hat
21+
labels:
22+
alm-owner-metering: metering-operator
23+
alm-status-descriptors: metering-operator.v0.12.0
24+
selector:
25+
matchLabels:
26+
alm-owner-metering: metering-operator
27+
installModes:
28+
- type: OwnNamespace
29+
supported: true
30+
- type: SingleNamespace
31+
supported: false
32+
- type: MultiNamespace
33+
supported: false
34+
- type: AllNamespaces
35+
supported: false
36+
install:
37+
strategy: deployment
38+
spec:
39+
permissions:
40+
- rules:
41+
- apiGroups:
42+
- metering.openshift.io
43+
resources:
44+
- '*'
45+
verbs:
46+
- '*'
47+
- apiGroups:
48+
- ""
49+
resources:
50+
- pods
51+
- pods/attach
52+
- pods/exec
53+
- pods/portforward
54+
- pods/proxy
55+
verbs:
56+
- create
57+
- delete
58+
- deletecollection
59+
- get
60+
- list
61+
- patch
62+
- update
63+
- watch
64+
- apiGroups:
65+
- ""
66+
resources:
67+
- configmaps
68+
- endpoints
69+
- persistentvolumeclaims
70+
- replicationcontrollers
71+
- replicationcontrollers/scale
72+
- secrets
73+
- serviceaccounts
74+
- services
75+
- services/proxy
76+
verbs:
77+
- create
78+
- delete
79+
- deletecollection
80+
- get
81+
- list
82+
- patch
83+
- update
84+
- watch
85+
- apiGroups:
86+
- ""
87+
resources:
88+
- bindings
89+
- events
90+
- limitranges
91+
- namespaces/status
92+
- pods/log
93+
- pods/status
94+
- replicationcontrollers/status
95+
- resourcequotas
96+
- resourcequotas/status
97+
verbs:
98+
- get
99+
- list
100+
- watch
101+
- apiGroups:
102+
- ""
103+
resources:
104+
- events
105+
verbs:
106+
- create
107+
- update
108+
- patch
109+
- apiGroups:
110+
- ""
111+
resources:
112+
- namespaces
113+
verbs:
114+
- get
115+
- list
116+
- watch
117+
- apiGroups:
118+
- apps
119+
resources:
120+
- deployments
121+
- deployments/rollback
122+
- deployments/scale
123+
- statefulsets
124+
verbs:
125+
- create
126+
- delete
127+
- deletecollection
128+
- get
129+
- list
130+
- patch
131+
- update
132+
- watch
133+
- apiGroups:
134+
- batch
135+
resources:
136+
- cronjobs
137+
- jobs
138+
verbs:
139+
- create
140+
- delete
141+
- deletecollection
142+
- get
143+
- list
144+
- patch
145+
- update
146+
- watch
147+
- apiGroups:
148+
- extensions
149+
resources:
150+
- daemonsets
151+
- deployments
152+
- deployments/rollback
153+
- deployments/scale
154+
- replicasets
155+
- replicasets/scale
156+
- replicationcontrollers/scale
157+
verbs:
158+
- create
159+
- delete
160+
- deletecollection
161+
- get
162+
- list
163+
- patch
164+
- update
165+
- watch
166+
- apiGroups:
167+
- rbac.authorization.k8s.io
168+
resources:
169+
- rolebindings
170+
- roles
171+
verbs:
172+
- create
173+
- delete
174+
- deletecollection
175+
- get
176+
- list
177+
- patch
178+
- update
179+
- watch
180+
- apiGroups:
181+
- route.openshift.io
182+
resources:
183+
- routes
184+
verbs:
185+
- create
186+
- get
187+
- list
188+
- watch
189+
- update
190+
- delete
191+
serviceAccountName: metering-operator
192+
deployments:
193+
- name: metering-operator
194+
spec:
195+
replicas: 1
196+
selector:
197+
matchLabels:
198+
app: metering-operator
199+
strategy:
200+
type: Recreate
201+
template:
202+
metadata:
203+
labels:
204+
app: metering-operator
205+
spec:
206+
containers:
207+
- args:
208+
- run-operator.sh
209+
env:
210+
- name: HELM_RELEASE_CRD_NAME
211+
value: Metering
212+
- name: HELM_RELEASE_CRD_API_GROUP
213+
value: metering.openshift.io
214+
- name: HELM_CHART_PATH
215+
value: /openshift-metering-0.1.0.tgz
216+
- name: MY_POD_NAME
217+
valueFrom:
218+
fieldRef:
219+
fieldPath: metadata.name
220+
- name: MY_POD_NAMESPACE
221+
valueFrom:
222+
fieldRef:
223+
fieldPath: metadata.namespace
224+
- name: HELM_HOST
225+
value: 127.0.0.1:44134
226+
- name: HELM_WAIT
227+
value: "false"
228+
- name: HELM_RECONCILE_INTERVAL_SECONDS
229+
value: "30"
230+
- name: RELEASE_HISTORY_LIMIT
231+
value: "3"
232+
image: quay.io/coreos/metering-helm-operator:0.12.0
233+
imagePullPolicy: Always
234+
name: metering-operator
235+
resources:
236+
limits:
237+
cpu: 50m
238+
memory: 25Mi
239+
requests:
240+
cpu: 50m
241+
memory: 25Mi
242+
- args:
243+
- tiller
244+
env:
245+
- name: TILLER_NAMESPACE
246+
valueFrom:
247+
fieldRef:
248+
fieldPath: metadata.namespace
249+
- name: TILLER_HISTORY_MAX
250+
value: "3"
251+
image: quay.io/coreos/metering-helm-operator:0.12.0
252+
imagePullPolicy: Always
253+
livenessProbe:
254+
failureThreshold: 3
255+
httpGet:
256+
path: /liveness
257+
port: 44135
258+
scheme: HTTP
259+
initialDelaySeconds: 1
260+
periodSeconds: 10
261+
successThreshold: 1
262+
timeoutSeconds: 1
263+
name: tiller
264+
readinessProbe:
265+
failureThreshold: 3
266+
httpGet:
267+
path: /readiness
268+
port: 44135
269+
scheme: HTTP
270+
initialDelaySeconds: 1
271+
periodSeconds: 10
272+
successThreshold: 1
273+
timeoutSeconds: 1
274+
resources:
275+
limits:
276+
cpu: 50m
277+
memory: 100Mi
278+
requests:
279+
cpu: 50m
280+
memory: 50Mi
281+
restartPolicy: Always
282+
securityContext:
283+
runAsNonRoot: true
284+
serviceAccount: metering-operator
285+
terminationGracePeriodSeconds: 30
286+
customresourcedefinitions:
287+
owned:
288+
- description: An instance of Metering
289+
displayName: Metering
290+
kind: Metering
291+
name: meterings.metering.openshift.io
292+
version: v1alpha1
293+
- description: A table within PrestoDB
294+
displayName: Metering Presto Table
295+
kind: PrestoTable
296+
name: prestotables.metering.openshift.io
297+
version: v1alpha1
298+
- description: A resource describing a source of data for usage by Report Generation
299+
Queries
300+
displayName: Metering data source
301+
kind: ReportDataSource
302+
name: reportdatasources.metering.openshift.io
303+
version: v1alpha1
304+
- description: A SQL query used by Metering to generate reports
305+
displayName: Metering generation query
306+
kind: ReportGenerationQuery
307+
name: reportgenerationqueries.metering.openshift.io
308+
version: v1alpha1
309+
- description: A Prometheus query by Metering to do metering
310+
displayName: Metering prometheus query
311+
kind: ReportPrometheusQuery
312+
name: reportprometheusqueries.metering.openshift.io
313+
version: v1alpha1
314+
- description: A metering report for a specific time interval
315+
displayName: Metering Report
316+
kind: Report
317+
name: reports.metering.openshift.io
318+
version: v1alpha1
319+
- description: Represents a configurable storage location for Metering to store metering
320+
and report data
321+
displayName: Metering storage location
322+
kind: StorageLocation
323+
name: storagelocations.metering.openshift.io
324+
version: v1alpha1

‎deploy/chart/catalog_resources/rh-operators/metering.crd.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: meterings.metering.openshift.io
5+
annotations:
6+
catalog.app.coreos.com/description: An instance of Metering
7+
catalog.app.coreos.com/displayName: Metering
8+
spec:
9+
group: metering.openshift.io
10+
version: v1alpha1
11+
scope: Namespaced
12+
names:
13+
plural: meterings
14+
singular: metering
15+
kind: Metering
16+
listKind: MeteringList

‎deploy/chart/catalog_resources/rh-operators/metering.package.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#! package-manifest: deploy/chart/catalog_resources/rh-operators/metering-operator.v0.12.0.clusterserviceversion.yaml
2+
packageName: metering
3+
channels:
4+
- name: alpha
5+
currentCSV: metering-operator.v0.12.0

‎deploy/chart/catalog_resources/rh-operators/prestotable.crd.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: prestotables.metering.openshift.io
5+
annotations:
6+
catalog.app.coreos.com/displayName: "Metering Presto Table"
7+
catalog.app.coreos.com/description: "A table within PrestoDB"
8+
spec:
9+
group: metering.openshift.io
10+
version: v1alpha1
11+
scope: Namespaced
12+
names:
13+
plural: prestotables
14+
singular: prestotable
15+
kind: PrestoTable

0 commit comments

Comments
 (0)