From 4f28ab49dcc02713fdb53f24ae0d087023bcf30e Mon Sep 17 00:00:00 2001
From: Olu Shiyanbade <oshiyanbade@sonatype.com>
Date: Mon, 25 Jul 2022 18:12:53 +0100
Subject: [PATCH] Allow ingress annotations to be specified via values.yaml

---
 .../templates/deployment.yaml                  |  6 ++++--
 .../templates/ingress.yaml                     | 12 ++++++------
 aws-single-instance-resiliency/values.yaml     | 18 +++++++++++-------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/aws-single-instance-resiliency/templates/deployment.yaml b/aws-single-instance-resiliency/templates/deployment.yaml
index e17baa0..9bc5063 100644
--- a/aws-single-instance-resiliency/templates/deployment.yaml
+++ b/aws-single-instance-resiliency/templates/deployment.yaml
@@ -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
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..5c1bb35 100644
--- a/aws-single-instance-resiliency/values.yaml
+++ b/aws-single-instance-resiliency/values.yaml
@@ -6,6 +6,8 @@ deployment:
    name: nxrm.deployment
    clusterName: nxrm-nexus
    logsRegion: us-east-1
+   clustered: false
+   jwtenabled: false
    initContainer:
         image:
           repository: busybox
@@ -35,14 +37,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