Skip to content

[release-3.10] Honor --kubelet-preferred-address-types #20183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jul 4, 2018
Merged

[release-3.10] Honor --kubelet-preferred-address-types #20183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pkg/cmd/server/kubernetes/master/master_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ import (
"github.com/openshift/origin/pkg/cmd/flagtypes"
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
"github.com/openshift/origin/pkg/cmd/server/election"
nodeclient "github.com/openshift/origin/pkg/cmd/server/kubernetes/node/client"
cmdutil "github.com/openshift/origin/pkg/cmd/util"
cmdflags "github.com/openshift/origin/pkg/cmd/util/flags"
oauthutil "github.com/openshift/origin/pkg/oauth/util"
Expand Down Expand Up @@ -173,6 +172,12 @@ func BuildKubeAPIserverOptions(masterConfig configapi.MasterConfig) (*kapiserver
}

server.KubeletConfig.ReadOnlyPort = 0
server.KubeletConfig.Port = masterConfig.KubeletClientInfo.Port
server.KubeletConfig.PreferredAddressTypes = []string{"Hostname", "InternalIP", "ExternalIP"}
server.KubeletConfig.EnableHttps = true
server.KubeletConfig.CAFile = masterConfig.KubeletClientInfo.CA
server.KubeletConfig.CertFile = masterConfig.KubeletClientInfo.ClientCert.CertFile
server.KubeletConfig.KeyFile = masterConfig.KubeletClientInfo.ClientCert.KeyFile

server.ProxyClientCertFile = masterConfig.AggregatorConfig.ProxyClientInfo.CertFile
server.ProxyClientKeyFile = masterConfig.AggregatorConfig.ProxyClientInfo.KeyFile
Expand Down Expand Up @@ -505,7 +510,7 @@ func buildKubeApiserverConfig(

EventTTL: apiserverOptions.EventTTL,

KubeletClientConfig: *nodeclient.GetKubeletClientConfig(masterConfig),
KubeletClientConfig: apiserverOptions.KubeletConfig,

EnableLogsSupport: false, // don't expose server logs
EnableCoreControllers: true,
Expand Down
31 changes: 0 additions & 31 deletions pkg/cmd/server/kubernetes/node/client/client.go
View file
Open in desktop

This file was deleted.