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

Merge pull request #15678 from johngmyers/no-configstore 

v1alpha3: remove redundant ConfigStore
This commit is contained in:
Kubernetes Prow Robot 2023-07-22 00:32:07 -07:00 committed by GitHub
parent e6a5d05161 4a7abcef51
commit dbba2ae410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
92 changed files with 17 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -802,8 +802,7 @@ spec:
system (etcd vs S3)
type: string
configStore:
description: ConfigStore is the VFS path to where the configuration
(Cluster, InstanceGroups etc) is stored
description: ConfigStore is unused.
type: string
containerRuntime:
description: Container runtime to use for Kubernetes
@ -5721,7 +5720,7 @@ spec:
type: string
type: object
masters:
description: ControlPlane is not used.
description: Masters is not used.
type: string
nodes:
description: Nodes is not used.

4
pkg/acls/s3/storage.go
View File

@ -62,9 +62,9 @@ func (s *s3PublicAclStrategy) GetACL(ctx context.Context, p vfs.Path, cluster *k
return nil, nil
}
config, err := url.Parse(cluster.Spec.ConfigStore)
config, err := url.Parse(cluster.Spec.ConfigBase)
if err != nil {
return "", fmt.Errorf("unable to parse: %q", fileRepository)
return "", fmt.Errorf("unable to parse: %q", cluster.Spec.ConfigBase)
}
// We are checking that the path defined is not the state store, if it is

4
pkg/acls/s3/storage_test.go
View File

