From 135e6ff8918ead7e935edc72d162320cff9d84a7 Mon Sep 17 00:00:00 2001
From: Samuel Pilla <sp516w@att.com>
Date: Tue, 15 Oct 2019 01:06:38 -0500
Subject: [PATCH] Changes supporting k8s 1.16

Change-Id: I625753bc9ef5e28d57f320c440aef3abb246704d
---
 global/profiles/genesis.yaml                              | 2 +-
 global/software/charts/kubernetes/core/apiserver.yaml     | 8 ++++----
 .../charts/kubernetes/core/controller-manager.yaml        | 3 ++-
 .../charts/kubernetes/proxy/kubernetes-proxy.yaml         | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/global/profiles/genesis.yaml b/global/profiles/genesis.yaml
index 9fa2075cf..e3a200ca5 100644
--- a/global/profiles/genesis.yaml
+++ b/global/profiles/genesis.yaml
@@ -135,7 +135,7 @@ data:
       mode: 0444
       content: |
         kind: AdmissionConfiguration
-        apiVersion: apiserver.k8s.io/v1alpha1
+        apiVersion: apiserver.k8s.io/v1
         plugins:
           - name: EventRateLimit
             path: eventconfig.yaml
diff --git a/global/software/charts/kubernetes/core/apiserver.yaml b/global/software/charts/kubernetes/core/apiserver.yaml
index 0e8d63a03..3bd9e9209 100644
--- a/global/software/charts/kubernetes/core/apiserver.yaml
+++ b/global/software/charts/kubernetes/core/apiserver.yaml
@@ -147,10 +147,10 @@ data:
       encryption_provider:
         file: encryption_provider.yaml
         command_options:
-          - '--experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml'
+          - '--encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml'
         content:
-          kind: EncryptionConfig
-          apiVersion: v1
+          kind: EncryptionConfiguration
+          apiVersion: apiserver.config.k8s.io/v1
       eventconfig:
         file: eventconfig.yaml
         content:
@@ -167,7 +167,7 @@ data:
           - '--admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml'
         content:
           kind: AdmissionConfiguration
-          apiVersion: apiserver.k8s.io/v1alpha1
+          apiVersion: apiserver.k8s.io/v1
           plugins:
           - name: EventRateLimit
             path: eventconfig.yaml
diff --git a/global/software/charts/kubernetes/core/controller-manager.yaml b/global/software/charts/kubernetes/core/controller-manager.yaml
index 74a05527a..4c714e8dd 100644
--- a/global/software/charts/kubernetes/core/controller-manager.yaml
+++ b/global/software/charts/kubernetes/core/controller-manager.yaml
@@ -103,7 +103,8 @@ data:
             release_group: airship-kubernetes-controller-manager
   values:
     command_prefix:
-      - /controller-manager
+      - /hyperkube
+      - kube-controller-manager
       - --cluster-cidr=SUB_POD_CIDR
       - --service-cluster-ip-range=SUB_SERVICE_CIDR
       - --node-monitor-period=5s
diff --git a/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml b/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml
index 3ba13e3a8..5e72aec94 100644
--- a/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml
+++ b/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml
@@ -59,7 +59,8 @@ data:
             release_group: airship-kubernetes-proxy
   values:
     command_prefix:
-      - /proxy
+      - /hyperkube
+      - kube-proxy
       - --cluster-cidr=POD_CIDR
       - --proxy-mode=iptables
     kube_service: