From b40f7162b593360e48d0ce81e47d38f51b865726 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Sat, 12 May 2018 12:44:23 -0500 Subject: [PATCH] Helm-Toolkit: Resolve final deltas between OSH and OSH-Infra This PS removes the remaining deltas between OSH and OSH-Infra Change-Id: Ibe0c561991d23c1b0a4a24a6a1529d5ae255a779 --- helm-toolkit/templates/snippets/_image.tpl | 3 +++ .../snippets/_kubernetes_entrypoint_init_container.tpl | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/helm-toolkit/templates/snippets/_image.tpl b/helm-toolkit/templates/snippets/_image.tpl index 34b077f078..d2d8e47eb6 100644 --- a/helm-toolkit/templates/snippets/_image.tpl +++ b/helm-toolkit/templates/snippets/_image.tpl @@ -1,9 +1,12 @@ {{/* Copyright 2017 The Openstack-Helm Authors. + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl b/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl index af0eea1751..79dd63a544 100644 --- a/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl +++ b/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl @@ -38,7 +38,6 @@ limitations under the License. - name: init {{ tuple $envAll "dep_check" | include "helm-toolkit.snippets.image" | indent 2 }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} env: - name: POD_NAME valueFrom: @@ -66,9 +65,9 @@ limitations under the License. {{- end -}} {{- end }} - name: DEPENDENCY_DAEMONSET - value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.daemonset }}" + value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.daemonset }}" - name: DEPENDENCY_CONTAINER - value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.container }}" + value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.container }}" - name: DEPENDENCY_POD_JSON value: {{ if $deps.pod }}{{ toJson $deps.pod | quote }}{{ else }}""{{ end }} - name: COMMAND