Skip to content

Commit 888b81c

Browse files
author
Jeff Peeler
committed
chore(deploy): don't include openshift stuff in upstream
1 parent de0c3d2 commit 888b81c

5 files changed

+16
-0
lines changed

deploy/chart/templates/0000_50_olm_00-namespace.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
name: {{ .Values.namespace }}
5+
{{ if and .Values.installType (eq .Values.installType "ocp") }}
56
labels:
67
openshift.io/run-level: "1"
78
openshift.io/cluster-monitoring: "true"
9+
{{ end }}
810
---
911
apiVersion: v1
1012
kind: Namespace
1113
metadata:
1214
name: {{ .Values.operator_namespace }}
15+
{{ if and .Values.installType (eq .Values.installType "ocp") }}
1316
labels:
1417
openshift.io/run-level: "1"
18+
{{ end }}

deploy/chart/templates/0000_50_olm_02-services.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{ if and .Values.installType (eq .Values.installType "ocp") }}
12
apiVersion: v1
23
kind: Service
34
metadata:
@@ -35,3 +36,4 @@ spec:
3536
targetPort: metrics
3637
selector:
3738
app: catalog-operator
39+
{{ end }}

deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,18 @@ spec:
7575
resources:
7676
{{ toYaml .Values.olm.resources | indent 12 }}
7777
{{- end}}
78+
{{ if and .Values.installType (eq .Values.installType "ocp") }}
7879
volumeMounts:
7980
- mountPath: /var/run/secrets/serving-cert
8081
name: serving-cert
82+
{{ end }}
83+
{{ if and .Values.installType (eq .Values.installType "ocp") }}
8184
volumes:
8285
- name: serving-cert
8386
secret:
8487
secretName: olm-operator-serving-cert
8588
optional: true
89+
{{ end }}
8690
{{- if .Values.olm.nodeSelector }}
8791
nodeSelector:
8892
{{ toYaml .Values.olm.nodeSelector | indent 8 }}

deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,18 @@ spec:
6666
resources:
6767
{{ toYaml .Values.catalog.resources | indent 12 }}
6868
{{- end}}
69+
{{ if and .Values.installType (eq .Values.installType "ocp") }}
6970
volumeMounts:
7071
- mountPath: /var/run/secrets/serving-cert
7172
name: serving-cert
73+
{{ end }}
74+
{{ if and .Values.installType (eq .Values.installType "ocp") }}
7275
volumes:
7376
- name: serving-cert
7477
secret:
7578
secretName: catalog-operator-serving-cert
7679
optional: true
80+
{{ end }}
7781
{{- if .Values.catalog.nodeSelector }}
7882
nodeSelector:
7983
{{ toYaml .Values.catalog.nodeSelector | indent 8 }}

deploy/chart/templates/0000_50_olm_19-service-monitor.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{ if and .Values.installType (eq .Values.installType "ocp") }}
12
apiVersion: monitoring.coreos.com/v1
23
kind: ServiceMonitor
34
metadata:
@@ -87,3 +88,4 @@ rules:
8788
- get
8889
- list
8990
- watch
91+
{{ end }}

0 commit comments

Comments
 (0)