chore(addons): modify networkpolicy when svc type lb

Author: jianxiaoguo

addons/airflow/2/chart/airflow/templates/web/networkpolicy-web.yaml

@@ -17,6 +17,9 @@ spec:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
       app.kubernetes.io/component: web
   ingress:
+    {{- if eq .Values.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     {{- if or .Values.networkPolicy.allowCurrentNamespace .Values.networkPolicy.allowNamespaces }}
     - from:
       {{- if .Values.networkPolicy.allowCurrentNamespace }}
@@ -32,4 +35,5 @@ spec:
       {{- end }}
       {{- end }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/flink/1.17/chart/flink/templates/jobmanager/networkpolicy.yaml

@@ -59,6 +59,9 @@ spec:
     {{- end }}
   {{- end }}
   ingress:
+    {{- if eq .Values.jobmanager.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     - ports:
         - port: {{ .Values.jobmanager.containerPorts.blob }}
         - port: {{ .Values.jobmanager.containerPorts.rpc }}
@@ -91,4 +94,5 @@ spec:
     {{- if .Values.jobmanager.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.jobmanager.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/flink/1.17/chart/flink/templates/taskmanager/networkpolicy.yaml

@@ -59,6 +59,9 @@ spec:
     {{- end }}
   {{- end }}
   ingress:
+    {{- if eq .Values.taskmanager.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     - ports:
         - port: {{ .Values.taskmanager.containerPorts.data }}
         - port: {{ .Values.taskmanager.containerPorts.rpc }}
@@ -90,4 +93,5 @@ spec:
     {{- if .Values.taskmanager.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.taskmanager.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/kafka/3.6/chart/kafka/templates/network-policy/networkpolicy-ingress.yaml

@@ -19,6 +19,9 @@ spec:
   policyTypes:
     - Ingress
   ingress:
+    {{- if eq .Values.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     # Allow client connections
     - ports:
         - port: {{ .Values.listeners.client.containerPort }}
@@ -56,4 +59,5 @@ spec:
     - ports:
         - port: {{ .Values.metrics.kafka.containerPorts.metrics }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/minio/2023/chart/minio/templates/networkpolicy.yaml

@@ -15,6 +15,9 @@ spec:
   podSelector:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
   ingress:
+    {{- if eq .Values.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     # Allow inbound connections
     - ports:
         - port: {{ .Values.containerPorts.console }}
@@ -42,4 +45,5 @@ spec:
         {{- toYaml .Values.networkPolicy.extraFromClauses | nindent 8 }}
         {{- end }}
       {{- end }}
+    {{- end }}
 {{- end }}

addons/opensearch/2.10/chart/opensearch/templates/dashboards/networkpolicy.yaml

@@ -43,6 +43,9 @@ spec:
     {{- include "common.tplvalues.render" ( dict "value" .Values.dashboards.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
     {{- end }}
   ingress:
+    {{- if eq .Values.dashboards.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     - ports:
         - port: {{ .Values.service.ports.restAPI }}
         - port: {{ .Values.service.ports.transport }}
@@ -82,4 +85,5 @@ spec:
     {{- if .Values.dashboards.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.dashboards.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/opensearch/2.10/chart/opensearch/templates/ingest/networkpolicy.yaml

@@ -43,6 +43,9 @@ spec:
     {{- include "common.tplvalues.render" ( dict "value" .Values.ingest.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
     {{- end }}
   ingress:
+    {{- if eq .Values.ingest.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     - ports:
         - port: {{ .Values.service.ports.restAPI }}
         - port: {{ .Values.service.ports.transport }}
@@ -81,4 +84,5 @@ spec:
     {{- if .Values.ingest.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.ingest.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/opensearch/2.10/chart/opensearch/templates/master/networkpolicy.yaml

@@ -43,6 +43,9 @@ spec:
     {{- include "common.tplvalues.render" ( dict "value" .Values.master.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
     {{- end }}
   ingress:
+    {{- if eq .Values.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     - ports:
         - port: {{ .Values.service.ports.restAPI }}
         - port: {{ .Values.service.ports.transport }}
@@ -81,4 +84,5 @@ spec:
     {{- if .Values.master.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.master.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/rabbitmq/3.12/chart/rabbitmq/templates/networkpolicy.yaml

@@ -15,6 +15,9 @@ spec:
   podSelector:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
   ingress:
+    {{- if eq .Values.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     # Allow inbound connections
     - ports:
         - port: {{ .Values.service.ports.epmd }}  # EPMD
@@ -51,4 +54,5 @@ spec:
     # Allow prometheus scrapes
     - ports:
         - port: {{ .Values.service.ports.metrics }}
+    {{- end }}
 {{- end }}

addons/redis-cluster/7.0/chart/redis-cluster/templates/networkpolicy.yaml

@@ -32,6 +32,9 @@ spec:
         - podSelector:
             matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }}
   ingress:
+    {{- if eq .Values.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     # Allow inbound connections
     - ports:
         - port: {{ .Values.redis.containerPorts.redis }}
@@ -75,4 +78,5 @@ spec:
     - ports:
         - port: 9121
     {{- end }}
+    {{- end }}
 {{- end }}