Merge pull request #2 from sonatype/NEXUS-34212-Make-Ingress-Annotations-Configurable

Allow ingress annotations to be specified via values.yaml
This commit is contained in:
Olu Shiyanbade 2022-08-02 17:48:38 +01:00 committed by GitHub
commit 9c5b800da1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions

View File

@ -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:

View File

@ -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