1
0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00

pkg/asset/kubeconfig: use kube-ca in kubelet kubeconfig

The kubelet kubeconfig now requires kube-ca CA data, not root CA.
This commit is contained in:
Matt Rogers
2019-02-08 16:11:31 -05:00
parent 4ccb47cc6f
commit a4d952ecde

View File

@@ -22,7 +22,7 @@ var _ asset.WritableAsset = (*Kubelet)(nil)
// Dependencies returns the dependency of the kubeconfig.
func (k *Kubelet) Dependencies() []asset.Asset {
return []asset.Asset{
&tls.RootCA{},
&tls.KubeCA{},
&tls.KubeletCertKey{},
&installconfig.InstallConfig{},
}
@@ -30,13 +30,13 @@ func (k *Kubelet) Dependencies() []asset.Asset {
// Generate generates the kubeconfig.
func (k *Kubelet) Generate(parents asset.Parents) error {
rootCA := &tls.RootCA{}
kubeCA := &tls.KubeCA{}
kubeletCertKey := &tls.KubeletCertKey{}
installConfig := &installconfig.InstallConfig{}
parents.Get(rootCA, kubeletCertKey, installConfig)
parents.Get(kubeCA, kubeletCertKey, installConfig)
return k.kubeconfig.generate(
rootCA,
kubeCA,
kubeletCertKey,
installConfig.Config,
"kubelet",