Merge pull request #62 from kingdonb/pr-61-rebased

feat(builder): add git_lock_timeout in values.yml

Author: Cryptophobia

charts/builder/templates/builder-deployment.yaml

@@ -57,9 +57,12 @@ spec:
               value: "{{ .Values.global.registry_location }}"
             - name: "DEIS_REGISTRY_SECRET_PREFIX"
               value: "{{ .Values.global.secret_prefix }}"
-            # Set GIT_LOCK_TIMEOUT to number of minutes you want to wait to git push again to the same repository
             - name: "GIT_LOCK_TIMEOUT"
+{{- if (.Values.git_lock_timeout) }}
+              value: "{{ .Values.git_lock_timeout }}"
+{{- else }}
               value: "10"
+{{- end }}
             - name: "SLUGBUILDER_IMAGE_NAME"
               valueFrom:
                 configMapKeyRef:

charts/builder/values.yaml

@@ -4,6 +4,7 @@ docker_tag: canary
 # limits_cpu: "100m"
 # limits_memory: "50Mi"
 # builder_pod_node_selector: "disk:ssd"
+# git_lock_timeout: 10 # number of minutes you want to wait to git push again to the same repository (default 10)
 
 global:
   # Experimental feature to toggle using kubernetes ingress instead of the Deis router.