kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get VFSContext from caller in ConfigBase()

This commit is contained in:
John Gardiner Myers 2023-07-17 21:56:01 -07:00
parent 245cd64a3a
commit 7489469414
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kops/get_cluster.go
View File

@ -33,6 +33,7 @@ import (
"k8s.io/kops/pkg/commands/commandutils"
"k8s.io/kops/pkg/kopscodecs"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kops/util/pkg/vfs"
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"
)
@ -157,7 +158,7 @@ func RunGetClusters(ctx context.Context, f commandutils.Factory, out io.Writer,
if options.FullSpec {
var err error
clusters, err = fullClusterSpecs(ctx, clusters)
clusters, err = fullClusterSpecs(ctx, client.VFSContext(), clusters)
if err != nil {
return err
}
@ -278,10 +279,10 @@ func fullOutputYAML(out io.Writer, args ...runtime.Object) error {
return nil
}
func fullClusterSpecs(ctx context.Context, clusters []*kopsapi.Cluster) ([]*kopsapi.Cluster, error) {
func fullClusterSpecs(ctx context.Context, vfsContext *vfs.VFSContext, clusters []*kopsapi.Cluster) ([]*kopsapi.Cluster, error) {
var fullSpecs []*kopsapi.Cluster
for _, cluster := range clusters {
configBase, err := registry.ConfigBase(cluster)
configBase, err := registry.ConfigBase(vfsContext, cluster)
if err != nil {
return nil, fmt.Errorf("error reading full cluster spec for %q: %v", cluster.ObjectMeta.Name, err)
}

4
pkg/apis/kops/registry/registry.go
View File

@ -33,11 +33,11 @@ const (
PathKopsVersionUpdated = "kops-version.txt"
)
func ConfigBase(c *api.Cluster) (vfs.Path, error) {
func ConfigBase(vfsContext *vfs.VFSContext, c *api.Cluster) (vfs.Path, error) {
if c.Spec.ConfigBase == "" {
return nil, field.Required(field.NewPath("spec", "configBase"), "")
}
configBase, err := vfs.Context.BuildVfsPath(c.Spec.ConfigBase)
configBase, err := vfsContext.BuildVfsPath(c.Spec.ConfigBase)
if err != nil {
return nil, fmt.Errorf("error parsing ConfigBase %q: %v", c.Spec.ConfigBase, err)
}

2
pkg/client/simple/api/clientset.go
View File

@ -126,7 +126,7 @@ func (c *RESTClientset) SSHCredentialStore(cluster *kops.Cluster) (fi.SSHCredent
}
func (c *RESTClientset) DeleteCluster(ctx context.Context, cluster *kops.Cluster) error {
configBase, err := registry.ConfigBase(cluster)
configBase, err := registry.ConfigBase(c.VFSContext(), cluster)
if err != nil {
return err
}

6
pkg/client/simple/vfsclientset/clientset.go
View File

@ -87,7 +87,7 @@ func (c *VFSClientset) AddonsFor(cluster *kops.Cluster) simple.AddonsClient {
func (c *VFSClientset) SecretStore(cluster *kops.Cluster) (fi.SecretStore, error) {
if cluster.Spec.SecretStore == "" {
configBase, err := registry.ConfigBase(cluster)
configBase, err := registry.ConfigBase(c.VFSContext(), cluster)
if err != nil {
return nil, err
}
@ -120,7 +120,7 @@ func (c *VFSClientset) SSHCredentialStore(cluster *kops.Cluster) (fi.SSHCredenti
func (c *VFSClientset) pkiPath(cluster *kops.Cluster) (vfs.Path, error) {
if cluster.Spec.KeyStore == "" {
configBase, err := registry.ConfigBase(cluster)
configBase, err := registry.ConfigBase(c.VFSContext(), cluster)
if err != nil {
return nil, err
}
@ -232,7 +232,7 @@ func (c *VFSClientset) DeleteCluster(ctx context.Context, cluster *kops.Cluster)
}
}
configBase, err := registry.ConfigBase(cluster)
configBase, err := registry.ConfigBase(c.VFSContext(), cluster)
if err != nil {
return err
}