File tree Expand file tree Collapse file tree 1 file changed +11
-1
lines changed
cmd/kubeadm/app/cmd/phases/init Expand file tree Collapse file tree 1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ import (
26
26
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow"
27
27
cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util"
28
28
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
29
+ "k8s.io/kubernetes/cmd/kubeadm/app/features"
29
30
kubeconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig"
30
31
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
31
32
)
@@ -157,7 +158,16 @@ func runKubeConfigFile(kubeConfigFileName string) func(workflow.RunData) error {
157
158
cfg .CertificatesDir = data .CertificateWriteDir ()
158
159
defer func () { cfg .CertificatesDir = data .CertificateDir () }()
159
160
161
+ initConfiguration := data .Cfg ().DeepCopy ()
162
+
163
+ if features .Enabled (cfg .FeatureGates , features .ControlPlaneKubeletLocalMode ) {
164
+ if kubeConfigFileName == kubeadmconstants .KubeletKubeConfigFileName {
165
+ // Unset the ControlPlaneEndpoint so the creation falls back to the LocalAPIEndpoint for the kubelet's kubeconfig.
166
+ initConfiguration .ControlPlaneEndpoint = ""
167
+ }
168
+ }
169
+
160
170
// creates the KubeConfig file (or use existing)
161
- return kubeconfigphase .CreateKubeConfigFile (kubeConfigFileName , data .KubeConfigDir (), data . Cfg () )
171
+ return kubeconfigphase .CreateKubeConfigFile (kubeConfigFileName , data .KubeConfigDir (), initConfiguration )
162
172
}
163
173
}
You can’t perform that action at this time.
0 commit comments