Merge pull request jfrog#254 from zendril/copy-bootstrap-during-prestart

copy bootstrap during preStart instead of postStart
Zman94 · Mar 20, 2019 · 67ba29a · 67ba29a
2 parents 6f4483c + 483bfc5
commit 67ba29a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git 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.13] - Mar 19, 2019
+* Move the copy of bootstrap config from postStart to preStart for Primary
+
 ## [0.11.12] - Mar 19, 2019
 * Fix existingClaim example
 

diff --git 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.12
+version: 0.11.13
 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
@@ -80,25 +80,26 @@ 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:
               command:
               - '/bin/sh'
               - '-c'
               - >
-                {{- if .Values.artifactory.configMapName }}
-                cp -Lrf /bootstrap/* /artifactory_extra_conf/;
-                {{- end }}
                 {{- if .Values.artifactory.postStartCommand }}
                 {{ .Values.artifactory.postStartCommand }}
                 {{- end }}

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.12.13] - Mar 19, 2019
+* Move the copy of bootstrap config from postStart to preStart
+
 ## [7.12.12] - Mar 19, 2019
 * Fix existingClaim example
 

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.12.12
+version: 7.12.13
 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
@@ -85,25 +85,26 @@ 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:
               command:
               - '/bin/sh'
               - '-c'
               - >
-                {{- if .Values.artifactory.configMapName }}
-                cp -Lrf /bootstrap/* /artifactory_extra_conf/;
-                {{- end }}
                 {{- if .Values.artifactory.postStartCommand }}
                 {{ .Values.artifactory.postStartCommand }}
                 {{- end }}