Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K8s Helm Chart - Allow custom secret names and optionally disable cdm creation #138

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

K8s Helm Chart - Allow custom secret names and optionally disable cdm creation #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5c8e3e
Helm chart remove hardcoded secret names and allow custom
Feb 5, 2025
badc777
Make cdm deployment optional
Feb 5, 2025
6995112
Make scb volume mount optional
Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions k8s_helm_charts/zdm/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,31 @@ Create the name of the service account to use
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}

{{/*
Create name of the secret from which container environment variables will be populated
*/}}
{{- define "zdm.secretName" -}}
{{- .Values.secretNameOverride | default "zdmproxy" }}
{{- end }}

{{/*
Create name of the secret from which containers will be configured with SCB values
*/}}
{{- define "zdm.secretScbName" -}}
{{- .Values.secretScbNameOverride | default "zdmproxy-scb" }}
{{- end }}

{{/*
Determine whether CDM should be created
*/}}
{{- define "cdm.enabled" -}}
{{- .Values.cdm.enabled | default "true" | toString }}
{{- end }}

{{/*
Determine whether SCB volume & mounts should be created from expected secret
*/}}
{{- define "scb.enabled" -}}
{{- .Values.scb.enabled | default "true" | toString }}
{{- end }}
31 changes: 24 additions & 7 deletions k8s_helm_charts/zdm/templates/cdm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
{{ $zdm_secretName := include "zdm.secretName" . -}}
{{- $zdm_secretScbName := include "zdm.secretScbName" . -}}
{{- $cdm_enabled := include "cdm.enabled" . -}}
{{- $scb_enabled := include "scb.enabled" . -}}

{{- if eq $cdm_enabled "true" }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -29,46 +35,57 @@ spec:
- configMapRef:
name: {{ include "zdm.fullname" . }}
env:
{{- if eq ($scb_enabled) "true" }}
- name: ZDM_TARGET_SECURE_CONNECT_BUNDLE_PATH
value: /tmp/scb/target.zip
{{- else }}
- name: ZDM_TARGET_CONTACT_POINTS
valueFrom:
secretKeyRef:
name: {{ $zdm_secretName }}
key: target_contact_points
{{- end }}
- name: ZDM_ORIGIN_CONTACT_POINTS
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: origin_contact_points
- name: ZDM_ORIGIN_PORT
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: origin_port
- name: ZDM_ORIGIN_USERNAME
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: origin_username
- name: ZDM_ORIGIN_PASSWORD
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: origin_password
- name: ZDM_TARGET_USERNAME
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: target_username
- name: ZDM_TARGET_PASSWORD
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: target_password
{{- if eq ($scb_enabled) "true" }}
volumeMounts:
- name: scb
mountPath: "/tmp/scb"
readOnly: true
volumes:
- name: scb
secret:
secretName: zdmproxy-scb
secretName: {{ $zdm_secretScbName }}
items:
- key: secure-connect-target.zip
path: target.zip
{{- end }}
{{- end -}}
45 changes: 29 additions & 16 deletions k8s_helm_charts/zdm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
{{ $zdm_fullname := include "zdm.fullname" . -}}
{{- $zdm_labels := include "zdm.labels" . -}}
{{- $zdm_selectorLabels := include "zdm.selectorLabels" . -}}
{{- $zdm_secretName := include "zdm.secretName" . -}}
{{- $zdm_secretScbName := include "zdm.secretScbName" . -}}
{{- $scb_enabled := include "scb.enabled" . -}}

# calculate a variable that contains all proxy service addresses
{{ $service_addresses := "" -}}
Expand Down Expand Up @@ -61,50 +64,60 @@ spec:
value: {{ $index | quote }}
- name: ZDM_PROXY_TOPOLOGY_ADDRESSES
value: {{ $service_addresses }}
{{- if eq ($scb_enabled) "true" }}
- name: ZDM_TARGET_SECURE_CONNECT_BUNDLE_PATH
value: /tmp/scb/target.zip
{{- else }}
- name: ZDM_TARGET_CONTACT_POINTS
valueFrom:
secretKeyRef:
name: {{ $zdm_secretName }}
key: target_contact_points
{{- end }}
- name: ZDM_ORIGIN_CONTACT_POINTS
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: origin_contact_points
- name: ZDM_ORIGIN_PORT
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: origin_port
- name: ZDM_ORIGIN_USERNAME
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: origin_username
- name: ZDM_ORIGIN_PASSWORD
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: origin_password
- name: ZDM_TARGET_USERNAME
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: target_username
- name: ZDM_TARGET_PASSWORD
valueFrom:
secretKeyRef:
name: zdmproxy
name: {{ $zdm_secretName }}
key: target_password
ports:
- containerPort: 9042
{{- if eq ($scb_enabled) "true" }}
volumeMounts:
- name: scb
mountPath: "/tmp/scb"
readOnly: true
- name: scb
mountPath: "/tmp/scb"
readOnly: true
volumes:
- name: scb
secret:
secretName: zdmproxy-scb
items:
- key: secure-connect-target.zip
path: target.zip
- name: scb
secret:
secretName: {{ $zdm_secretScbName }}
items:
- key: secure-connect-target.zip
path: target.zip
{{- end }}
---
{{- end -}}
{{- end -}}
10 changes: 10 additions & 0 deletions k8s_helm_charts/zdm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ proxy:
tag: ""

cdm:
enabled: "true"
resources:
limits:
cpu: 16000m
Expand All @@ -41,6 +42,15 @@ cdm:
nameOverride: ""
fullnameOverride: ""

# Enables connection via expected Secure Connect Bundle secret
scb:
enabled: "true"

# Overrides expected secret name "zdmproxy"
secretNameOverride: ""
# Overrides expected secret name "zdmproxy-scb"
secretScbNameOverride: ""

service:
type: ClusterIP
port: 9942