Skip to content

Commit

Permalink
Merge pull request #2085 from jhixson74/master_azure_bootstrap_genera…
Browse files Browse the repository at this point in the history
…te_loopback_kubeconfig

azure: generate loopback kubeconfig to access API locally
  • Loading branch information
openshift-merge-robot committed Jul 26, 2019
2 parents f79dc2f + bf59ebf commit 6e3bad2
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/asset/ignition/bootstrap/bootstrap.go
Expand Up @@ -62,6 +62,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 @@ -420,6 +421,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
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
@@ -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)
}

0 comments on commit 6e3bad2

Please sign in to comment.