@ -36,7 +36,7 @@ func Test_Strategy(t *testing.T) {
cluster := &kops.Cluster{
Spec: kops.ClusterSpec{
ConfigStore: "s3://my_state_store/cluster",
ConfigBase: "s3://my_state_store/cluster",
Assets: &kops.AssetsSpec{
FileRepository: values.String("https://s3.amazonaws.com/test"),
},
@ -65,7 +65,7 @@ func Test_In_StateStore(t *testing.T) {
cluster := &kops.Cluster{
Spec: kops.ClusterSpec{
ConfigStore: "s3://my_state_store/cluster",
ConfigBase: "s3://my_state_store/cluster",
Assets: &kops.AssetsSpec{
FileRepository: values.String("https://s3.amazonaws.com/my_state_store/opps"),
},

2
pkg/apis/kops/cluster.go
View File

@ -72,8 +72,6 @@ type ClusterSpec struct {
SecretStore string `json:"secretStore,omitempty"`
// KeyStore is the VFS path to where SSL keys and certificates are stored
KeyStore string `json:"keyStore,omitempty"`
// ConfigStore is the VFS path to where the configuration (Cluster, InstanceGroups etc) is stored
ConfigStore string `json:"configStore,omitempty"`
// DNSZone is the DNS zone we should use when configuring DNS
// This is because some clouds let us define a managed zone foo.bar, and then have
// kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone.

3
pkg/apis/kops/v1alpha2/cluster.go
View File

@ -99,7 +99,8 @@ type ClusterSpec struct {
SecretStore string `json:"secretStore,omitempty"`
// KeyStore is the VFS path to where SSL keys and certificates are stored
KeyStore string `json:"keyStore,omitempty"`
// ConfigStore is the VFS path to where the configuration (Cluster, InstanceGroups etc) is stored
// ConfigStore is unused.
// +k8s:conversion-gen=false
ConfigStore string `json:"configStore,omitempty"`
// DNSZone is the DNS zone we should use when configuring DNS
// This is because some clouds let us define a managed zone foo.bar, and then have

4
pkg/apis/kops/v1alpha2/topology.go
View File

@ -22,9 +22,9 @@ const (
)
type TopologySpec struct {
// ControlPlane is not used.
// Masters is not used.
// +k8s:conversion-gen=false
ControlPlane string `json:"masters,omitempty"`
Masters string `json:"masters,omitempty"`
// Nodes is not used.
// +k8s:conversion-gen=false

5
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -2364,7 +2364,7 @@ func autoConvert_v1alpha2_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
// INFO: in.Topology opted out of conversion generation
out.SecretStore = in.SecretStore
out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
// INFO: in.ConfigStore opted out of conversion generation
out.DNSZone = in.DNSZone
if in.DNSControllerGossipConfig != nil {
in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig
@ -2713,7 +2713,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha2_ClusterSpec(in *kops.ClusterSpec,
out.KubernetesVersion = in.KubernetesVersion
out.SecretStore = in.SecretStore
out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
out.DNSZone = in.DNSZone
if in.DNSControllerGossipConfig != nil {
in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig
@ -7161,7 +7160,7 @@ func Convert_kops_TerraformSpec_To_v1alpha2_TerraformSpec(in *kops.TerraformSpec
}
func autoConvert_v1alpha2_TopologySpec_To_kops_TopologySpec(in *TopologySpec, out *kops.TopologySpec, s conversion.Scope) error {
// INFO: in.ControlPlane opted out of conversion generation
// INFO: in.Masters opted out of conversion generation
// INFO: in.Nodes opted out of conversion generation
if in.Bastion != nil {
in, out := &in.Bastion, &out.Bastion

2
pkg/apis/kops/v1alpha3/cluster.go
View File

@ -68,8 +68,6 @@ type ClusterSpec struct {
SecretStore string `json:"secretStore,omitempty"`
// KeyStore is the VFS path to where SSL keys and certificates are stored
KeyStore string `json:"keyStore,omitempty"`
// ConfigStore is the VFS path to where the configuration (Cluster, InstanceGroups etc) is stored
ConfigStore string `json:"configStore,omitempty"`
// DNSZone is the DNS zone we should use when configuring DNS
// This is because some clouds let us define a managed zone foo.bar, and then have
// kubernetes.dev.foo.bar, without needing to define dev.foo.bar as a hosted zone.

2
pkg/apis/kops/v1alpha3/zz_generated.conversion.go generated
View File

@ -2593,7 +2593,6 @@ func autoConvert_v1alpha3_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
out.KubernetesVersion = in.KubernetesVersion
out.SecretStore = in.SecretStore
out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
out.DNSZone = in.DNSZone
if in.DNSControllerGossipConfig != nil {
in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig
@ -2927,7 +2926,6 @@ func autoConvert_kops_ClusterSpec_To_v1alpha3_ClusterSpec(in *kops.ClusterSpec,
out.KubernetesVersion = in.KubernetesVersion
out.SecretStore = in.SecretStore
out.KeyStore = in.KeyStore
out.ConfigStore = in.ConfigStore
out.DNSZone = in.DNSZone
if in.DNSControllerGossipConfig != nil {
in, out := &in.DNSControllerGossipConfig, &out.DNSControllerGossipConfig

4
pkg/model/gcemodel/storageacl.go
View File

@ -179,9 +179,9 @@ func (b *StorageAclBuilder) Build(c *fi.CloudupModelBuilderContext) error {
return err
}
if len(readablePaths) != 0 {
p, err := vfs.Context.BuildVfsPath(b.Cluster.Spec.ConfigStore)
p, err := vfs.Context.BuildVfsPath(b.Cluster.Spec.ConfigBase)
if err != nil {
return fmt.Errorf("cannot parse VFS path %q: %v", b.Cluster.Spec.ConfigStore, err)
return fmt.Errorf("cannot parse VFS path %q: %v", b.Cluster.Spec.ConfigBase, err)
}
gcsPath, ok := p.(*vfs.GSPath)

2
pkg/model/iam/iam_builder.go
View File

@ -506,7 +506,7 @@ func (b *PolicyBuilder) AddS3Permissions(p *Policy) (*Policy, error) {
for _, p := range []string{
b.Cluster.Spec.KeyStore,
b.Cluster.Spec.SecretStore,
b.Cluster.Spec.ConfigStore,
b.Cluster.Spec.ConfigBase,
} {
if p == "" {
continue

2
pkg/model/iam/iam_builder_test.go
View File

@ -174,7 +174,7 @@ func TestPolicyGeneration(t *testing.T) {
b := &PolicyBuilder{
Cluster: &kops.Cluster{
Spec: kops.ClusterSpec{
ConfigStore: "s3://kops-tests/iam-builder-test.k8s.local",
ConfigBase: "s3://kops-tests/iam-builder-test.k8s.local",
IAM: &kops.IAMSpec{
AllowContainerRegistry: x.AllowContainerRegistry,
},

1
tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
View File

@ -17,7 +17,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://tests/additionalobjects.example.com
configStore: memfs://tests/additionalobjects.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content
View File

@ -29,7 +29,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/bastionuserdata.example.com
configStore: memfs://clusters.example.com/bastionuserdata.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content
View File

@ -49,7 +49,6 @@ spec:
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com
configStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content
View File

@ -42,7 +42,6 @@ spec:
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/cas-priority-expander.example.com
configStore: memfs://clusters.example.com/cas-priority-expander.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
View File

@ -47,7 +47,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/complex.example.com
configStore: memfs://clusters.example.com/complex.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/compress.example.com
configStore: memfs://clusters.example.com/compress.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/containerd.example.com
configStore: memfs://clusters.example.com/containerd.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/containerd.example.com
configStore: memfs://clusters.example.com/containerd.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/123.example.com
configStore: memfs://clusters.example.com/123.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content
View File

@ -17,7 +17,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/docker.example.com
configStore: memfs://clusters.example.com/docker.example.com
containerRuntime: docker
containerd:
configOverride: |

1
tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://tests/existing-iam.example.com
configStore: memfs://tests/existing-iam.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content
View File

@ -28,7 +28,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/existingsg.example.com
configStore: memfs://clusters.example.com/existingsg.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/externallb.example.com
configStore: memfs://clusters.example.com/externallb.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content
View File

@ -33,7 +33,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/externalpolicies.example.com
configStore: memfs://clusters.example.com/externalpolicies.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://tests/ha.example.com
configStore: memfs://tests/ha.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content
View File

@ -26,7 +26,6 @@ spec:
cloudProvider: gce
clusterDNSDomain: cluster.local
configBase: memfs://tests/ha-gce.example.com
configStore: memfs://tests/ha-gce.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content
View File

@ -45,7 +45,6 @@ spec:
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content
View File

@ -45,7 +45,6 @@ spec:
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content
View File

@ -46,7 +46,6 @@ spec:
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content
View File

@ -45,7 +45,6 @@ spec:
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content
View File

@ -45,7 +45,6 @@ spec:
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
View File

@ -45,7 +45,6 @@ spec:
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
View File

@ -43,7 +43,6 @@ spec:
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal.example.com
configStore: memfs://tests/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content
View File

@ -46,7 +46,6 @@ spec:
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content
View File

@ -17,7 +17,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal.example.com
configStore: memfs://tests/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content
View File

@ -26,7 +26,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal.example.com
configStore: memfs://tests/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal.example.com
configStore: memfs://tests/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal.example.com
configStore: memfs://tests/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal.example.com
configStore: memfs://tests/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal.example.com
configStore: memfs://tests/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-etcd.example.com
configStore: memfs://clusters.example.com/minimal-etcd.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-ipv6.example.com
configStore: memfs://clusters.example.com/minimal-ipv6.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-ipv6.example.com
configStore: memfs://clusters.example.com/minimal-ipv6.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-ipv6.example.com
configStore: memfs://clusters.example.com/minimal-ipv6.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-ipv6.example.com
configStore: memfs://clusters.example.com/minimal-ipv6.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com
configStore: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-warmpool.example.com
configStore: memfs://clusters.example.com/minimal-warmpool.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content
View File

@ -26,7 +26,6 @@ spec:
cloudProvider: gce
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal-gce.example.com
configStore: memfs://tests/minimal-gce.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: gce
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal-gce.example.com
configStore: memfs://tests/minimal-gce.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: gce
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal-gce-ilb.example.com
configStore: memfs://tests/minimal-gce-ilb.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: gce
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com
configStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content
View File

@ -26,7 +26,6 @@ spec:
cloudProvider: gce
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com
configStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: gce
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal-gce-plb.example.com
configStore: memfs://tests/minimal-gce-plb.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content
View File

@ -26,7 +26,6 @@ spec:
cloudProvider: gce
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal-gce-private.example.com
configStore: memfs://tests/minimal-gce-private.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.k8s.local
configStore: memfs://clusters.example.com/minimal.k8s.local
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.k8s.local
configStore: memfs://clusters.example.com/minimal.k8s.local
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content
View File

@ -24,7 +24,6 @@ spec:
cloudProvider: hetzner
clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal.example.com
configStore: memfs://tests/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content
View File

@ -15,7 +15,6 @@ spec:
cloudProvider: scaleway
clusterDNSDomain: cluster.local
configBase: memfs://tests/scw-minimal.k8s.local
configStore: memfs://tests/scw-minimal.k8s.local
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/mixedinstances.example.com
configStore: memfs://clusters.example.com/mixedinstances.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/mixedinstances.example.com
configStore: memfs://clusters.example.com/mixedinstances.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
configStore: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
configStore: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/private-shared-ip.example.com
configStore: memfs://clusters.example.com/private-shared-ip.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/private-shared-subnet.example.com
configStore: memfs://clusters.example.com/private-shared-subnet.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/privatecalico.example.com
configStore: memfs://clusters.example.com/privatecalico.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/privatecanal.example.com
configStore: memfs://clusters.example.com/privatecanal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/privatecilium.example.com
configStore: memfs://clusters.example.com/privatecilium.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/privatecilium.example.com
configStore: memfs://clusters.example.com/privatecilium.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/privatecilium.example.com
configStore: memfs://clusters.example.com/privatecilium.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/privateciliumadvanced.example.com
configStore: memfs://clusters.example.com/privateciliumadvanced.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/privatedns1.example.com
configStore: memfs://clusters.example.com/privatedns1.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/privatedns2.example.com
configStore: memfs://clusters.example.com/privatedns2.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/privateflannel.example.com
configStore: memfs://clusters.example.com/privateflannel.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/privatekopeio.example.com
configStore: memfs://clusters.example.com/privatekopeio.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content
View File

@ -26,7 +26,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/sharedsubnet.example.com
configStore: memfs://clusters.example.com/sharedsubnet.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/sharedvpc.example.com
configStore: memfs://clusters.example.com/sharedvpc.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content
View File

@ -30,7 +30,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-ipv6.example.com
configStore: memfs://clusters.example.com/minimal-ipv6.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content
View File

@ -27,7 +27,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/unmanaged.example.com
configStore: memfs://clusters.example.com/unmanaged.example.com
containerRuntime: containerd
containerd:
logLevel: info

1
tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content
View File

@ -25,7 +25,6 @@ spec:
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal.example.com
configStore: memfs://clusters.example.com/minimal.example.com
containerRuntime: containerd
containerd:
logLevel: info

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

@ -167,9 +167,7 @@ func (c *populateClusterSpec) run(ctx context.Context, clientset simple.Clientse
if err != nil {
return fmt.Errorf("error parsing ConfigBase %q: %v", cluster.Spec.ConfigBase, err)
}
if vfs.IsClusterReadable(configBase) {
cluster.Spec.ConfigStore = configBase.Path()
} else {
if !vfs.IsClusterReadable(configBase) {
// We could implement this approach, but it seems better to get all clouds using cluster-readable storage
return fmt.Errorf("ConfigBase path is not cluster readable: %v", cluster.Spec.ConfigBase)
}