From 91d0f2a4e97bcdd8abb87a605d72ad5e50f18649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis=20Bebr=C4=ABtis?= Date: Wed, 26 Feb 2025 16:53:32 +0200 Subject: [PATCH] service settings for ssh, sshPortal, sshToken and broker Allows adding annotations, externalTrafficPolicy, loadBalancerSourceRanges --- charts/lagoon-core/Chart.yaml | 2 ++ charts/lagoon-core/templates/broker.service.yaml | 11 +++++++++++ charts/lagoon-core/templates/ssh-token.service.yaml | 11 +++++++++++ charts/lagoon-core/templates/ssh.service.yaml | 7 +++++++ charts/lagoon-core/values.yaml | 8 ++++++++ charts/lagoon-remote/Chart.yaml | 2 ++ .../lagoon-remote/templates/ssh-portal.service.yaml | 7 +++++++ charts/lagoon-remote/values.yaml | 2 ++ 8 files changed, 50 insertions(+) diff --git a/charts/lagoon-core/Chart.yaml b/charts/lagoon-core/Chart.yaml index 8a46a93ad..3a3f2eb05 100644 --- a/charts/lagoon-core/Chart.yaml +++ b/charts/lagoon-core/Chart.yaml @@ -48,3 +48,5 @@ annotations: description: update lagoon-opensearch-sync image to v0.8.3 - kind: changed description: update ssh-portal-api and ssh-token options + - kind: changed + description: ssh, ssh-token and broker service configuration options diff --git a/charts/lagoon-core/templates/broker.service.yaml b/charts/lagoon-core/templates/broker.service.yaml index 63d6210fb..3849c8b2e 100644 --- a/charts/lagoon-core/templates/broker.service.yaml +++ b/charts/lagoon-core/templates/broker.service.yaml @@ -51,8 +51,19 @@ metadata: name: {{ include "lagoon-core.broker.fullname" . }}-amqp-ext labels: {{- include "lagoon-core.broker.labels" . | nindent 4 }} + {{- with .Values.broker.service.amqpExternal.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: type: {{ .Values.broker.service.amqpExternal.type }} + {{- with .Values.broker.service.amqpExternal.externalTrafficPolicy }} + externalTrafficPolicy: {{ . }} + {{- end }} + {{- with .Values.broker.service.amqpExternal.loadBalancerSourceRanges }} + loadBalancerSourceRanges: + {{- toYaml . | nindent 2 }} + {{- end }} ports: - port: {{ .Values.broker.service.amqpExternal.port }} targetPort: amqp diff --git a/charts/lagoon-core/templates/ssh-token.service.yaml b/charts/lagoon-core/templates/ssh-token.service.yaml index ac6250f05..857bfb5a4 100644 --- a/charts/lagoon-core/templates/ssh-token.service.yaml +++ b/charts/lagoon-core/templates/ssh-token.service.yaml @@ -5,8 +5,19 @@ metadata: name: {{ include "lagoon-core.sshToken.fullname" . }} labels: {{- include "lagoon-core.sshToken.labels" . | nindent 4 }} + {{- with .Values.sshToken.service.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: type: {{ .Values.sshToken.service.type }} + {{- with .Values.sshToken.service.externalTrafficPolicy }} + externalTrafficPolicy: {{ . }} + {{- end }} + {{- with .Values.sshToken.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: + {{- toYaml . | nindent 2 }} + {{- end }} ports: - port: {{ .Values.sshToken.service.ports.sshserver }} targetPort: sshserver diff --git a/charts/lagoon-core/templates/ssh.service.yaml b/charts/lagoon-core/templates/ssh.service.yaml index 5b1feaa44..c6cb2fba5 100644 --- a/charts/lagoon-core/templates/ssh.service.yaml +++ b/charts/lagoon-core/templates/ssh.service.yaml @@ -11,6 +11,13 @@ metadata: {{- end }} spec: type: {{ .Values.ssh.service.type }} + {{- with .Values.ssh.service.externalTrafficPolicy }} + externalTrafficPolicy: {{ . }} + {{- end }} + {{- with .Values.ssh.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: + {{- toYaml . | nindent 2 }} + {{- end }} ports: - port: {{ .Values.ssh.service.port }} targetPort: ssh diff --git a/charts/lagoon-core/values.yaml b/charts/lagoon-core/values.yaml index 848ac5db6..545a2beb4 100644 --- a/charts/lagoon-core/values.yaml +++ b/charts/lagoon-core/values.yaml @@ -359,6 +359,9 @@ broker: enabled: false type: LoadBalancer port: 5672 + annotations: {} + # externalTrafficPolicy: "" + # loadBalancerSourceRanges: [] serviceMonitor: enabled: true @@ -774,6 +777,8 @@ ssh: type: ClusterIP port: 2020 annotations: {} + # externalTrafficPolicy: "" + # loadBalancerSourceRanges: [] autoscaling: enabled: false @@ -1072,6 +1077,9 @@ sshToken: service: type: LoadBalancer + annotations: {} + # externalTrafficPolicy: "" + # loadBalancerSourceRanges: [] ports: sshserver: 22 diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index a3850c253..3838647d2 100644 --- a/charts/lagoon-remote/Chart.yaml +++ b/charts/lagoon-remote/Chart.yaml @@ -46,3 +46,5 @@ annotations: description: update ssh-portal image to v0.42.0 - kind: fixed description: fix storage-calculator role + - kind: changed + description: ssh-portal service configuration options diff --git a/charts/lagoon-remote/templates/ssh-portal.service.yaml b/charts/lagoon-remote/templates/ssh-portal.service.yaml index 1c345d83a..0576d1341 100644 --- a/charts/lagoon-remote/templates/ssh-portal.service.yaml +++ b/charts/lagoon-remote/templates/ssh-portal.service.yaml @@ -11,6 +11,13 @@ metadata: {{- end }} spec: type: {{ .Values.sshPortal.service.type }} + {{- with .Values.sshPortal.service.externalTrafficPolicy }} + externalTrafficPolicy: {{ . }} + {{- end }} + {{- with .Values.sshPortal.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: + {{- toYaml . | nindent 2 }} + {{- end }} ports: - port: {{ .Values.sshPortal.service.ports.sshserver }} targetPort: sshserver diff --git a/charts/lagoon-remote/values.yaml b/charts/lagoon-remote/values.yaml index 56875fa1b..ebd3bb95f 100644 --- a/charts/lagoon-remote/values.yaml +++ b/charts/lagoon-remote/values.yaml @@ -133,6 +133,8 @@ sshPortal: ports: sshserver: 22 annotations: {} + # externalTrafficPolicy: "" + # loadBalancerSourceRanges: [] metricsService: type: ClusterIP