WIP: redo default network policy

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

helm/olmv1/templates/37-networkpolicy-olmv1-system-default-deny-all-traffic.yml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/name: olmv1
     {{- include "olmv1.labels" . | nindent 4 }}
-  name: operator-controller-default-deny-all-traffic
+  name: {{ include "component.name.prefix" . -}}default-deny-all-traffic
   namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   podSelector: {}

helm/olmv1/templates/_helpers.tpl

@@ -12,6 +12,17 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Return the name of the active component for a prefix, but _only_ if one is enabled
+*/}}
+{{- define "component.name.prefix" -}}
+{{- if and (.Values.components.operatorController.enabled) (not .Values.components.catalogd.enabled) }}
+operator-controller-
+{{- else if and (not .Values.components.operatorController.enabled) (.Values.components.catalogd.enabled) }}
+catalogd-
+{{- end }}
+{{- end }}
+
 {{/*
 Common labels
 */}}

manifests/experimental-e2e.yaml

@@ -62,7 +62,7 @@ metadata:
     app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: olm
-  name: operator-controller-default-deny-all-traffic
+  name: default-deny-all-traffic
   namespace: olmv1-system
 spec:
   podSelector: {}

manifests/experimental.yaml

@@ -62,7 +62,7 @@ metadata:
     app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: olm
-  name: operator-controller-default-deny-all-traffic
+  name: default-deny-all-traffic
   namespace: olmv1-system
 spec:
   podSelector: {}

manifests/standard-e2e.yaml

@@ -62,7 +62,7 @@ metadata:
     app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: olm
-  name: operator-controller-default-deny-all-traffic
+  name: default-deny-all-traffic
   namespace: olmv1-system
 spec:
   podSelector: {}

manifests/standard.yaml

@@ -62,7 +62,7 @@ metadata:
     app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: olm
-  name: operator-controller-default-deny-all-traffic
+  name: default-deny-all-traffic
   namespace: olmv1-system
 spec:
   podSelector: {}