From 7f7e83a4d9a62005dbebe89bb5af26b295931f1f Mon Sep 17 00:00:00 2001 From: Samuel Liu Date: Wed, 16 Jun 2021 23:06:00 +0800 Subject: [PATCH] fix local-path-provisioner helper image repo (#7703) --- .../templates/local-path-storage-cm.yml.j2 | 2 +- .../templates/local-path-storage-deployment.yml.j2 | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-cm.yml.j2 b/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-cm.yml.j2 index 0b3b9d201..857431212 100644 --- a/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-cm.yml.j2 +++ b/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-cm.yml.j2 @@ -56,4 +56,4 @@ data: spec: containers: - name: helper-pod - image: busybox + image: {% if local_path_provisioner_helper_image_repo is defined %}{{ local_path_provisioner_helper_image_repo }}:{{ local_path_provisioner_helper_image_tag }}{% else %}busybox{% endif %} diff --git a/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-deployment.yml.j2 b/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-deployment.yml.j2 index b50d73253..6922691cf 100644 --- a/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-deployment.yml.j2 +++ b/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-deployment.yml.j2 @@ -26,10 +26,6 @@ spec: - /etc/config/config.json {% if local_path_provisioner_debug|default(false) %} - --debug -{% endif %} -{% if local_path_provisioner_helper_image_repo is defined %} - - --helper-image - - {{local_path_provisioner_helper_image_repo}}:{{local_path_provisioner_helper_image_tag}} {% endif %} volumeMounts: - name: config-volume