Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions pkg/asset/ignition/bootstrap/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ func (a *Bootstrap) Dependencies() []asset.Asset {
&installconfig.InstallConfig{},
&kubeconfig.AdminClient{},
&kubeconfig.Kubelet{},
&kubeconfig.LoopbackClient{},
&machines.Master{},
&machines.Worker{},
&manifests.Manifests{},
Expand Down Expand Up @@ -418,6 +419,7 @@ func (a *Bootstrap) addParentFiles(dependencies asset.Parents) {
for _, asset := range []asset.WritableAsset{
&kubeconfig.AdminClient{},
&kubeconfig.Kubelet{},
&kubeconfig.LoopbackClient{},
&tls.AdminKubeConfigCABundle{},
&tls.AggregatorCA{},
&tls.AggregatorCABundle{},
Expand Down
4 changes: 4 additions & 0 deletions pkg/asset/kubeconfig/kubeconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,7 @@ func getExtAPIServerURL(ic *types.InstallConfig) string {
func getIntAPIServerURL(ic *types.InstallConfig) string {
return fmt.Sprintf("https://api-int.%s:6443", ic.ClusterDomain())
}

func getLoopbackAPIServerURL(ic *types.InstallConfig) string {
return fmt.Sprintf("https://localhost:6443")
}
56 changes: 56 additions & 0 deletions pkg/asset/kubeconfig/loopback.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package kubeconfig

import (
"path/filepath"

"github.com/openshift/installer/pkg/asset"
"github.com/openshift/installer/pkg/asset/installconfig"
"github.com/openshift/installer/pkg/asset/tls"
)

var (
kubeconfigLoopbackPath = filepath.Join("auth", "kubeconfig-loopback")
)

// LoopbackClient is the asset for the admin kubeconfig.
type LoopbackClient struct {
kubeconfig
}

var _ asset.WritableAsset = (*LoopbackClient)(nil)

// Dependencies returns the dependency of the kubeconfig.
func (k *LoopbackClient) Dependencies() []asset.Asset {
return []asset.Asset{
&tls.AdminKubeConfigClientCertKey{},
&tls.KubeAPIServerLocalhostCABundle{},
&installconfig.InstallConfig{},
}
}

// Generate generates the kubeconfig.
func (k *LoopbackClient) Generate(parents asset.Parents) error {
ca := &tls.KubeAPIServerLocalhostCABundle{}
clientCertKey := &tls.AdminKubeConfigClientCertKey{}
installConfig := &installconfig.InstallConfig{}
parents.Get(ca, clientCertKey, installConfig)

return k.kubeconfig.generate(
ca,
clientCertKey,
getLoopbackAPIServerURL(installConfig.Config),
installConfig.Config.GetName(),
"loopback",
kubeconfigLoopbackPath,
)
}

// Name returns the human-friendly name of the asset.
func (k *LoopbackClient) Name() string {
return "Kubeconfig Admin Client (Loopback)"
}

// Load returns the kubeconfig from disk.
func (k *LoopbackClient) Load(f asset.FileFetcher) (found bool, err error) {
return k.load(f, kubeconfigLoopbackPath)
}