Merge "Update kubernetes config for 1.15 features."

puppet-manifests/src/modules/platform/manifests/kubernetes.pp

@@ -24,7 +24,7 @@ class platform::kubernetes::params (
 class platform::kubernetes::cgroup::params (
   $cgroup_root = '/sys/fs/cgroup',
   $cgroup_name = 'k8s-infra',
-  $controllers = ['cpuset', 'cpu', 'cpuacct', 'memory', 'systemd'],
+  $controllers = ['cpuset', 'cpu', 'cpuacct', 'memory', 'systemd', 'pids'],
 ) {}
 
 class platform::kubernetes::cgroup
@@ -48,7 +48,7 @@ class platform::kubernetes::cgroup
   # NOTE: The kubernetes cgroup_manager_linux func Exists() checks that
   # specific subsystem cgroup paths actually exist on the system. The
   # particular cgroup cgroupRoot must exist for the following controllers:
-  # "cpu", "cpuacct", "cpuset", "memory", "systemd".
+  # "cpu", "cpuacct", "cpuset", "memory", "systemd", "pids".
   # Reference:
   #  https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/cm/cgroup_manager_linux.go
   # systemd automatically mounts cgroups and controllers, so don't need

puppet-manifests/src/modules/platform/templates/kubeadm.yaml.erb

@@ -1,11 +1,10 @@
-apiVersion: kubeadm.k8s.io/v1alpha3
+apiVersion: kubeadm.k8s.io/v1beta2
 kind: InitConfiguration
-apiEndpoint:
+localAPIEndpoint:
   advertiseAddress: <%= @apiserver_advertise_address %>
 ---
-apiVersion: kubeadm.k8s.io/v1beta1
+apiVersion: kubeadm.k8s.io/v1beta2
 kind: ClusterConfiguration
-kubernetesVersion: 1.13.5
 
 apiServer:
   certSANs:
@@ -29,6 +28,7 @@ etcd:
     endpoints:
     - <%= @etcd_endpoint %>
 imageRepository: "<%= @k8s_registry %>"
+kubernetesVersion: v1.15.3
 networking:
   dnsDomain: <%= @service_domain %>
   podSubnet: <%= @pod_network_cidr %>
@@ -36,9 +36,6 @@ networking:
 ---
 kind: KubeletConfiguration
 apiVersion: kubelet.config.k8s.io/v1beta1
-# Workaround for the following issue:
-# https://github.com/kubernetes/kubernetes/issues/74412
-configMapAndSecretChangeDetectionStrategy: Cache
 nodeStatusUpdateFrequency: "4s"
 failSwapOn: false
 cgroupRoot: "/k8s-infra"