Update Helm chart to use 1.2.0

Author: code-asher

helm/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.1.0"
+appVersion: "v1.2.0"

helm/templates/deployment.yaml

@@ -25,10 +25,12 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ include "code-marketplace.serviceAccountName" . }}
+      {{- if not .Values.persistence.artifactory.enabled }}
       volumes:
         - name: extensions
           persistentVolumeClaim:
             claimName: {{ include "code-marketplace.fullname" . }}
+      {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
@@ -37,18 +39,35 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- if .Values.persistence.artifactory.enabled }}
+          env:
+            - name: "ARTIFACTORY_TOKEN"
+              valueFrom:
+                secretKeyRef:
+                  name: artifactory
+                  key: token
+          {{- end }}
           ports:
             - name: http
               containerPort: 80
               protocol: TCP
           args:
             - --address
             - 0.0.0.0:80
+            {{- if .Values.persistence.artifactory.enabled }}
+            - --artifactory
+            - {{ .Values.persistence.artifactory.uri }}
+            - --repo
+            - {{ .Values.persistence.artifactory.repo }}
+            {{- else }}
             - --extensions-dir
             - /extensions
+            {{- end }}
+          {{- if not .Values.persistence.artifactory.enabled }}
           volumeMounts:
             - name: extensions
               mountPath: /extensions
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /healthz

helm/templates/pvc.yaml

@@ -1,3 +1,4 @@
+{{- if not .Values.persistence.artifactory.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -9,3 +10,4 @@ spec:
     requests:
       storage: {{ .Values.persistence.size | quote }}
   storageClassName: standard
+{{- end }}

helm/values.yaml

@@ -84,4 +84,11 @@ tolerations: []
 affinity: {}
 
 persistence:
+  artifactory:
+    # Use Artifactory for extensions instead of a persistent volume. Make sure
+    # to create an `artifactory` secret with a `token` key.
+    enabled: false
+    uri: https://artifactory.server/artifactory
+    repo: extensions
+  # Size is ignored when using Artifactory.
   size: 100Gi