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

Allow ingress annotations to be specified via values.yaml

Browse Source
This commit is contained in:
Olu Shiyanbade
2022-07-25 18:12:53 +01:00
parent 33d4ca303b
commit 4f28ab49dc
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
aws-single-instance-resiliency/templates/deployment.yaml
View File

@@ -6,7 +6,7 @@ metadata:
labels:
app: nxrm
spec:
replicas: 1
replicas: {{ .Values.deployment.replicaCount }}
selector:
matchLabels:
app: nxrm
@@ -74,7 +74,9 @@ spec:
-Dnexus.datastore.enabled=true -Djava.util.prefs.userRoot=${NEXUS_DATA}/javaprefs \
-Dnexus.datastore.nexus.jdbcUrl=jdbc:postgresql://${DB_HOST}:{{ .Values.deployment.container.env.nexusDBPort }}/${DB_NAME} \
-Dnexus.datastore.nexus.username=${DB_USER} \
-Dnexus.datastore.nexus.password=${DB_PASSWORD}"
-Dnexus.datastore.nexus.password=${DB_PASSWORD}
-Dnexus.datastore.clustered.enabled={{ .Values.deployment.clustered }} \
-Dnexus.jwt.enabled={{ .Values.deployment.jwtenabled }}"
volumeMounts:
- mountPath: /nxrm-secrets
name: nxrm-secrets

12
aws-single-instance-resiliency/templates/ingress.yaml
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: