From e9ae635df5586618e18f72b60ec6cf6bab32a9ba Mon Sep 17 00:00:00 2001
From: Ken Brooks <kenneth.s.brooks@gmail.com>
Date: Tue, 19 Mar 2019 13:40:55 -0400
Subject: [PATCH 1/2] moved code from postStart to preStart

---
 stable/artifactory-ha/CHANGELOG.md                    |  3 +++
 stable/artifactory-ha/Chart.yaml                      |  2 +-
 .../templates/artifactory-primary-statefulset.yaml    | 11 ++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
index 7a2ee30ee..95e97764f 100644
--- a/stable/artifactory-ha/CHANGELOG.md
+++ b/stable/artifactory-ha/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [0.11.11] - Mar 19, 2019
+* Move the copy of bootstrap config from postStart to preStart for Primary
+
 ## [0.11.11] - Mar 18, 2019
 * Disable the option to use nginx PVC with more than one replica
 
diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
index 6d44ab113..86a3419f0 100644
--- a/stable/artifactory-ha/Chart.yaml
+++ b/stable/artifactory-ha/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: artifactory-ha
 home: https://www.jfrog.com/artifactory/
-version: 0.11.11
+version: 0.11.12
 appVersion: 6.8.7
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.
diff --git a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
index 04cb490e9..ac0dc060b 100644
--- a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
+++ b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
@@ -80,15 +80,19 @@ spec:
         imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
         securityContext:
           allowPrivilegeEscalation: false
-      {{- if .Values.artifactory.preStartCommand }}
         command:
         - '/bin/sh'
         - '-c'
         - >
+          {{- if .Values.artifactory.configMapName }}
+          echo "Copying bootstrap configs";
+          cp -Lrf /bootstrap/* /artifactory_extra_conf/;
+          {{- end }}
+          {{- if .Values.artifactory.preStartCommand }}
           echo "Running custom preStartCommand command";
           {{ .Values.artifactory.preStartCommand }};
+          {{- end }}
           /entrypoint-artifactory.sh
-      {{- end }}
         lifecycle:
           postStart:
             exec:
@@ -96,9 +100,6 @@ spec:
               - '/bin/sh'
               - '-c'
               - >
-                {{- if .Values.artifactory.configMapName }}
-                cp -Lrf /bootstrap/* /artifactory_extra_conf/;
-                {{- end }}
                 {{- if .Values.artifactory.postStartCommand }}
                 {{ .Values.artifactory.postStartCommand }}
                 {{- end }}

From 435a751b5a6bd10816b8eb106853fa187e0b87cc Mon Sep 17 00:00:00 2001
From: Ken Brooks <kenneth.s.brooks@gmail.com>
Date: Wed, 20 Mar 2019 08:17:07 -0400
Subject: [PATCH 2/2] also adding bootstrap to preStart for non-ha artifactory

---
 stable/artifactory/CHANGELOG.md                       |  3 +++
 stable/artifactory/Chart.yaml                         |  2 +-
 .../templates/artifactory-statefulset.yaml            | 11 ++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
index 16593a18f..ccdb32892 100644
--- 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.12.12] - Mar 19, 2019
+* Move the copy of bootstrap config from postStart to preStart
+
 ## [7.12.11] - Mar 18, 2019
 * Add information about nginx persistence
 
diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
index 408033872..758e259f6 100644
--- 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.12.11
+version: 7.12.12
 appVersion: 6.8.7
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.
diff --git a/stable/artifactory/templates/artifactory-statefulset.yaml b/stable/artifactory/templates/artifactory-statefulset.yaml
index 0ee2e52d7..eb4823144 100644
--- a/stable/artifactory/templates/artifactory-statefulset.yaml
+++ b/stable/artifactory/templates/artifactory-statefulset.yaml
@@ -85,15 +85,19 @@ spec:
         imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
         securityContext:
           allowPrivilegeEscalation: false
-      {{- if .Values.artifactory.preStartCommand }}
         command:
         - '/bin/sh'
         - '-c'
         - >
+          {{- if .Values.artifactory.configMapName }}
+          echo "Copying bootstrap configs";
+          cp -Lrf /bootstrap/* /artifactory_extra_conf/;
+          {{- end }}
+          {{- if .Values.artifactory.preStartCommand }}
           echo "Running custom preStartCommand command";
           {{ .Values.artifactory.preStartCommand }};
+          {{- end }}
           /entrypoint-artifactory.sh
-      {{- end }}
         lifecycle:
           postStart:
             exec:
@@ -101,9 +105,6 @@ spec:
               - '/bin/sh'
               - '-c'
               - >
-                {{- if .Values.artifactory.configMapName }}
-                cp -Lrf /bootstrap/* /artifactory_extra_conf/;
-                {{- end }}
                 {{- if .Values.artifactory.postStartCommand }}
                 {{ .Values.artifactory.postStartCommand }}
                 {{- end }}