Updating the Artifactory (non-ha version) to include the master key, …

…and allowing the ingress default backend to be used or not
JMaltat · Oct 11, 2018 · b44f8e3 · b44f8e3
1 parent e028860
commit b44f8e3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/stable/artifactory/templates/artifactory-secrets.yaml b/stable/artifactory/templates/artifactory-secrets.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.database.password }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -10,5 +9,7 @@ metadata:
     release: {{ .Release.Name }}
 type: Opaque
 data:
+  {{- if .Values.database.password }}
   db-password: {{ .Values.database.password | b64enc | quote }}
-{{- end }}
+  {{- end }}
+  master-key: {{ .Values.artifactory.masterKey | b64enc | quote }}
diff --git a/stable/artifactory/templates/artifactory-statefulset.yaml b/stable/artifactory/templates/artifactory-statefulset.yaml
@@ -115,6 +115,11 @@ spec:
               name: {{ template "artifactory.fullname" . }}
               key: db-password
       {{- end }}
+        - name: ARTIFACTORY_MASTER_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ template "artifactory.fullname" . }}
+              key: master-key
         - name: EXTRA_JAVA_OPTIONS
           value: "
       {{- if .Values.artifactory.javaOpts.other }}

diff --git a/stable/artifactory/templates/ingress.yaml b/stable/artifactory/templates/ingress.yaml
@@ -15,9 +15,12 @@ metadata:
       {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
+  {{- if .Values.ingress.defaultBackend.enabled }}
   backend:
     serviceName: {{ $serviceName }}
     servicePort: {{ $servicePort }}
+  {{- end -}}
+
 {{- if .Values.ingress.hosts }}
   rules:
   {{- range $host := .Values.ingress.hosts }}

diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml
@@ -39,6 +39,8 @@ serviceAccount:
 
 ingress:
   enabled: false
+  defaultBackend:
+    enabled: true
   # Used to create an Ingress record.
   hosts:
     - artifactory.domain.example
@@ -70,7 +72,7 @@ artifactory:
     dataKey:
   ## Create configMap with artifactory.config.import.xml and security.import.xml and pass name of configMap in following parameter
   configMapName:
-
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
   ## Extra postStart command to install JDBC driver for MySql/MariaDb/Oracle
   # postStartCommand: "curl -L -o /opt/jfrog/artifactory/tomcat/lib/mysql-connector-java-5.1.41.jar https://jcenter.bintray.com/mysql/mysql-connector-java/5.1.41/mysql-connector-java-5.1.41.jar && chown 1030:1030 /opt/jfrog/artifactory/tomcat/lib/mysql-connector-java-5.1.41.jar"