From 2face1d82d3272c856f6d9cfa5e0add649c09332 Mon Sep 17 00:00:00 2001 From: chris onare Date: Fri, 2 May 2025 16:31:51 +1000 Subject: [PATCH] DEVOPS-2542 - remove loadbalancer information from values.yaml and read it instead from configmap --- charts/argocd-apps/Values.yaml | 4 ---- charts/argocd-apps/templates/preexisting-lb.yaml | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/charts/argocd-apps/Values.yaml b/charts/argocd-apps/Values.yaml index 7af3c09..3d5eed8 100644 --- a/charts/argocd-apps/Values.yaml +++ b/charts/argocd-apps/Values.yaml @@ -12,10 +12,6 @@ main: resources: {} port: replicaCount: - loadBalancer: - name: - targetGroupARN: - securityGroupID: worker: name: enabled: diff --git a/charts/argocd-apps/templates/preexisting-lb.yaml b/charts/argocd-apps/templates/preexisting-lb.yaml index 0812b95..9921b79 100644 --- a/charts/argocd-apps/templates/preexisting-lb.yaml +++ b/charts/argocd-apps/templates/preexisting-lb.yaml @@ -19,6 +19,7 @@ spec: app.kubernetes.io/component: web app.kubernetes.io/part-of: {{ $.Release.Name | quote }} --- +{{- $configMap := lookup "v1" "ConfigMap" {{ $.Release.Namespace | quote }} "network-config" }} apiVersion: elbv2.k8s.aws/v1beta1 kind: TargetGroupBinding annotations: @@ -35,11 +36,11 @@ spec: serviceRef: name: {{ .Values.main.name }}-service # route traffic to the created service port: {{ .Values.main.servicePort | default 80 }} - targetGroupARN: {{ .Values.main.loadBalancer.targetGroupARN }} + targetGroupARN: {{ $configMap.data.targetGroupARN }} networking: ingress: - from: - securityGroup: - groupID: {{ .Values.main.loadBalancer.securityGroupID }} + groupID: {{ $configMap.data.securityGroupID }} ports: - protocol: TCP \ No newline at end of file