From 8c52be3ddea30e26dbf145e9f1a0b5aa05ec68bb Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Fri, 25 Sep 2020 20:08:06 -0500
Subject: [PATCH] Remove /hyperkube prefix

The /hyperkube prefix isn't required and causes problems when using
non-hyperkube images elsewhere.

Change-Id: Ie9281b07e3be0eedbe86be726f907f68461e23b2
---
 charts/apiserver-webhook/values.yaml  | 1 -
 charts/apiserver/values.yaml          | 1 -
 charts/controller_manager/values.yaml | 1 -
 charts/proxy/values.yaml              | 1 -
 charts/scheduler/values.yaml          | 1 -
 5 files changed, 5 deletions(-)

diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml
index 1233d811..211e1e8b 100644
--- a/charts/apiserver-webhook/values.yaml
+++ b/charts/apiserver-webhook/values.yaml
@@ -39,7 +39,6 @@ labels:
     node_selector_value: enabled
 
 command_prefix:
-  - /hyperkube
   - kube-apiserver
   - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
 
diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml
index 808be191..f8364306 100644
--- a/charts/apiserver/values.yaml
+++ b/charts/apiserver/values.yaml
@@ -19,7 +19,6 @@ release_group: null
 const:
   encryption_annotation: "airshipit.org/encryption_key"
   command_prefix:
-    - /hyperkube
     - kube-apiserver
     - --advertise-address=$(POD_IP)
     - --allow-privileged=true
diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml
index 4475a96e..660383be 100644
--- a/charts/controller_manager/values.yaml
+++ b/charts/controller_manager/values.yaml
@@ -54,7 +54,6 @@ controller_manager:
     log_level: 5
 
 command_prefix:
-  - /hyperkube
   - kube-controller-manager
   - --cluster-cidr=10.97.0.0/16
   - --node-monitor-period=5s
diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml
index 268e54c2..1b1341bb 100644
--- a/charts/proxy/values.yaml
+++ b/charts/proxy/values.yaml
@@ -78,7 +78,6 @@ proxy:
     log_level: 5
 
 command_prefix:
-  - /hyperkube
   - kube-proxy
   - --proxy-mode=iptables
   - --cluster-cidr=10.97.0.0/16
diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml
index b18ff5ef..efffce68 100644
--- a/charts/scheduler/values.yaml
+++ b/charts/scheduler/values.yaml
@@ -98,7 +98,6 @@ service:
   name: kubernetes-scheduler
 
 command_prefix:
-  - /hyperkube
   - kube-scheduler
   # TaintNodesByCondition feature is unconditionally enabled and the
   # corresponding --feature-gates flags have been removed in 1.18.x