scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-04 23:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the kubelet's external types to k8s.io/kubelet

Browse Source
This commit is contained in:
Lucas Käldström
2018-09-02 14:19:38 +03:00
parent 0707b1274f
commit 15760506c2
13 changed files with 101 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kubeadm/app/componentconfigs/defaults.go
View File

@@ -24,7 +24,6 @@ import (
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config"
"k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1"
utilpointer "k8s.io/utils/pointer"
)
@@ -51,7 +50,7 @@ func DefaultKubeProxyConfiguration(internalcfg *kubeadmapi.ClusterConfiguration)
}
// Run the rest of the kube-proxy defaulting code
v1alpha1.SetDefaults_KubeProxyConfiguration(externalproxycfg)
Scheme.Default(externalproxycfg)
if internalcfg.ComponentConfigs.KubeProxy == nil {
internalcfg.ComponentConfigs.KubeProxy = &kubeproxyconfig.KubeProxyConfiguration{}
@@ -109,7 +108,7 @@ func DefaultKubeletConfiguration(internalcfg *kubeadmapi.ClusterConfiguration) {
externalkubeletcfg.HealthzBindAddress = "127.0.0.1"
externalkubeletcfg.HealthzPort = utilpointer.Int32Ptr(constants.KubeletHealthzPort)
kubeletconfigv1beta1.SetDefaults_KubeletConfiguration(externalkubeletcfg)
Scheme.Default(externalkubeletcfg)
if internalcfg.ComponentConfigs.Kubelet == nil {
internalcfg.ComponentConfigs.Kubelet = &kubeletconfig.KubeletConfiguration{}