diff --git a/aws-single-instance-resiliency/templates/ingress.yaml b/aws-single-instance-resiliency/templates/ingress.yaml index 60d713a..c93b26b 100644 --- a/aws-single-instance-resiliency/templates/ingress.yaml +++ b/aws-single-instance-resiliency/templates/ingress.yaml @@ -3,10 +3,10 @@ kind: Ingress metadata: namespace: {{ .Values.namespaces.nexusNs }} name: {{ .Chart.Name }}-{{ .Chart.Version }}.{{ .Release.Name }}-ingress + {{- with .Values.ingress.annotations }} annotations: - kubernetes.io/ingress.class: alb - alb.ingress.kubernetes.io/scheme: {{ .Values.ingress.nxrmIngress.scheme }} - alb.ingress.kubernetes.io/subnets: "{{ .Values.ingress.nxrmIngress.subnets }}" + {{- toYaml . | nindent 4 }} + {{- end }} spec: rules: - http: @@ -24,10 +24,10 @@ kind: Ingress metadata: namespace: {{ .Values.namespaces.nexusNs }} name: {{ .Chart.Name }}-{{ .Chart.Version }}.{{ .Release.Name }}-ingress-nxrm-docker + {{- with .Values.ingress.dockerIngress.annotations }} annotations: - kubernetes.io/ingress.class: alb - alb.ingress.kubernetes.io/scheme: {{ .Values.ingress.dockerIngress.scheme }} - alb.ingress.kubernetes.io/subnets: {{ .Values.ingress.dockerIngress.subnets }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: rules: - http: diff --git a/aws-single-instance-resiliency/values.yaml b/aws-single-instance-resiliency/values.yaml index 6c0fe29..4191dc7 100644 --- a/aws-single-instance-resiliency/values.yaml +++ b/aws-single-instance-resiliency/values.yaml @@ -35,14 +35,16 @@ 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: - nxrmIngress: - scheme: internal - port: 9090 - subnets: subnet-000000 #comma separated list of Subnets + 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 - scheme: internal - port: 9090 - subnets: subnet-000000 #comma separated list of Subnets + 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 + port: 9090 pv: storage: 120Gi volumeMode: Filesystem