From 3ddd0ba925b9aa1d8b465f05b53500462a3b58da Mon Sep 17 00:00:00 2001 From: Olu Shiyanbade Date: Wed, 24 Aug 2022 12:08:28 +0100 Subject: [PATCH 1/2] Make ingress host configurable --- aws-single-instance-resiliency/templates/ingress.yaml | 10 ++++++++++ aws-single-instance-resiliency/values.yaml | 2 ++ 2 files changed, 12 insertions(+) diff --git a/aws-single-instance-resiliency/templates/ingress.yaml b/aws-single-instance-resiliency/templates/ingress.yaml index c93b26b..3b75be4 100644 --- a/aws-single-instance-resiliency/templates/ingress.yaml +++ b/aws-single-instance-resiliency/templates/ingress.yaml @@ -9,7 +9,12 @@ metadata: {{- end }} spec: rules: + {{- if .Values.ingress.host }} + - host: {{ .Values.ingress.host }} + http: + {{- else }} - http: + {{- end }} paths: - path: / pathType: Prefix @@ -30,7 +35,12 @@ metadata: {{- end }} spec: rules: + {{- if .Values.ingress.dockerIngress.host }} + - host: {{ .Values.ingress.dockerIngress.host }} + http: + {{- else}} - http: + {{- end }} paths: - path: / pathType: Prefix diff --git a/aws-single-instance-resiliency/values.yaml b/aws-single-instance-resiliency/values.yaml index 27d7992..9753b17 100644 --- a/aws-single-instance-resiliency/values.yaml +++ b/aws-single-instance-resiliency/values.yaml @@ -35,11 +35,13 @@ serviceAccount: name: nexus-repository-deployment-sa #This SA is created as part of steps under "AWS Secrets Manager" role: arn:aws:iam::000000000000:role/nxrm-nexus-role #Role with secretsmanager permissions ingress: + host: "nexus.ingress.rule.host" #host to apply this ingress rule to annotations: kubernetes.io/ingress.class: alb alb.ingress.kubernetes.io/scheme: internal # scheme alb.ingress.kubernetes.io/subnets: subnet-1,subnet-2 #comma separated list of subnet ids dockerIngress: #Ingress for Docker Connector + # host: "docker.ingress.rule.host" #host to apply this ingress rule to annotations: kubernetes.io/ingress.class: alb alb.ingress.kubernetes.io/scheme: internal # scheme From 5c5e88f8f10387123ecb8b5805ca07948bbf4098 Mon Sep 17 00:00:00 2001 From: Olu Shiyanbade Date: Wed, 24 Aug 2022 12:13:04 +0100 Subject: [PATCH 2/2] Make ingress host configurable --- aws-single-instance-resiliency/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-single-instance-resiliency/values.yaml b/aws-single-instance-resiliency/values.yaml index 9753b17..1e60341 100644 --- a/aws-single-instance-resiliency/values.yaml +++ b/aws-single-instance-resiliency/values.yaml @@ -41,7 +41,7 @@ ingress: alb.ingress.kubernetes.io/scheme: internal # scheme alb.ingress.kubernetes.io/subnets: subnet-1,subnet-2 #comma separated list of subnet ids dockerIngress: #Ingress for Docker Connector - # host: "docker.ingress.rule.host" #host to apply this ingress rule to + host: "docker.ingress.rule.host" #host to apply this ingress rule to annotations: kubernetes.io/ingress.class: alb alb.ingress.kubernetes.io/scheme: internal # scheme