diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index c721af0521f..1bd878737de 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -361,14 +361,12 @@ const ( // KubeletPort is the default port for the kubelet server on each host machine. // May be overridden by a flag at startup. KubeletPort = 10250 - // InsecureSchedulerPort is the default port for the scheduler status server. + // KubeSchedulerPort is the default port for the scheduler status server. // May be overridden by a flag at startup. - // Deprecated: use the secure KubeSchedulerPort instead. - InsecureSchedulerPort = 10251 - // InsecureKubeControllerManagerPort is the default port for the controller manager status server. + KubeSchedulerPort = 10259 + // KubeControllerManagerPort is the default port for the controller manager status server. // May be overridden by a flag at startup. - // Deprecated: use the secure KubeControllerManagerPort instead. - InsecureKubeControllerManagerPort = 10252 + KubeControllerManagerPort = 10257 // Mode* constants were copied from pkg/kubeapiserver/authorizer/modes // to avoid kubeadm dependency on the internal module diff --git a/cmd/kubeadm/app/phases/controlplane/manifests.go b/cmd/kubeadm/app/phases/controlplane/manifests.go index de2ebc8e764..424df2798fc 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests.go @@ -66,7 +66,7 @@ func GetStaticPodSpecs(cfg *kubeadmapi.ClusterConfiguration, endpoint *kubeadmap ImagePullPolicy: v1.PullIfNotPresent, Command: getControllerManagerCommand(cfg), VolumeMounts: staticpodutil.VolumeMountMapToSlice(mounts.GetVolumeMounts(kubeadmconstants.KubeControllerManager)), - LivenessProbe: staticpodutil.LivenessProbe(staticpodutil.GetControllerManagerProbeAddress(cfg), "/healthz", kubeadmconstants.InsecureKubeControllerManagerPort, v1.URISchemeHTTP), + LivenessProbe: staticpodutil.LivenessProbe(staticpodutil.GetControllerManagerProbeAddress(cfg), "/healthz", kubeadmconstants.KubeControllerManagerPort, v1.URISchemeHTTPS), Resources: staticpodutil.ComponentResources("200m"), Env: kubeadmutil.GetProxyEnvVars(), }, mounts.GetVolumes(kubeadmconstants.KubeControllerManager)), @@ -76,7 +76,7 @@ func GetStaticPodSpecs(cfg *kubeadmapi.ClusterConfiguration, endpoint *kubeadmap ImagePullPolicy: v1.PullIfNotPresent, Command: getSchedulerCommand(cfg), VolumeMounts: staticpodutil.VolumeMountMapToSlice(mounts.GetVolumeMounts(kubeadmconstants.KubeScheduler)), - LivenessProbe: staticpodutil.LivenessProbe(staticpodutil.GetSchedulerProbeAddress(cfg), "/healthz", kubeadmconstants.InsecureSchedulerPort, v1.URISchemeHTTP), + LivenessProbe: staticpodutil.LivenessProbe(staticpodutil.GetSchedulerProbeAddress(cfg), "/healthz", kubeadmconstants.KubeSchedulerPort, v1.URISchemeHTTPS), Resources: staticpodutil.ComponentResources("100m"), Env: kubeadmutil.GetProxyEnvVars(), }, mounts.GetVolumes(kubeadmconstants.KubeScheduler)), diff --git a/cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go b/cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go index 30c692c5ee7..2e1ef9be4ad 100644 --- a/cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go +++ b/cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go @@ -230,8 +230,8 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 10252 - scheme: HTTP + port: 10257 + scheme: HTTPS initialDelaySeconds: 15 timeoutSeconds: 15 name: kube-controller-manager @@ -307,8 +307,8 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 10252 - scheme: HTTP + port: 10257 + scheme: HTTPS initialDelaySeconds: 15 timeoutSeconds: 15 name: kube-controller-manager @@ -379,8 +379,8 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 10251 - scheme: HTTP + port: 10259 + scheme: HTTPS initialDelaySeconds: 15 timeoutSeconds: 15 name: kube-scheduler @@ -431,8 +431,8 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 10251 - scheme: HTTP + port: 10259 + scheme: HTTPS initialDelaySeconds: 15 timeoutSeconds: 15 name: kube-scheduler diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index ca4466023b5..ee561c29f17 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -886,8 +886,8 @@ func RunInitNodeChecks(execer utilsexec.Interface, cfg *kubeadmapi.InitConfigura KubernetesVersionCheck{KubernetesVersion: cfg.KubernetesVersion, KubeadmVersion: kubeadmversion.Get().GitVersion}, FirewalldCheck{ports: []int{int(cfg.LocalAPIEndpoint.BindPort), kubeadmconstants.KubeletPort}}, PortOpenCheck{port: int(cfg.LocalAPIEndpoint.BindPort)}, - PortOpenCheck{port: kubeadmconstants.InsecureSchedulerPort}, - PortOpenCheck{port: kubeadmconstants.InsecureKubeControllerManagerPort}, + PortOpenCheck{port: kubeadmconstants.KubeSchedulerPort}, + PortOpenCheck{port: kubeadmconstants.KubeControllerManagerPort}, FileAvailableCheck{Path: kubeadmconstants.GetStaticPodFilepath(kubeadmconstants.KubeAPIServer, manifestsDir)}, FileAvailableCheck{Path: kubeadmconstants.GetStaticPodFilepath(kubeadmconstants.KubeControllerManager, manifestsDir)}, FileAvailableCheck{Path: kubeadmconstants.GetStaticPodFilepath(kubeadmconstants.KubeScheduler, manifestsDir)},