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

Merge pull request #14960 from johngmyers/vfscontext 

Add VFSContext to various clientsets
This commit is contained in:
Kubernetes Prow Robot 2023-07-15 14:55:05 -07:00 committed by GitHub
parent 141a040aec 11304807f2
commit ef284b11e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 85 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kops/create.go
View File

@ -33,7 +33,6 @@ import (
"k8s.io/kops/pkg/kubemanifest"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/util/pkg/text"
"k8s.io/kops/util/pkg/vfs"
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"
)
@ -102,6 +101,8 @@ func RunCreate(ctx context.Context, f *util.Factory, out io.Writer, c *CreateOpt
return err
}
vfsContext := f.VFSContext()
clusterName := ""
// var cSpec = false
var sb bytes.Buffer
@ -118,7 +119,7 @@ func RunCreate(ctx context.Context, f *util.Factory, out io.Writer, c *CreateOpt
return err
}
} else {
contents, err = vfs.Context.ReadFile(f)
contents, err = vfsContext.ReadFile(f)
if err != nil {
return fmt.Errorf("error reading file %q: %v", f, err)
}

3
cmd/kops/delete.go
View File

@ -28,7 +28,6 @@ import (
kopsapi "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/kopscodecs"
"k8s.io/kops/util/pkg/text"
"k8s.io/kops/util/pkg/vfs"
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"
)
@ -91,7 +90,7 @@ func RunDelete(ctx context.Context, factory *util.Factory, out io.Writer, d *Del
return fmt.Errorf("reading from stdin: %v", err)
}
} else {
contents, err = vfs.Context.ReadFile(f)
contents, err = factory.VFSContext().ReadFile(f)
if err != nil {
return fmt.Errorf("reading file %q: %v", f, err)
}

5
cmd/kops/replace.go
View File

@ -30,7 +30,6 @@ import (
"k8s.io/kops/pkg/kopscodecs"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/util/pkg/text"
"k8s.io/kops/util/pkg/vfs"
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"
)
@ -90,6 +89,8 @@ func RunReplace(ctx context.Context, f *util.Factory, out io.Writer, c *ReplaceO
return err
}
vfsContext := f.VFSContext()
for _, f := range c.Filenames {
var contents []byte
if f == "-" {
@ -98,7 +99,7 @@ func RunReplace(ctx context.Context, f *util.Factory, out io.Writer, c *ReplaceO
return err
}
} else {
contents, err = vfs.Context.ReadFile(f)
contents, err = vfsContext.ReadFile(f)
if err != nil {
return fmt.Errorf("error reading file %q: %v", f, err)
}

22
cmd/kops/util/factory.go
View File

@ -51,6 +51,7 @@ type Factory struct {
kubernetesClient kubernetes.Interface
certManagerClient certmanager.Interface
vfsContext *vfs.VFSContext
cachedRESTConfig *rest.Config
dynamicClient dynamic.Interface
@ -112,14 +113,15 @@ func (f *Factory) KopsClient() (simple.Clientset, error) {
return nil, fmt.Errorf("error building kops API client: %v", err)
}
f.clientset = &api.RESTClientset{
BaseURL: &url.URL{
f.clientset = api.NewRESTClientset(
f.VFSContext(),
&url.URL{
Scheme: "k8s",
},
KopsClient: kopsClient.Kops(),
}
kopsClient.Kops(),
)
} else {
basePath, err := vfs.Context.BuildVfsPath(registryPath)
basePath, err := f.VFSContext().BuildVfsPath(registryPath)
if err != nil {
return nil, fmt.Errorf("error building path for %q: %v", registryPath, err)
}
@ -128,7 +130,7 @@ func (f *Factory) KopsClient() (simple.Clientset, error) {
return nil, field.Invalid(field.NewPath("State Store"), registryPath, INVALID_STATE_ERROR)
}
f.clientset = vfsclientset.NewVFSClientset(basePath)
f.clientset = vfsclientset.NewVFSClientset(f.VFSContext(), basePath)
}
if strings.HasPrefix(registryPath, "file://") {
klog.Warning("The local filesystem state store is not functional for running clusters")
@ -221,3 +223,11 @@ func (f *Factory) RESTMapper() (*restmapper.DeferredDiscoveryRESTMapper, error)
return f.restMapper, nil
}
func (f *Factory) VFSContext() *vfs.VFSContext {
if f.vfsContext == nil {
// TODO vfs.NewVFSContext()
f.vfsContext = vfs.Context
}
return f.vfsContext
}

3
cmd/kops/version.go
View File

@ -25,7 +25,6 @@ import (
"k8s.io/kops"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/util/pkg/vfs"
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"
)
@ -116,7 +115,7 @@ func serverVersion(f *util.Factory, options *VersionOptions) string {
if err != nil {
return "could not fetch cluster"
}
configBase, err := vfs.Context.BuildVfsPath(cluster.Spec.ConfigBase)
configBase, err := f.VFSContext().BuildVfsPath(cluster.Spec.ConfigBase)
if err != nil {
return "could not talk to vfs"
}

3
examples/kops-api-example/apply.go
View File

@ -21,10 +21,11 @@ import (
"k8s.io/kops/pkg/client/simple/vfsclientset"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/util/pkg/vfs"
)
func apply(ctx context.Context) error {
clientset := vfsclientset.NewVFSClientset(registryBase)
clientset := vfsclientset.NewVFSClientset(vfs.Context, registryBase)
cluster, err := clientset.GetCluster(ctx, clusterName)
if err != nil {

3
examples/kops-api-example/up.go
View File

@ -27,10 +27,11 @@ import (
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/upup/pkg/fi/utils"
"k8s.io/kops/util/pkg/vfs"
)
func up(ctx context.Context) error {
clientset := vfsclientset.NewVFSClientset(registryBase)
clientset := vfsclientset.NewVFSClientset(vfs.Context, registryBase)
cluster := &api.Cluster{}
cluster.ObjectMeta.Name = clusterName

2
nodeup/pkg/model/kubelet_test.go
View File

@ -297,7 +297,7 @@ func mockedPopulateClusterSpec(ctx context.Context, c *kops.Cluster, cloud fi.Cl
if err != nil {
return nil, fmt.Errorf("error building vfspath: %v", err)
}
clientset := vfsclientset.NewVFSClientset(basePath)
clientset := vfsclientset.NewVFSClientset(vfs.Context, basePath)
return cloudup.PopulateClusterSpec(ctx, clientset, c, cloud, assetBuilder)
}

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

@ -38,10 +38,23 @@ import (
// RESTClientset is an implementation of clientset that uses a "real" generated REST client
type RESTClientset struct {
vfsContext *vfs.VFSContext
BaseURL *url.URL
KopsClient kopsinternalversion.KopsInterface
}
func NewRESTClientset(vfsContext *vfs.VFSContext, baseURL *url.URL, kopsClient kopsinternalversion.KopsInterface) *RESTClientset {
return &RESTClientset{
vfsContext: vfsContext,
BaseURL: baseURL,
KopsClient: kopsClient,
}
}
func (c *RESTClientset) VFSContext() *vfs.VFSContext {
return c.vfsContext
}
// GetCluster implements the GetCluster method of Clientset for a kubernetes-API state store
func (c *RESTClientset) GetCluster(ctx context.Context, name string) (*kops.Cluster, error) {
namespace := restNamespaceForClusterName(name)
@ -79,11 +92,11 @@ func (c *RESTClientset) UpdateCluster(ctx context.Context, cluster *kops.Cluster
// ConfigBaseFor implements the ConfigBaseFor method of Clientset for a kubernetes-API state store
func (c *RESTClientset) ConfigBaseFor(cluster *kops.Cluster) (vfs.Path, error) {
if cluster.Spec.ConfigBase != "" {
return vfs.Context.BuildVfsPath(cluster.Spec.ConfigBase)
return c.VFSContext().BuildVfsPath(cluster.Spec.ConfigBase)
}
// URL for clusters looks like https://<server>/apis/kops/v1alpha2/namespaces/<cluster>/clusters/<cluster>
// We probably want to add a subresource for full resources
return vfs.Context.BuildVfsPath(c.BaseURL.String())
return c.VFSContext().BuildVfsPath(c.BaseURL.String())
}
// ListClusters implements the ListClusters method of Clientset for a kubernetes-API state store

3
pkg/client/simple/clientset.go
View File

@ -28,6 +28,9 @@ import (
)
type Clientset interface {
// VFSContext returns a VFSContext.
VFSContext() *vfs.VFSContext
// GetCluster reads a cluster by name
GetCluster(ctx context.Context, name string) (*kops.Cluster, error)

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

@ -34,11 +34,16 @@ import (
)
type VFSClientset struct {
basePath vfs.Path
vfsContext *vfs.VFSContext
basePath vfs.Path
}
var _ simple.Clientset = &VFSClientset{}
func (c *VFSClientset) VFSContext() *vfs.VFSContext {
return c.vfsContext
}
func (c *VFSClientset) clusters() *ClusterVFS {
return newClusterVFS(c.basePath)
}
@ -66,7 +71,7 @@ func (c *VFSClientset) ListClusters(ctx context.Context, options metav1.ListOpti
// ConfigBaseFor implements the ConfigBaseFor method of simple.Clientset for a VFS-backed state store
func (c *VFSClientset) ConfigBaseFor(cluster *kops.Cluster) (vfs.Path, error) {
if cluster.Spec.ConfigBase != "" {
return vfs.Context.BuildVfsPath(cluster.Spec.ConfigBase)
return c.VFSContext().BuildVfsPath(cluster.Spec.ConfigBase)
}
return c.clusters().configBase(cluster.Name)
}
@ -89,13 +94,13 @@ func (c *VFSClientset) SecretStore(cluster *kops.Cluster) (fi.SecretStore, error
basedir := configBase.Join("secrets")
return secrets.NewVFSSecretStore(cluster, basedir), nil
} else {
storePath, err := vfs.Context.BuildVfsPath(cluster.Spec.SecretStore)
storePath, err := c.VFSContext().BuildVfsPath(cluster.Spec.SecretStore)
return secrets.NewVFSSecretStore(cluster, storePath), err
}
}
func (c *VFSClientset) KeyStore(cluster *kops.Cluster) (fi.CAStore, error) {
basedir, err := pkiPath(cluster)
basedir, err := c.pkiPath(cluster)
if err != nil {
return nil, err
}
@ -106,14 +111,14 @@ func (c *VFSClientset) KeyStore(cluster *kops.Cluster) (fi.CAStore, error) {
}
func (c *VFSClientset) SSHCredentialStore(cluster *kops.Cluster) (fi.SSHCredentialStore, error) {
basedir, err := pkiPath(cluster)
basedir, err := c.pkiPath(cluster)
if err != nil {
return nil, err
}
return fi.NewVFSSSHCredentialStore(cluster, basedir), nil
}
func pkiPath(cluster *kops.Cluster) (vfs.Path, error) {
func (c *VFSClientset) pkiPath(cluster *kops.Cluster) (vfs.Path, error) {
if cluster.Spec.KeyStore == "" {
configBase, err := registry.ConfigBase(cluster)
if err != nil {
@ -121,7 +126,7 @@ func pkiPath(cluster *kops.Cluster) (vfs.Path, error) {
}
return configBase.Join("pki"), nil
} else {
storePath, err := vfs.Context.BuildVfsPath(cluster.Spec.KeyStore)
storePath, err := c.VFSContext().BuildVfsPath(cluster.Spec.KeyStore)
return storePath, err
}
}
@ -205,7 +210,7 @@ func (c *VFSClientset) DeleteCluster(ctx context.Context, cluster *kops.Cluster)
if cluster.Spec.ServiceAccountIssuerDiscovery != nil {
discoveryStore := cluster.Spec.ServiceAccountIssuerDiscovery.DiscoveryStore
if discoveryStore != "" {
path, err := vfs.Context.BuildVfsPath(discoveryStore)
path, err := c.VFSContext().BuildVfsPath(discoveryStore)
if err != nil {
return err
}
@ -223,7 +228,7 @@ func (c *VFSClientset) DeleteCluster(ctx context.Context, cluster *kops.Cluster)
secretStore := cluster.Spec.SecretStore
if secretStore != "" {
path, err := vfs.Context.BuildVfsPath(secretStore)
path, err := c.VFSContext().BuildVfsPath(secretStore)
if err != nil {
return err
}
@ -235,7 +240,7 @@ func (c *VFSClientset) DeleteCluster(ctx context.Context, cluster *kops.Cluster)
keyStore := cluster.Spec.KeyStore
if keyStore != "" && keyStore != secretStore {
path, err := vfs.Context.BuildVfsPath(keyStore)
path, err := c.VFSContext().BuildVfsPath(keyStore)
if err != nil {
return err
}
@ -253,9 +258,10 @@ func (c *VFSClientset) DeleteCluster(ctx context.Context, cluster *kops.Cluster)
return DeleteAllClusterState(configBase)
}
func NewVFSClientset(basePath vfs.Path) simple.Clientset {
func NewVFSClientset(vfsContext *vfs.VFSContext, basePath vfs.Path) simple.Clientset {
vfsClientset := &VFSClientset{
basePath: basePath,
vfsContext: vfsContext,
basePath: basePath,
}
return vfsClientset
}

10
pkg/client/simple/vfsclientset/clientset_test.go
View File

@ -24,6 +24,9 @@ import (
)
func TestSSHCredentialStoreOnConfigBase(t *testing.T) {
clientset := VFSClientset{
vfsContext: vfs.Context,
}
vfs.Context.ResetMemfsContext(true)
configBase := "memfs://some/config/base"
cluster := &kops.Cluster{
@ -32,7 +35,7 @@ func TestSSHCredentialStoreOnConfigBase(t *testing.T) {
},
}
p, err := pkiPath(cluster)
p, err := clientset.pkiPath(cluster)
if err != nil {
t.Errorf("Failed to create ssh path: %v", err)
}
@ -46,6 +49,9 @@ func TestSSHCredentialStoreOnConfigBase(t *testing.T) {
}
func TestSSHCredentialStoreOnOwnCFS(t *testing.T) {
clientset := VFSClientset{
vfsContext: vfs.Context,
}
vfs.Context.ResetMemfsContext(true)
configBase := "memfs://some/config/base"
keyPath := "memfs://keys/some/config/base/pki"
@ -56,7 +62,7 @@ func TestSSHCredentialStoreOnOwnCFS(t *testing.T) {
},
}
p, err := pkiPath(cluster)
p, err := clientset.pkiPath(cluster)
if err != nil {
t.Errorf("Failed to create ssh path: %v", err)
}

2
pkg/instancegroups/rollingupdate_os_test.go
View File

@ -60,7 +60,7 @@ func getTestSetupOS(t *testing.T, ctx context.Context) (*RollingUpdateCluster, *
assetBuilder := assets.NewAssetBuilder(inCluster.Spec.Assets, inCluster.Spec.KubernetesVersion, false)
basePath, _ := vfs.Context.BuildVfsPath(inCluster.Spec.ConfigBase)
clientset := vfsclientset.NewVFSClientset(basePath)
clientset := vfsclientset.NewVFSClientset(vfs.Context, basePath)
cluster, err := cloudup.PopulateClusterSpec(ctx, clientset, inCluster, mockcloud, assetBuilder)
if err != nil {
t.Fatalf("Failed to populate cluster spec: %v", err)

2
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -266,7 +266,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
cluster := c.Cluster
configBase, err := vfs.Context.BuildVfsPath(cluster.Spec.ConfigBase)
configBase, err := c.Clientset.VFSContext().BuildVfsPath(cluster.Spec.ConfigBase)
if err != nil {
return fmt.Errorf("error parsing config base %q: %v", cluster.Spec.ConfigBase, err)
}

2
upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go
View File

@ -122,7 +122,7 @@ func runChannelBuilderTest(t *testing.T, key string, addonManifests []string) {
if err != nil {
t.Errorf("error building vfspath: %v", err)
}
clientset := vfsclientset.NewVFSClientset(basePath)
clientset := vfsclientset.NewVFSClientset(vfs.Context, basePath)
secretStore, err := clientset.SecretStore(cluster)
if err != nil {

3
upup/pkg/fi/cloudup/new_cluster.go
View File

@ -41,7 +41,6 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup/gce"
"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
"k8s.io/kops/util/pkg/architectures"
"k8s.io/kops/util/pkg/vfs"
)
const (
@ -352,7 +351,7 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
}
if opt.DiscoveryStore != "" {
discoveryPath, err := vfs.Context.BuildVfsPath(opt.DiscoveryStore)
discoveryPath, err := clientset.VFSContext().BuildVfsPath(opt.DiscoveryStore)
if err != nil {
return nil, fmt.Errorf("error building DiscoveryStore for cluster: %v", err)
}

2
upup/pkg/fi/cloudup/populate_cluster_spec.go
View File

@ -159,7 +159,7 @@ func (c *populateClusterSpec) run(ctx context.Context, clientset simple.Clientse
}
}
configBase, err := vfs.Context.BuildVfsPath(cluster.Spec.ConfigBase)
configBase, err := clientset.VFSContext().BuildVfsPath(cluster.Spec.ConfigBase)
if err != nil {
return fmt.Errorf("error parsing ConfigBase %q: %v", cluster.Spec.ConfigBase, err)
}

2
upup/pkg/fi/cloudup/populate_cluster_spec_test.go
View File

@ -115,7 +115,7 @@ func mockedPopulateClusterSpec(ctx context.Context, c *kopsapi.Cluster, cloud fi
if err != nil {
return nil, fmt.Errorf("error building vfspath: %v", err)
}
clientset := vfsclientset.NewVFSClientset(basePath)
clientset := vfsclientset.NewVFSClientset(vfs.Context, basePath)
return PopulateClusterSpec(ctx, clientset, c, cloud, assetBuilder)
}

6
util/pkg/vfs/context.go
View File

@ -72,6 +72,12 @@ func NewVFSContext() *VFSContext {
return v
}
func NewTestingVFSContext() *VFSContext {
vfsContext := NewVFSContext()
vfsContext.ResetMemfsContext(true)
return vfsContext
}
func (v *VFSContext) WithGCSClient(gcsClient *storage.Service) *VFSContext {
v.mutex.Lock()
defer v.mutex.Unlock()