nhyatt/nxrm3-helm-repository
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
aws-single-instance-resiliency/templates/ingress.yaml
View File

@ -3,10 +3,10 @@ kind: Ingress
metadata: metadata:
namespace: {{ .Values.namespaces.nexusNs }} namespace: {{ .Values.namespaces.nexusNs }}
name: {{ .Chart.Name }}-{{ .Chart.Version }}.{{ .Release.Name }}-ingress name: {{ .Chart.Name }}-{{ .Chart.Version }}.{{ .Release.Name }}-ingress
{{- with .Values.ingress.annotations }}
annotations: annotations:
kubernetes.io/ingress.class: alb {{- toYaml . | nindent 4 }}
alb.ingress.kubernetes.io/scheme: {{ .Values.ingress.nxrmIngress.scheme }} {{- end }}
alb.ingress.kubernetes.io/subnets: "{{ .Values.ingress.nxrmIngress.subnets }}"
spec: spec:
rules: rules:
- http: - http:
@ -24,10 +24,10 @@ kind: Ingress
metadata: metadata:
namespace: {{ .Values.namespaces.nexusNs }} namespace: {{ .Values.namespaces.nexusNs }}
name: {{ .Chart.Name }}-{{ .Chart.Version }}.{{ .Release.Name }}-ingress-nxrm-docker name: {{ .Chart.Name }}-{{ .Chart.Version }}.{{ .Release.Name }}-ingress-nxrm-docker
{{- with .Values.ingress.dockerIngress.annotations }}
annotations: annotations:
kubernetes.io/ingress.class: alb {{- toYaml . | nindent 4 }}
alb.ingress.kubernetes.io/scheme: {{ .Values.ingress.dockerIngress.scheme }} {{- end }}
alb.ingress.kubernetes.io/subnets: {{ .Values.ingress.dockerIngress.subnets }}
spec: spec:
rules: rules:
- http: - http:

16
aws-single-instance-resiliency/values.yaml
View File

@ -35,14 +35,16 @@ serviceAccount:
name: nexus-repository-deployment-sa #This SA is created as part of steps under "AWS Secrets Manager" 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 role: arn:aws:iam::000000000000:role/nxrm-nexus-role #Role with secretsmanager permissions
ingress: ingress:
nxrmIngress: annotations:
scheme: internal kubernetes.io/ingress.class: alb
port: 9090 alb.ingress.kubernetes.io/scheme: internal # scheme
subnets: subnet-000000 #comma separated list of Subnets alb.ingress.kubernetes.io/subnets: subnet-1,subnet-2 #comma separated list of subnet ids
dockerIngress: #Ingress for Docker Connector dockerIngress: #Ingress for Docker Connector
scheme: internal annotations:
port: 9090 kubernetes.io/ingress.class: alb
subnets: subnet-000000 #comma separated list of Subnets 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: pv:
storage: 120Gi storage: 120Gi
volumeMode: Filesystem volumeMode: Filesystem