Merge pull request jfrog#144 from c4po/issue-34

fix existingClaim for artifactory
k · Dec 12, 2018 · 16e1fa2 · 16e1fa2
2 parents 8687a91 + e5e19e8
commit 16e1fa2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [7.7.11] - Dec 10, 2018
+* Fix issue when using existing claim
+
 ## [7.7.10] - Dec 5, 2018
 * Remove Distribution certificates creation.
 

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: artifactory
 home: https://www.jfrog.com/artifactory/
-version: 7.7.10
+version: 7.7.11
 appVersion: 6.5.9
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.

diff --git a/stable/artifactory/README.md b/stable/artifactory/README.md
@@ -235,6 +235,7 @@ The following table lists the configurable parameters of the artifactory chart a
 | `artifactory.readinessProbe.failureThreshold`    | Minimum consecutive failures for the probe to be considered failed after having succeeded.   | 10 |
 | `artifactory.persistence.mountPath` | Artifactory persistence volume mount path | `"/var/opt/jfrog/artifactory"`         |
 | `artifactory.persistence.enabled` | Artifactory persistence volume enabled | `true`                                      |
+| `artifactory.persistence.existingClaim` | Artifactory persistence volume claim name |                                       |
 | `artifactory.persistence.accessMode` | Artifactory persistence volume access mode | `ReadWriteOnce`                      |
 | `artifactory.persistence.size` | Artifactory persistence or local volume size | `20Gi`                                   |
 | `artifactory.resources.requests.memory` | Artifactory initial memory request                  |                          |

diff --git a/stable/artifactory/templates/artifactory-statefulset.yaml b/stable/artifactory/templates/artifactory-statefulset.yaml
@@ -242,6 +242,11 @@ spec:
 {{ toYaml . | indent 8 }}
     {{- end }}
       volumes:
+      {{- if and .Values.artifactory.persistence.enabled .Values.artifactory.persistence.existingClaim }}
+      - name: artifactory-volume
+        persistentVolumeClaim:
+          claimName: {{ .Values.artifactory.persistence.existingClaim }}
+      {{- end }}
       {{- if .Values.artifactory.replicator.enabled }}
       - name: replicator-config
         configMap:
@@ -257,16 +262,11 @@ spec:
         secret:
           secretName: {{ .Values.artifactory.license.secret }}
       {{- end }}
-      {{- if .Values.artifactory.persistence.enabled }}
+      {{- if and .Values.artifactory.persistence.enabled (not .Values.artifactory.persistence.existingClaim) }}
   volumeClaimTemplates:
   - metadata:
       name: artifactory-volume
     spec:
-    {{- if .Values.artifactory.persistence.existingClaim }}
-      selector:
-        matchLabels:
-          app: {{ template "artifactory.name" . }}
-    {{- else }}
       {{- if .Values.artifactory.persistence.storageClass }}
       {{- if (eq "-" .Values.artifactory.persistence.storageClass) }}
       storageClassName: ""
@@ -278,8 +278,8 @@ spec:
       resources:
         requests:
           storage: {{ .Values.artifactory.persistence.size }}
-    {{- end }}
-      {{- else }}
+      {{- end }}
+      {{- if not .Values.artifactory.persistence.enabled }}
       - name: artifactory-volume
         emptyDir:
           sizeLimit: {{ .Values.artifactory.persistence.size }}