From a4242d3ac017b3546b0070b874efa31b48922bc6 Mon Sep 17 00:00:00 2001 From: Reggie Jones Date: Thu, 11 Jul 2024 13:31:19 -0500 Subject: [PATCH 1/2] feat: update newtwork configuraions in helm chart --- chart/templates/uds-package.yaml | 15 +++++++++++++++ chart/values.yaml | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml index 16e935d..70d1840 100644 --- a/chart/templates/uds-package.yaml +++ b/chart/templates/uds-package.yaml @@ -38,3 +38,18 @@ spec: podLabels: app.kubernetes.io/name: confluence remoteGenerated: Anywhere +# Custom rules for unanticipated scenarios + {{- range .Values.custom }} + - direction: {{ .direction }} + selector: + {{ .selector | toYaml | nindent 10 }} + {{- if not .remoteGenerated }} + remoteNamespace: {{ .remoteNamespace }} + remoteSelector: + {{ .remoteSelector | toYaml | nindent 10 }} + port: {{ .port }} + {{- else }} + remoteGenerated: {{ .remoteGenerated }} + {{- end }} + description: {{ .description }} + {{- end }} \ No newline at end of file diff --git a/chart/values.yaml b/chart/values.yaml index 9c2f3c1..93c7f89 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,2 +1,18 @@ domain: "###ZARF_VAR_DOMAIN###" sso: true +# custom: +# # Notice no `remoteGenerated` field here on custom internal rule +# - direction: Ingress +# selector: +# app: jenkins +# remoteNamespace: jenkins +# remoteSelector: +# app: jenkins +# port: 8180 +# description: "Ingress from Jenkins" +# # No `remoteNamespace`, `remoteSelector`, or `port` fields on rule to `remoteGenerated` +# - direction: Egress +# selector: +# app: webservice +# remoteGenerated: Anywhere +# description: "Egress from Mattermost" \ No newline at end of file From a8877bfe5a6c096e68bfbba897349f27888efcf4 Mon Sep 17 00:00:00 2001 From: Reggie Jones Date: Thu, 11 Jul 2024 14:31:56 -0500 Subject: [PATCH 2/2] feat: update newtwork configuraions in helm chart --- chart/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/values.yaml b/chart/values.yaml index 93c7f89..f1b79d7 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -15,4 +15,4 @@ sso: true # selector: # app: webservice # remoteGenerated: Anywhere -# description: "Egress from Mattermost" \ No newline at end of file +# description: "Egress from Mattermost"