Commit c9941895 authored by Erik Wilson's avatar Erik Wilson

Bind kubelet to all interfaces and use webhook auth

parent 305b5967
...@@ -301,7 +301,7 @@ func get(envInfo *cmds.Agent) (*config.Node, error) { ...@@ -301,7 +301,7 @@ func get(envInfo *cmds.Agent) (*config.Node, error) {
nodeConfig.AgentConfig.ClusterDomain = controlConfig.ClusterDomain nodeConfig.AgentConfig.ClusterDomain = controlConfig.ClusterDomain
nodeConfig.AgentConfig.ResolvConf = locateOrGenerateResolvConf(envInfo) nodeConfig.AgentConfig.ResolvConf = locateOrGenerateResolvConf(envInfo)
nodeConfig.AgentConfig.CACertPath = clientCA nodeConfig.AgentConfig.CACertPath = clientCA
nodeConfig.AgentConfig.ListenAddress = "127.0.0.1" nodeConfig.AgentConfig.ListenAddress = "0.0.0.0"
nodeConfig.AgentConfig.KubeConfig = kubeConfig nodeConfig.AgentConfig.KubeConfig = kubeConfig
nodeConfig.AgentConfig.RootDir = filepath.Join(envInfo.DataDir, "kubelet") nodeConfig.AgentConfig.RootDir = filepath.Join(envInfo.DataDir, "kubelet")
nodeConfig.CACerts = info.CACerts nodeConfig.CACerts = info.CACerts
......
...@@ -16,6 +16,7 @@ import ( ...@@ -16,6 +16,7 @@ import (
"k8s.io/component-base/logs" "k8s.io/component-base/logs"
app2 "k8s.io/kubernetes/cmd/kube-proxy/app" app2 "k8s.io/kubernetes/cmd/kube-proxy/app"
"k8s.io/kubernetes/cmd/kubelet/app" "k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration
...@@ -64,6 +65,7 @@ func kubelet(cfg *config.Agent) { ...@@ -64,6 +65,7 @@ func kubelet(cfg *config.Agent) {
//"cgroup-root": "/k3s", //"cgroup-root": "/k3s",
"cgroup-driver": "cgroupfs", "cgroup-driver": "cgroupfs",
"authentication-token-webhook": "true", "authentication-token-webhook": "true",
"authorization-mode": modes.ModeWebhook,
} }
if cfg.RootDir != "" { if cfg.RootDir != "" {
argsMap["root-dir"] = cfg.RootDir argsMap["root-dir"] = cfg.RootDir
......
...@@ -455,8 +455,8 @@ func genTokenCerts(config *config.Control, runtime *config.ControlRuntime) error ...@@ -455,8 +455,8 @@ func genTokenCerts(config *config.Control, runtime *config.ControlRuntime) error
return err return err
} }
if err := createClientCertKey(regen, "kubernetes", if err := createClientCertKey(regen, "kubernetes", []string{"system:masters"},
nil, &certutil.AltNames{ &certutil.AltNames{
DNSNames: []string{"kubernetes.default.svc", "kubernetes.default", "kubernetes", "localhost"}, DNSNames: []string{"kubernetes.default.svc", "kubernetes.default", "kubernetes", "localhost"},
IPs: []net.IP{apiServerServiceIP, localhostIP}, IPs: []net.IP{apiServerServiceIP, localhostIP},
}, x509KeyClientUsage, }, x509KeyClientUsage,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment