deploy/chart: Remove any OCP-related helm chart conditionals

Signed-off-by: timflannagan <[email protected]>

Author: timflannagan

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

@@ -2,21 +2,9 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ .Values.namespace }}
-  {{ if and .Values.installType (eq .Values.installType "ocp") }}
-  annotations:
-    openshift.io/node-selector: ""
-  labels:
-    openshift.io/scc: "anyuid"
-    openshift.io/cluster-monitoring: "true"
-  {{ end }}
+
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ .Values.operator_namespace }}
-  {{ if and .Values.installType (eq .Values.installType "ocp") }}
-  annotations:
-    openshift.io/node-selector: ""
-  labels:
-    openshift.io/scc: "anyuid"
-  {{ end }}

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

@@ -18,9 +18,6 @@ spec:
         app: olm-operator
     spec:
       serviceAccountName: olm-operator-serviceaccount
-      {{- if and .Values.installType (eq .Values.installType "ocp") }}
-      priorityClassName: "system-cluster-critical"
-      {{- end }}
       containers:
         - name: olm-operator
           command:
@@ -71,10 +68,6 @@ spec:
               port: {{ .Values.olm.service.internalPort }}
           terminationMessagePolicy: FallbackToLogsOnError
           env:
-        {{ if and .Values.installType (eq .Values.installType "ocp") }}
-          - name: RELEASE_VERSION
-            value: "0.0.1-snapshot"
-        {{ end }}
           - name: OPERATOR_NAMESPACE
             valueFrom:
               fieldRef:
@@ -85,17 +78,6 @@ spec:
           resources:
 {{ toYaml .Values.olm.resources | indent 12 }}
           {{- end}}
-          {{ if and .Values.installType (eq .Values.installType "ocp") }}
-          volumeMounts:
-          - mountPath: /var/run/secrets/serving-cert
-            name: serving-cert
-          {{ end }}
-      {{ if and .Values.installType (eq .Values.installType "ocp") }}
-      volumes:
-      - name: serving-cert
-        secret:
-          secretName: olm-operator-serving-cert
-      {{ end }}
     {{- if .Values.olm.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.olm.nodeSelector | indent 8 }}

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

@@ -18,9 +18,6 @@ spec:
         app: catalog-operator
     spec:
       serviceAccountName: olm-operator-serviceaccount
-      {{- if and .Values.installType (eq .Values.installType "ocp") }}
-      priorityClassName: "system-cluster-critical"
-      {{- end }}
       containers:
         - name: catalog-operator
           command:
@@ -64,26 +61,10 @@ spec:
               path: /healthz
               port: {{ .Values.catalog.service.internalPort }}
           terminationMessagePolicy: FallbackToLogsOnError
-          env:
-          {{ if and .Values.installType (eq .Values.installType "ocp") }}
-          - name: RELEASE_VERSION
-            value: "0.0.1-snapshot"
-          {{ end }}
           {{- if .Values.catalog.resources }}
           resources:
 {{ toYaml .Values.catalog.resources | indent 12 }}
           {{- end}}
-          {{ if and .Values.installType (eq .Values.installType "ocp") }}
-          volumeMounts:
-          - mountPath: /var/run/secrets/serving-cert
-            name: serving-cert
-          {{ end }}
-      {{ if and .Values.installType (eq .Values.installType "ocp") }}
-      volumes:
-      - name: serving-cert
-        secret:
-          secretName: catalog-operator-serving-cert
-      {{ end }}
     {{- if .Values.catalog.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.catalog.nodeSelector | indent 8 }}

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

@@ -15,9 +15,6 @@ spec:
         app: packageserver
     spec:
       serviceAccountName: olm-operator-serviceaccount
-      {{- if and .Values.installType (eq .Values.installType "ocp") }}
-      priorityClassName: "system-cluster-critical"
-      {{- end }}
       {{- if .Values.package.nodeSelector }}
       nodeSelector:
         {{- toYaml .Values.package.nodeSelector | nindent 8 }}