summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <adetalhouet89@gmail.com>2019-03-13 14:04:42 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-13 14:04:42 +0000
commit623e0f619da41a1cd4de18b0ae61b32e1408eff0 (patch)
tree9f81534b87211401a592abac2a9d5f0d21bd975d
parent6c68a4e53b26d78ee849af353aaf160fb4d5ed5d (diff)
parent9be63471a1f10757fa1537c8a8dc98163979fb7e (diff)
Merge "Support execution control of SDC Workflow init"
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml2
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/values.yaml2
3 files changed, 6 insertions, 0 deletions
diff --git a/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml
index 50062a1b9b..fc1538f87a 100644
--- a/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml
@@ -32,6 +32,7 @@ spec:
release: {{ .Release.Name }}
spec:
initContainers:
+ {{- if .Values.global.initJob.enabled }}
- name: {{ include "common.name" . }}-job-completion
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}"
@@ -46,6 +47,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
+ {{ end }}
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
diff --git a/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml
index 2b142533c7..98de4760bf 100644
--- a/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+{{ if .Values.global.initJob.enabled }}
apiVersion: batch/v1
kind: Job
metadata:
@@ -66,3 +67,4 @@ spec:
secretKeyRef: {name: {{ .Release.Name }}-sdc-cs-secrets, key: sdc_password}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
+{{ end }} \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-wfd-be/values.yaml b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
index 1e0ea51764..9d1fbe65cb 100644
--- a/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
@@ -22,6 +22,8 @@ global:
readinessImage: readiness-check:2.0.0
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
+ initJob:
+ enabled: true
#################################################################
# Application configuration defaults.