From ded69baa8b9d30265ef6a5f402e9add010c32d63 Mon Sep 17 00:00:00 2001 From: "Spies, Patrick - F0217791" Date: Thu, 1 Jun 2023 10:15:07 +0200 Subject: [PATCH 1/4] feat: add optional networkpolicy to helm-chart --- deployments/kubernetes/chart/reloader/values.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index 9fbbfd9f..1d5e5618 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -268,3 +268,10 @@ reloader: enabled: false # Set the minimum available replicas # minAvailable: 1 + + netpol: + enabled: false + from: [] + # - podSelector: + # matchLabels: + # app.kubernetes.io/name: prometheus From c1bec21d4d54d4963379ad6bcc027ea9d314ae9b Mon Sep 17 00:00:00 2001 From: "Spies, Patrick - F0217791" Date: Thu, 1 Jun 2023 10:19:15 +0200 Subject: [PATCH 2/4] fix: do not git-ignore reloader-chart --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 74975a21..a1e34ce7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ _gopath/ .vscode vendor dist -Reloader \ No newline at end of file +Reloader +!**/chart/reloader \ No newline at end of file From b0fa2f6b36c1c108383eb671c92bbd378ef58621 Mon Sep 17 00:00:00 2001 From: "Spies, Patrick - F0217791" Date: Thu, 1 Jun 2023 10:19:30 +0200 Subject: [PATCH 3/4] fix: add missing new chart-yaml --- .../reloader/templates/networkpolicy.yaml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml diff --git a/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml b/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml new file mode 100644 index 00000000..1542404d --- /dev/null +++ b/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml @@ -0,0 +1,30 @@ +{{- if and ( .Values.reloader.netpol.enabled ) }} +kubectlapiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + annotations: +{{ include "reloader-helm3.annotations" . | indent 4 }} + labels: +{{ include "reloader-labels.chart" . | indent 4 }} +{{- if .Values.reloader.matchLabels }} +{{ toYaml .Values.reloader.matchLabels | indent 4 }} +{{- end }} + name: {{ template "reloader-fullname" . }} +spec: + podSelector: + matchLabels: + app: {{ template "reloader-fullname" . }} + release: {{ .Release.Name | quote }} +{{- if .Values.reloader.matchLabels }} +{{ toYaml .Values.reloader.matchLabels | indent 6 }} +{{- end }} + policyTypes: + - Ingress + ingress: + - ports: + - port: http + {{- with .Values.reloader.netpol.from}} + from: + {{- toYaml .| nindent 8 }} + {{- end }} +{{- end }} \ No newline at end of file From e9e2647e693f029c0b2ea5a863e799919b2f9917 Mon Sep 17 00:00:00 2001 From: "Spies, Patrick - F0217791" Date: Mon, 5 Jun 2023 11:58:36 +0200 Subject: [PATCH 4/4] fix typo --- .../kubernetes/chart/reloader/templates/networkpolicy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml b/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml index 1542404d..11d05e6f 100644 --- a/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml +++ b/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml @@ -1,5 +1,5 @@ {{- if and ( .Values.reloader.netpol.enabled ) }} -kubectlapiVersion: networking.k8s.io/v1 +apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: annotations: @@ -27,4 +27,4 @@ spec: from: {{- toYaml .| nindent 8 }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }}