[CORD-3026] Unify the usage of imagePullPolicy in helm-charts
Change-Id: I6135a81060eeb7f2831ce9c7207339f92017c10e
diff --git a/dhcp-server/templates/deployment.yaml b/dhcp-server/templates/deployment.yaml
index 9409a41..95a3b03 100644
--- a/dhcp-server/templates/deployment.yaml
+++ b/dhcp-server/templates/deployment.yaml
@@ -27,8 +27,8 @@
spec:
containers:
- name: dhcp-server
- image: {{ .Values.pull_docker_registry }}{{ .Values.images.dhcp_server.repository }}:{{ .Values.images.dhcp_server.tag }}
- imagePullPolicy: {{ .Values.images.dhcp_server.pullPolicy }}
+ image: {{ .Values.dhcpServerImage }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
#command: ["/bin/bash", "-", "sleep 86400"]
ports:
- containerPort: 67
diff --git a/dhcp-server/values.yaml b/dhcp-server/values.yaml
index 2984f39..cc46338 100644
--- a/dhcp-server/values.yaml
+++ b/dhcp-server/values.yaml
@@ -12,13 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-pull_docker_registry:
+# helm install dhcp-server -n dhcp-server
-images:
- dhcp_server:
- repository: networkboot/dhcpd
- tag: 'latest'
- pullPolicy: 'IfNotPresent'
+dhcpServerImage: 'networkboot/dhcpd:latest'
+imagePullPolicy: IfNotPresent
config: |