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

Merge pull request #14810 from johngmyers/cloudconfig 

v1alpha3: Move AWS EBS CSI spec under CloudProvider.AWS
This commit is contained in:
Kubernetes Prow Robot 2022-12-19 00:55:44 -08:00 committed by GitHub
parent 9243ea617c 4c036cb261
commit 63feb25345
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
174 changed files with 319 additions and 663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/cluster_spec.md
View File

@ -1580,6 +1580,7 @@ the removal of fields no longer in use.
| api.loadBalancer.subnets.allocationId | api.loadBalancer.subnets.allocationID |
| api.loadBalancer.useForInternalApi | api.loadBalancer.useForInternalAPI |
| awsLoadBalancerController | cloudprovider.aws.loadBalancerController |
| cloudConfig.awsEBSCSIDriver | cloudProvider.aws.ebsCSIDriver |
| cloudConfig.azure | cloudProvider.azure |
| cloudConfig.azure.subscriptionId | cloudProvider.azure.subscriptionID |
| cloudConfig.azure.tenantId | cloudProvider.azure.tenantID |

10
nodeup/pkg/model/kube_apiserver.go
View File

@ -544,10 +544,7 @@ func (b *KubeAPIServerBuilder) buildPod(kubeAPIServer *kops.KubeAPIServerConfig)
return nil, fmt.Errorf("error building kube-apiserver flags: %v", err)
}
// add cloud config file if needed
if b.Cluster.Spec.CloudConfig != nil {
flags = append(flags, fmt.Sprintf("--cloud-config=%s", InTreeCloudConfigFilePath))
}
flags = append(flags, fmt.Sprintf("--cloud-config=%s", InTreeCloudConfigFilePath))
pod := &v1.Pod{
TypeMeta: metav1.TypeMeta{
@ -678,10 +675,7 @@ func (b *KubeAPIServerBuilder) buildPod(kubeAPIServer *kops.KubeAPIServerConfig)
kubemanifest.AddHostPathMapping(pod, container, name, path)
}
// Add cloud config file if needed
if b.Cluster.Spec.CloudConfig != nil {
kubemanifest.AddHostPathMapping(pod, container, "cloudconfig", InTreeCloudConfigFilePath)
}
kubemanifest.AddHostPathMapping(pod, container, "cloudconfig", InTreeCloudConfigFilePath)
kubemanifest.AddHostPathMapping(pod, container, "kubernetesca", filepath.Join(b.PathSrvKubernetes(), "ca.crt"))

10
nodeup/pkg/model/kube_controller_manager.go
View File

@ -153,10 +153,7 @@ func (b *KubeControllerManagerBuilder) buildPod(kcm *kops.KubeControllerManagerC
return nil, fmt.Errorf("error building kube-controller-manager flags: %v", err)
}
// Add cloud config file if needed
if b.Cluster.Spec.CloudConfig != nil {
flags = append(flags, "--cloud-config="+InTreeCloudConfigFilePath)
}
flags = append(flags, "--cloud-config="+InTreeCloudConfigFilePath)
// Add kubeconfig flags
for _, flag := range []string{"", "authentication-", "authorization-"} {
@ -269,10 +266,7 @@ func (b *KubeControllerManagerBuilder) buildPod(kcm *kops.KubeControllerManagerC
kubemanifest.AddHostPathMapping(pod, container, name, path)
}
// Add cloud config file if needed
if b.Cluster.Spec.CloudConfig != nil {
kubemanifest.AddHostPathMapping(pod, container, "cloudconfig", InTreeCloudConfigFilePath)
}
kubemanifest.AddHostPathMapping(pod, container, "cloudconfig", InTreeCloudConfigFilePath)
kubemanifest.AddHostPathMapping(pod, container, "cabundle", filepath.Join(b.PathSrvKubernetes(), "ca.crt"))

5
nodeup/pkg/model/kubelet.go
View File

@ -283,13 +283,10 @@ func (b *KubeletBuilder) buildSystemdEnvironmentFile(kubeletConfig *kops.Kubelet
return nil, fmt.Errorf("error building kubelet flags: %v", err)
}
// Add cloud config file if needed
// We build this flag differently because it depends on CloudConfig, and to expose it directly
// would be a degree of freedom we don't have (we'd have to write the config to different files)
// We can always add this later if it is needed.
if b.Cluster.Spec.CloudConfig != nil {
flags += " --cloud-config=" + InTreeCloudConfigFilePath
}
flags += " --cloud-config=" + InTreeCloudConfigFilePath
if b.UsesSecondaryIP() {
localIP, err := b.GetMetadataLocalIP()

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

@ -196,6 +196,8 @@ type CloudProviderSpec struct {
// AWSSpec configures the AWS cloud provider.
type AWSSpec struct {
// EBSCSIDriverSpec is the config for the EBS CSI driver.
EBSCSIDriver *EBSCSIDriverSpec `json:"ebsCSIDriver,omitempty"`
// NodeTerminationHandler determines the node termination handler configuration.
NodeTerminationHandler *NodeTerminationHandlerSpec `json:"nodeTerminationHandler,omitempty"`
// LoadbalancerController determines the Load Balancer Controller configuration.

6
pkg/apis/kops/componentconfig.go
View File

@ -873,14 +873,12 @@ type CloudConfiguration struct {
// Spotinst cloud-config specs
SpotinstProduct *string `json:"spotinstProduct,omitempty"`
SpotinstOrientation *string `json:"spotinstOrientation,omitempty"`
// AWSEBSCSIDriver is the config for the AWS EBS CSI driver
AWSEBSCSIDriver *AWSEBSCSIDriver `json:"awsEBSCSIDriver,omitempty"`
// GCPPDCSIDriver is the config for the GCP PD CSI driver
GCPPDCSIDriver *GCPPDCSIDriver `json:"gcpPDCSIDriver,omitempty"`
}
// AWSEBSCSIDriver is the config for the AWS EBS CSI driver
type AWSEBSCSIDriver struct {
// EBSCSIDriverSpec is the config for the AWS EBS CSI driver
type EBSCSIDriverSpec struct {
// Enabled enables the AWS EBS CSI driver
// Default: false
Enabled *bool `json:"enabled,omitempty"`

7
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -900,13 +900,14 @@ type CloudConfiguration struct {
// +k8s:conversion-gen=false
Azure *AzureSpec `json:"azure,omitempty"`
// AWSEBSCSIDriver is the config for the AWS EBS CSI driver
AWSEBSCSIDriver *AWSEBSCSIDriver `json:"awsEBSCSIDriver,omitempty"`
// +k8s:conversion-gen=false
AWSEBSCSIDriver *EBSCSIDriverSpec `json:"awsEBSCSIDriver,omitempty"`
// GCPPDCSIDriver is the config for the GCP PD CSI driver
GCPPDCSIDriver *GCPPDCSIDriver `json:"gcpPDCSIDriver,omitempty"`
}
// AWSEBSCSIDriver is the config for the AWS EBS CSI driver
type AWSEBSCSIDriver struct {
// EBSCSIDriverSpec is the config for the AWS EBS CSI driver
type EBSCSIDriverSpec struct {
// Enabled enables the AWS EBS CSI driver
// Default: false
Enabled *bool `json:"enabled,omitempty"`

20
pkg/apis/kops/v1alpha2/conversion.go
View File

@ -144,6 +144,17 @@ func Convert_v1alpha2_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *kops
string(kops.CloudProviderScaleway),
})
}
if in.CloudConfig != nil {
if in.CloudConfig.AWSEBSCSIDriver != nil {
if out.CloudProvider.AWS == nil {
return field.Forbidden(field.NewPath("spec").Child("cloudConfig", "awsEBSCSIDriver"), "EBS CSI driver supports only AWS")
}
out.CloudProvider.AWS.EBSCSIDriver = &kops.EBSCSIDriverSpec{}
if err := autoConvert_v1alpha2_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(in.CloudConfig.AWSEBSCSIDriver, out.CloudProvider.AWS.EBSCSIDriver, s); err != nil {
return err
}
}
}
if in.NodeTerminationHandler != nil {
if out.CloudProvider.AWS == nil {
return field.Forbidden(field.NewPath("spec").Child("nodeTerminationHandler"), "node termination handler supports only AWS")
@ -276,6 +287,15 @@ func Convert_kops_ClusterSpec_To_v1alpha2_ClusterSpec(in *kops.ClusterSpec, out
switch kops.CloudProviderID(out.LegacyCloudProvider) {
case kops.CloudProviderAWS:
aws := in.CloudProvider.AWS
if aws.EBSCSIDriver != nil {
if out.CloudConfig == nil {
out.CloudConfig = &CloudConfiguration{}
}
out.CloudConfig.AWSEBSCSIDriver = &EBSCSIDriverSpec{}
if err := autoConvert_kops_EBSCSIDriverSpec_To_v1alpha2_EBSCSIDriverSpec(aws.EBSCSIDriver, out.CloudConfig.AWSEBSCSIDriver, s); err != nil {
return err
}
}
if aws.NodeTerminationHandler != nil {
out.NodeTerminationHandler = &NodeTerminationHandlerSpec{}
if err := autoConvert_kops_NodeTerminationHandlerSpec_To_v1alpha2_NodeTerminationHandlerSpec(aws.NodeTerminationHandler, out.NodeTerminationHandler, s); err != nil {

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

@ -64,16 +64,6 @@ func RegisterConversions(s *runtime.Scheme) error {
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*AWSEBSCSIDriver)(nil), (*kops.AWSEBSCSIDriver)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha2_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver(a.(*AWSEBSCSIDriver), b.(*kops.AWSEBSCSIDriver), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*kops.AWSEBSCSIDriver)(nil), (*AWSEBSCSIDriver)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_kops_AWSEBSCSIDriver_To_v1alpha2_AWSEBSCSIDriver(a.(*kops.AWSEBSCSIDriver), b.(*AWSEBSCSIDriver), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*AWSPermission)(nil), (*kops.AWSPermission)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha2_AWSPermission_To_kops_AWSPermission(a.(*AWSPermission), b.(*kops.AWSPermission), scope)
}); err != nil {
@ -354,6 +344,16 @@ func RegisterConversions(s *runtime.Scheme) error {
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*EBSCSIDriverSpec)(nil), (*kops.EBSCSIDriverSpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha2_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(a.(*EBSCSIDriverSpec), b.(*kops.EBSCSIDriverSpec), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*kops.EBSCSIDriverSpec)(nil), (*EBSCSIDriverSpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_kops_EBSCSIDriverSpec_To_v1alpha2_EBSCSIDriverSpec(a.(*kops.EBSCSIDriverSpec), b.(*EBSCSIDriverSpec), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*EgressProxySpec)(nil), (*kops.EgressProxySpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha2_EgressProxySpec_To_kops_EgressProxySpec(a.(*EgressProxySpec), b.(*kops.EgressProxySpec), scope)
}); err != nil {
@ -1375,34 +1375,6 @@ func Convert_kops_AWSAuthenticationSpec_To_v1alpha2_AWSAuthenticationSpec(in *ko
return autoConvert_kops_AWSAuthenticationSpec_To_v1alpha2_AWSAuthenticationSpec(in, out, s)
}
func autoConvert_v1alpha2_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver(in *AWSEBSCSIDriver, out *kops.AWSEBSCSIDriver, s conversion.Scope) error {
out.Enabled = in.Enabled
out.Managed = in.Managed
out.Version = in.Version
out.VolumeAttachLimit = in.VolumeAttachLimit
out.PodAnnotations = in.PodAnnotations
return nil
}
// Convert_v1alpha2_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver is an autogenerated conversion function.
func Convert_v1alpha2_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver(in *AWSEBSCSIDriver, out *kops.AWSEBSCSIDriver, s conversion.Scope) error {
return autoConvert_v1alpha2_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver(in, out, s)
}
func autoConvert_kops_AWSEBSCSIDriver_To_v1alpha2_AWSEBSCSIDriver(in *kops.AWSEBSCSIDriver, out *AWSEBSCSIDriver, s conversion.Scope) error {
out.Enabled = in.Enabled
out.Managed = in.Managed
out.Version = in.Version
out.VolumeAttachLimit = in.VolumeAttachLimit
out.PodAnnotations = in.PodAnnotations
return nil
}
// Convert_kops_AWSEBSCSIDriver_To_v1alpha2_AWSEBSCSIDriver is an autogenerated conversion function.
func Convert_kops_AWSEBSCSIDriver_To_v1alpha2_AWSEBSCSIDriver(in *kops.AWSEBSCSIDriver, out *AWSEBSCSIDriver, s conversion.Scope) error {
return autoConvert_kops_AWSEBSCSIDriver_To_v1alpha2_AWSEBSCSIDriver(in, out, s)
}
func autoConvert_v1alpha2_AWSPermission_To_kops_AWSPermission(in *AWSPermission, out *kops.AWSPermission, s conversion.Scope) error {
out.PolicyARNs = in.PolicyARNs
out.InlinePolicy = in.InlinePolicy
@ -2137,15 +2109,7 @@ func autoConvert_v1alpha2_CloudConfiguration_To_kops_CloudConfiguration(in *Clou
out.SpotinstOrientation = in.SpotinstOrientation
// INFO: in.Openstack opted out of conversion generation
// INFO: in.Azure opted out of conversion generation
if in.AWSEBSCSIDriver != nil {
in, out := &in.AWSEBSCSIDriver, &out.AWSEBSCSIDriver
*out = new(kops.AWSEBSCSIDriver)
if err := Convert_v1alpha2_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver(*in, *out, s); err != nil {
return err
}
} else {
out.AWSEBSCSIDriver = nil
}
// INFO: in.AWSEBSCSIDriver opted out of conversion generation
if in.GCPPDCSIDriver != nil {
in, out := &in.GCPPDCSIDriver, &out.GCPPDCSIDriver
*out = new(kops.GCPPDCSIDriver)
@ -2174,15 +2138,6 @@ func autoConvert_kops_CloudConfiguration_To_v1alpha2_CloudConfiguration(in *kops
out.ElbSecurityGroup = in.ElbSecurityGroup
out.SpotinstProduct = in.SpotinstProduct
out.SpotinstOrientation = in.SpotinstOrientation
if in.AWSEBSCSIDriver != nil {
in, out := &in.AWSEBSCSIDriver, &out.AWSEBSCSIDriver
*out = new(AWSEBSCSIDriver)
if err := Convert_kops_AWSEBSCSIDriver_To_v1alpha2_AWSEBSCSIDriver(*in, *out, s); err != nil {
return err
}
} else {
out.AWSEBSCSIDriver = nil
}
if in.GCPPDCSIDriver != nil {
in, out := &in.GCPPDCSIDriver, &out.GCPPDCSIDriver
*out = new(GCPPDCSIDriver)
@ -3433,6 +3388,34 @@ func Convert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfig, o
return autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in, out, s)
}
func autoConvert_v1alpha2_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(in *EBSCSIDriverSpec, out *kops.EBSCSIDriverSpec, s conversion.Scope) error {
out.Enabled = in.Enabled
out.Managed = in.Managed
out.Version = in.Version
out.VolumeAttachLimit = in.VolumeAttachLimit
out.PodAnnotations = in.PodAnnotations
return nil
}
// Convert_v1alpha2_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec is an autogenerated conversion function.
func Convert_v1alpha2_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(in *EBSCSIDriverSpec, out *kops.EBSCSIDriverSpec, s conversion.Scope) error {
return autoConvert_v1alpha2_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(in, out, s)
}
func autoConvert_kops_EBSCSIDriverSpec_To_v1alpha2_EBSCSIDriverSpec(in *kops.EBSCSIDriverSpec, out *EBSCSIDriverSpec, s conversion.Scope) error {
out.Enabled = in.Enabled
out.Managed = in.Managed
out.Version = in.Version
out.VolumeAttachLimit = in.VolumeAttachLimit
out.PodAnnotations = in.PodAnnotations
return nil
}
// Convert_kops_EBSCSIDriverSpec_To_v1alpha2_EBSCSIDriverSpec is an autogenerated conversion function.
func Convert_kops_EBSCSIDriverSpec_To_v1alpha2_EBSCSIDriverSpec(in *kops.EBSCSIDriverSpec, out *EBSCSIDriverSpec, s conversion.Scope) error {
return autoConvert_kops_EBSCSIDriverSpec_To_v1alpha2_EBSCSIDriverSpec(in, out, s)
}
func autoConvert_v1alpha2_EgressProxySpec_To_kops_EgressProxySpec(in *EgressProxySpec, out *kops.EgressProxySpec, s conversion.Scope) error {
if err := Convert_v1alpha2_HTTPProxy_To_kops_HTTPProxy(&in.HTTPProxy, &out.HTTPProxy, s); err != nil {
return err

88
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go generated
View File

@ -128,49 +128,6 @@ func (in *AWSAuthenticationSpec) DeepCopy() *AWSAuthenticationSpec {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSEBSCSIDriver) DeepCopyInto(out *AWSEBSCSIDriver) {
*out = *in
if in.Enabled != nil {
in, out := &in.Enabled, &out.Enabled
*out = new(bool)
**out = **in
}
if in.Managed != nil {
in, out := &in.Managed, &out.Managed
*out = new(bool)
**out = **in
}
if in.Version != nil {
in, out := &in.Version, &out.Version
*out = new(string)
**out = **in
}
if in.VolumeAttachLimit != nil {
in, out := &in.VolumeAttachLimit, &out.VolumeAttachLimit
*out = new(int)
**out = **in
}
if in.PodAnnotations != nil {
in, out := &in.PodAnnotations, &out.PodAnnotations
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSEBSCSIDriver.
func (in *AWSEBSCSIDriver) DeepCopy() *AWSEBSCSIDriver {
if in == nil {
return nil
}
out := new(AWSEBSCSIDriver)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSPermission) DeepCopyInto(out *AWSPermission) {
*out = *in
@ -785,7 +742,7 @@ func (in *CloudConfiguration) DeepCopyInto(out *CloudConfiguration) {
}
if in.AWSEBSCSIDriver != nil {
in, out := &in.AWSEBSCSIDriver, &out.AWSEBSCSIDriver
*out = new(AWSEBSCSIDriver)
*out = new(EBSCSIDriverSpec)
(*in).DeepCopyInto(*out)
}
if in.GCPPDCSIDriver != nil {
@ -1747,6 +1704,49 @@ func (in *DockerConfig) DeepCopy() *DockerConfig {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EBSCSIDriverSpec) DeepCopyInto(out *EBSCSIDriverSpec) {
*out = *in
if in.Enabled != nil {
in, out := &in.Enabled, &out.Enabled
*out = new(bool)
**out = **in
}
if in.Managed != nil {
in, out := &in.Managed, &out.Managed
*out = new(bool)
**out = **in
}
if in.Version != nil {
in, out := &in.Version, &out.Version
*out = new(string)
**out = **in
}
if in.VolumeAttachLimit != nil {
in, out := &in.VolumeAttachLimit, &out.VolumeAttachLimit
*out = new(int)
**out = **in
}
if in.PodAnnotations != nil {
in, out := &in.PodAnnotations, &out.PodAnnotations
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EBSCSIDriverSpec.
func (in *EBSCSIDriverSpec) DeepCopy() *EBSCSIDriverSpec {
if in == nil {
return nil
}
out := new(EBSCSIDriverSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EgressProxySpec) DeepCopyInto(out *EgressProxySpec) {
*out = *in

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

@ -192,6 +192,8 @@ type CloudProviderSpec struct {
// AWSSpec configures the AWS cloud provider.
type AWSSpec struct {
// EBSCSIDriverSpec is the config for the EBS CSI driver.
EBSCSIDriver *EBSCSIDriverSpec `json:"ebsCSIDriver,omitempty"`
// NodeTerminationHandler determines the node termination handler configuration.
NodeTerminationHandler *NodeTerminationHandlerSpec `json:"nodeTerminationHandler,omitempty"`
// LoadBalancerController determines the Load Balancer Controller configuration.

6
pkg/apis/kops/v1alpha3/componentconfig.go
View File

@ -870,14 +870,12 @@ type CloudConfiguration struct {
// Spotinst cloud-config specs
SpotinstProduct *string `json:"spotinstProduct,omitempty"`
SpotinstOrientation *string `json:"spotinstOrientation,omitempty"`
// AWSEBSCSIDriver is the config for the AWS EBS CSI driver
AWSEBSCSIDriver *AWSEBSCSIDriver `json:"awsEBSCSIDriver,omitempty"`
// GCPPDCSIDriver is the config for the GCP PD CSI driver
GCPPDCSIDriver *GCPPDCSIDriver `json:"gcpPDCSIDriver,omitempty"`
}
// AWSEBSCSIDriver is the config for the AWS EBS CSI driver
type AWSEBSCSIDriver struct {
// EBSCSIDriverSpec is the config for the AWS EBS CSI driver
type EBSCSIDriverSpec struct {
// Enabled enables the AWS EBS CSI driver
// Default: false
Enabled *bool `json:"enabled,omitempty"`

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

@ -64,16 +64,6 @@ func RegisterConversions(s *runtime.Scheme) error {
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*AWSEBSCSIDriver)(nil), (*kops.AWSEBSCSIDriver)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha3_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver(a.(*AWSEBSCSIDriver), b.(*kops.AWSEBSCSIDriver), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*kops.AWSEBSCSIDriver)(nil), (*AWSEBSCSIDriver)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_kops_AWSEBSCSIDriver_To_v1alpha3_AWSEBSCSIDriver(a.(*kops.AWSEBSCSIDriver), b.(*AWSEBSCSIDriver), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*AWSPermission)(nil), (*kops.AWSPermission)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha3_AWSPermission_To_kops_AWSPermission(a.(*AWSPermission), b.(*kops.AWSPermission), scope)
}); err != nil {
@ -404,6 +394,16 @@ func RegisterConversions(s *runtime.Scheme) error {
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*EBSCSIDriverSpec)(nil), (*kops.EBSCSIDriverSpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha3_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(a.(*EBSCSIDriverSpec), b.(*kops.EBSCSIDriverSpec), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*kops.EBSCSIDriverSpec)(nil), (*EBSCSIDriverSpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_kops_EBSCSIDriverSpec_To_v1alpha3_EBSCSIDriverSpec(a.(*kops.EBSCSIDriverSpec), b.(*EBSCSIDriverSpec), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*EgressProxySpec)(nil), (*kops.EgressProxySpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha3_EgressProxySpec_To_kops_EgressProxySpec(a.(*EgressProxySpec), b.(*kops.EgressProxySpec), scope)
}); err != nil {
@ -1385,34 +1385,6 @@ func Convert_kops_AWSAuthenticationSpec_To_v1alpha3_AWSAuthenticationSpec(in *ko
return autoConvert_kops_AWSAuthenticationSpec_To_v1alpha3_AWSAuthenticationSpec(in, out, s)
}
func autoConvert_v1alpha3_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver(in *AWSEBSCSIDriver, out *kops.AWSEBSCSIDriver, s conversion.Scope) error {
out.Enabled = in.Enabled
out.Managed = in.Managed
out.Version = in.Version
out.VolumeAttachLimit = in.VolumeAttachLimit
out.PodAnnotations = in.PodAnnotations
return nil
}
// Convert_v1alpha3_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver is an autogenerated conversion function.
func Convert_v1alpha3_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver(in *AWSEBSCSIDriver, out *kops.AWSEBSCSIDriver, s conversion.Scope) error {
return autoConvert_v1alpha3_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver(in, out, s)
}
func autoConvert_kops_AWSEBSCSIDriver_To_v1alpha3_AWSEBSCSIDriver(in *kops.AWSEBSCSIDriver, out *AWSEBSCSIDriver, s conversion.Scope) error {
out.Enabled = in.Enabled
out.Managed = in.Managed
out.Version = in.Version
out.VolumeAttachLimit = in.VolumeAttachLimit
out.PodAnnotations = in.PodAnnotations
return nil
}
// Convert_kops_AWSEBSCSIDriver_To_v1alpha3_AWSEBSCSIDriver is an autogenerated conversion function.
func Convert_kops_AWSEBSCSIDriver_To_v1alpha3_AWSEBSCSIDriver(in *kops.AWSEBSCSIDriver, out *AWSEBSCSIDriver, s conversion.Scope) error {
return autoConvert_kops_AWSEBSCSIDriver_To_v1alpha3_AWSEBSCSIDriver(in, out, s)
}
func autoConvert_v1alpha3_AWSPermission_To_kops_AWSPermission(in *AWSPermission, out *kops.AWSPermission, s conversion.Scope) error {
out.PolicyARNs = in.PolicyARNs
out.InlinePolicy = in.InlinePolicy
@ -1436,6 +1408,15 @@ func Convert_kops_AWSPermission_To_v1alpha3_AWSPermission(in *kops.AWSPermission
}
func autoConvert_v1alpha3_AWSSpec_To_kops_AWSSpec(in *AWSSpec, out *kops.AWSSpec, s conversion.Scope) error {
if in.EBSCSIDriver != nil {
in, out := &in.EBSCSIDriver, &out.EBSCSIDriver
*out = new(kops.EBSCSIDriverSpec)
if err := Convert_v1alpha3_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(*in, *out, s); err != nil {
return err
}
} else {
out.EBSCSIDriver = nil
}
if in.NodeTerminationHandler != nil {
in, out := &in.NodeTerminationHandler, &out.NodeTerminationHandler
*out = new(kops.NodeTerminationHandlerSpec)
@ -1481,6 +1462,15 @@ func Convert_v1alpha3_AWSSpec_To_kops_AWSSpec(in *AWSSpec, out *kops.AWSSpec, s
}
func autoConvert_kops_AWSSpec_To_v1alpha3_AWSSpec(in *kops.AWSSpec, out *AWSSpec, s conversion.Scope) error {
if in.EBSCSIDriver != nil {
in, out := &in.EBSCSIDriver, &out.EBSCSIDriver
*out = new(EBSCSIDriverSpec)
if err := Convert_kops_EBSCSIDriverSpec_To_v1alpha3_EBSCSIDriverSpec(*in, *out, s); err != nil {
return err
}
} else {
out.EBSCSIDriver = nil
}
if in.NodeTerminationHandler != nil {
in, out := &in.NodeTerminationHandler, &out.NodeTerminationHandler
*out = new(NodeTerminationHandlerSpec)
@ -2174,15 +2164,6 @@ func autoConvert_v1alpha3_CloudConfiguration_To_kops_CloudConfiguration(in *Clou
out.ElbSecurityGroup = in.ElbSecurityGroup
out.SpotinstProduct = in.SpotinstProduct
out.SpotinstOrientation = in.SpotinstOrientation
if in.AWSEBSCSIDriver != nil {
in, out := &in.AWSEBSCSIDriver, &out.AWSEBSCSIDriver
*out = new(kops.AWSEBSCSIDriver)
if err := Convert_v1alpha3_AWSEBSCSIDriver_To_kops_AWSEBSCSIDriver(*in, *out, s); err != nil {
return err
}
} else {
out.AWSEBSCSIDriver = nil
}
if in.GCPPDCSIDriver != nil {
in, out := &in.GCPPDCSIDriver, &out.GCPPDCSIDriver
*out = new(kops.GCPPDCSIDriver)
@ -2211,15 +2192,6 @@ func autoConvert_kops_CloudConfiguration_To_v1alpha3_CloudConfiguration(in *kops
out.ElbSecurityGroup = in.ElbSecurityGroup
out.SpotinstProduct = in.SpotinstProduct
out.SpotinstOrientation = in.SpotinstOrientation
if in.AWSEBSCSIDriver != nil {
in, out := &in.AWSEBSCSIDriver, &out.AWSEBSCSIDriver
*out = new(AWSEBSCSIDriver)
if err := Convert_kops_AWSEBSCSIDriver_To_v1alpha3_AWSEBSCSIDriver(*in, *out, s); err != nil {
return err
}
} else {
out.AWSEBSCSIDriver = nil
}
if in.GCPPDCSIDriver != nil {
in, out := &in.GCPPDCSIDriver, &out.GCPPDCSIDriver
*out = new(GCPPDCSIDriver)
@ -3607,6 +3579,34 @@ func Convert_kops_DockerConfig_To_v1alpha3_DockerConfig(in *kops.DockerConfig, o
return autoConvert_kops_DockerConfig_To_v1alpha3_DockerConfig(in, out, s)
}
func autoConvert_v1alpha3_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(in *EBSCSIDriverSpec, out *kops.EBSCSIDriverSpec, s conversion.Scope) error {
out.Enabled = in.Enabled
out.Managed = in.Managed
out.Version = in.Version
out.VolumeAttachLimit = in.VolumeAttachLimit
out.PodAnnotations = in.PodAnnotations
return nil
}
// Convert_v1alpha3_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec is an autogenerated conversion function.
func Convert_v1alpha3_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(in *EBSCSIDriverSpec, out *kops.EBSCSIDriverSpec, s conversion.Scope) error {
return autoConvert_v1alpha3_EBSCSIDriverSpec_To_kops_EBSCSIDriverSpec(in, out, s)
}
func autoConvert_kops_EBSCSIDriverSpec_To_v1alpha3_EBSCSIDriverSpec(in *kops.EBSCSIDriverSpec, out *EBSCSIDriverSpec, s conversion.Scope) error {
out.Enabled = in.Enabled
out.Managed = in.Managed
out.Version = in.Version
out.VolumeAttachLimit = in.VolumeAttachLimit
out.PodAnnotations = in.PodAnnotations
return nil
}
// Convert_kops_EBSCSIDriverSpec_To_v1alpha3_EBSCSIDriverSpec is an autogenerated conversion function.
func Convert_kops_EBSCSIDriverSpec_To_v1alpha3_EBSCSIDriverSpec(in *kops.EBSCSIDriverSpec, out *EBSCSIDriverSpec, s conversion.Scope) error {
return autoConvert_kops_EBSCSIDriverSpec_To_v1alpha3_EBSCSIDriverSpec(in, out, s)
}
func autoConvert_v1alpha3_EgressProxySpec_To_kops_EgressProxySpec(in *EgressProxySpec, out *kops.EgressProxySpec, s conversion.Scope) error {
if err := Convert_v1alpha3_HTTPProxy_To_kops_HTTPProxy(&in.HTTPProxy, &out.HTTPProxy, s); err != nil {
return err

96
pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go generated
View File

@ -129,49 +129,6 @@ func (in *AWSAuthenticationSpec) DeepCopy() *AWSAuthenticationSpec {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSEBSCSIDriver) DeepCopyInto(out *AWSEBSCSIDriver) {
*out = *in
if in.Enabled != nil {
in, out := &in.Enabled, &out.Enabled
*out = new(bool)
**out = **in
}
if in.Managed != nil {
in, out := &in.Managed, &out.Managed
*out = new(bool)
**out = **in
}
if in.Version != nil {
in, out := &in.Version, &out.Version
*out = new(string)
**out = **in
}
if in.VolumeAttachLimit != nil {
in, out := &in.VolumeAttachLimit, &out.VolumeAttachLimit
*out = new(int)
**out = **in
}
if in.PodAnnotations != nil {
in, out := &in.PodAnnotations, &out.PodAnnotations
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSEBSCSIDriver.
func (in *AWSEBSCSIDriver) DeepCopy() *AWSEBSCSIDriver {
if in == nil {
return nil
}
out := new(AWSEBSCSIDriver)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSPermission) DeepCopyInto(out *AWSPermission) {
*out = *in
@ -196,6 +153,11 @@ func (in *AWSPermission) DeepCopy() *AWSPermission {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSSpec) DeepCopyInto(out *AWSSpec) {
*out = *in
if in.EBSCSIDriver != nil {
in, out := &in.EBSCSIDriver, &out.EBSCSIDriver
*out = new(EBSCSIDriverSpec)
(*in).DeepCopyInto(*out)
}
if in.NodeTerminationHandler != nil {
in, out := &in.NodeTerminationHandler, &out.NodeTerminationHandler
*out = new(NodeTerminationHandlerSpec)
@ -710,11 +672,6 @@ func (in *CloudConfiguration) DeepCopyInto(out *CloudConfiguration) {
*out = new(string)
**out = **in
}
if in.AWSEBSCSIDriver != nil {
in, out := &in.AWSEBSCSIDriver, &out.AWSEBSCSIDriver
*out = new(AWSEBSCSIDriver)
(*in).DeepCopyInto(*out)
}
if in.GCPPDCSIDriver != nil {
in, out := &in.GCPPDCSIDriver, &out.GCPPDCSIDriver
*out = new(GCPPDCSIDriver)
@ -1653,6 +1610,49 @@ func (in *DockerConfig) DeepCopy() *DockerConfig {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EBSCSIDriverSpec) DeepCopyInto(out *EBSCSIDriverSpec) {
*out = *in
if in.Enabled != nil {
in, out := &in.Enabled, &out.Enabled
*out = new(bool)
**out = **in
}
if in.Managed != nil {
in, out := &in.Managed, &out.Managed
*out = new(bool)
**out = **in
}
if in.Version != nil {
in, out := &in.Version, &out.Version
*out = new(string)
**out = **in
}
if in.VolumeAttachLimit != nil {
in, out := &in.VolumeAttachLimit, &out.VolumeAttachLimit
*out = new(int)
**out = **in
}
if in.PodAnnotations != nil {
in, out := &in.PodAnnotations, &out.PodAnnotations
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EBSCSIDriverSpec.
func (in *EBSCSIDriverSpec) DeepCopy() *EBSCSIDriverSpec {
if in == nil {
return nil
}
out := new(EBSCSIDriverSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EgressProxySpec) DeepCopyInto(out *EgressProxySpec) {
*out = *in

8
pkg/apis/kops/validation/aws.go
View File

@ -72,7 +72,7 @@ func awsValidateExternalCloudControllerManager(cluster *kops.Cluster) (allErrs f
fldPath := field.NewPath("spec", "externalCloudControllerManager")
if !hasAWSEBSCSIDriver(c) {
allErrs = append(allErrs, field.Forbidden(fldPath,
"AWS external CCM cannot be used without enabling spec.cloudConfig.AWSEBSCSIDriver."))
"AWS external CCM cannot be used without enabling spec.cloudProvider.aws.ebsCSIDriverSpec."))
}
return allErrs
}
@ -377,12 +377,12 @@ func awsValidateIAMAuthenticator(fieldPath *field.Path, spec *kops.AWSAuthentica
}
func hasAWSEBSCSIDriver(c kops.ClusterSpec) bool {
// AWSEBSCSIDriver will have a default value, so if this is all false, it will be populated on next pass
if c.CloudConfig == nil || c.CloudConfig.AWSEBSCSIDriver == nil || c.CloudConfig.AWSEBSCSIDriver.Enabled == nil {
// EBSCSIDriverSpec will have a default value, so if this is all false, it will be populated on next pass
if c.CloudProvider.AWS.EBSCSIDriver == nil || c.CloudProvider.AWS.EBSCSIDriver.Enabled == nil {
return true
}
return *c.CloudConfig.AWSEBSCSIDriver.Enabled
return *c.CloudProvider.AWS.EBSCSIDriver.Enabled
}
func awsValidateAdditionalRoutes(fieldPath *field.Path, routes []kops.RouteSpec, cidr string) field.ErrorList {

19
pkg/apis/kops/validation/aws_test.go
View File

@ -40,9 +40,11 @@ func TestAWSValidateExternalCloudConfig(t *testing.T) {
{
Input: kops.ClusterSpec{
ExternalCloudControllerManager: &kops.CloudControllerManagerConfig{},
CloudConfig: &kops.CloudConfiguration{
AWSEBSCSIDriver: &kops.AWSEBSCSIDriver{
Enabled: fi.PtrTo(false),
CloudProvider: kops.CloudProviderSpec{
AWS: &kops.AWSSpec{
EBSCSIDriver: &kops.EBSCSIDriverSpec{
Enabled: fi.PtrTo(false),
},
},
},
},
@ -51,9 +53,11 @@ func TestAWSValidateExternalCloudConfig(t *testing.T) {
{
Input: kops.ClusterSpec{
ExternalCloudControllerManager: &kops.CloudControllerManagerConfig{},
CloudConfig: &kops.CloudConfiguration{
AWSEBSCSIDriver: &kops.AWSEBSCSIDriver{
Enabled: fi.PtrTo(true),
CloudProvider: kops.CloudProviderSpec{
AWS: &kops.AWSSpec{
EBSCSIDriver: &kops.EBSCSIDriverSpec{
Enabled: fi.PtrTo(true),
},
},
},
},
@ -61,6 +65,9 @@ func TestAWSValidateExternalCloudConfig(t *testing.T) {
{
Input: kops.ClusterSpec{
ExternalCloudControllerManager: &kops.CloudControllerManagerConfig{},
CloudProvider: kops.CloudProviderSpec{
AWS: &kops.AWSSpec{},
},
KubeControllerManager: &kops.KubeControllerManagerConfig{
ExternalCloudVolumePlugin: "aws",
},

96
pkg/apis/kops/zz_generated.deepcopy.go generated
View File

@ -128,49 +128,6 @@ func (in *AWSAuthenticationSpec) DeepCopy() *AWSAuthenticationSpec {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSEBSCSIDriver) DeepCopyInto(out *AWSEBSCSIDriver) {
*out = *in
if in.Enabled != nil {
in, out := &in.Enabled, &out.Enabled
*out = new(bool)
**out = **in
}
if in.Managed != nil {
in, out := &in.Managed, &out.Managed
*out = new(bool)
**out = **in
}
if in.Version != nil {
in, out := &in.Version, &out.Version
*out = new(string)
**out = **in
}
if in.VolumeAttachLimit != nil {
in, out := &in.VolumeAttachLimit, &out.VolumeAttachLimit
*out = new(int)
**out = **in
}
if in.PodAnnotations != nil {
in, out := &in.PodAnnotations, &out.PodAnnotations
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSEBSCSIDriver.
func (in *AWSEBSCSIDriver) DeepCopy() *AWSEBSCSIDriver {
if in == nil {
return nil
}
out := new(AWSEBSCSIDriver)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSPermission) DeepCopyInto(out *AWSPermission) {
*out = *in
@ -195,6 +152,11 @@ func (in *AWSPermission) DeepCopy() *AWSPermission {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AWSSpec) DeepCopyInto(out *AWSSpec) {
*out = *in
if in.EBSCSIDriver != nil {
in, out := &in.EBSCSIDriver, &out.EBSCSIDriver
*out = new(EBSCSIDriverSpec)
(*in).DeepCopyInto(*out)
}
if in.NodeTerminationHandler != nil {
in, out := &in.NodeTerminationHandler, &out.NodeTerminationHandler
*out = new(NodeTerminationHandlerSpec)
@ -807,11 +769,6 @@ func (in *CloudConfiguration) DeepCopyInto(out *CloudConfiguration) {
*out = new(string)
**out = **in
}
if in.AWSEBSCSIDriver != nil {
in, out := &in.AWSEBSCSIDriver, &out.AWSEBSCSIDriver
*out = new(AWSEBSCSIDriver)
(*in).DeepCopyInto(*out)
}
if in.GCPPDCSIDriver != nil {
in, out := &in.GCPPDCSIDriver, &out.GCPPDCSIDriver
*out = new(GCPPDCSIDriver)
@ -1773,6 +1730,49 @@ func (in *DockerConfig) DeepCopy() *DockerConfig {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EBSCSIDriverSpec) DeepCopyInto(out *EBSCSIDriverSpec) {
*out = *in
if in.Enabled != nil {
in, out := &in.Enabled, &out.Enabled
*out = new(bool)
**out = **in
}
if in.Managed != nil {
in, out := &in.Managed, &out.Managed
*out = new(bool)
**out = **in
}
if in.Version != nil {
in, out := &in.Version, &out.Version
*out = new(string)
**out = **in
}
if in.VolumeAttachLimit != nil {
in, out := &in.VolumeAttachLimit, &out.VolumeAttachLimit
*out = new(int)
**out = **in
}
if in.PodAnnotations != nil {
in, out := &in.PodAnnotations, &out.PodAnnotations
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EBSCSIDriverSpec.
func (in *EBSCSIDriverSpec) DeepCopy() *EBSCSIDriverSpec {
if in == nil {
return nil
}
out := new(EBSCSIDriverSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EgressProxySpec) DeepCopyInto(out *EgressProxySpec) {
*out = *in

2
pkg/model/components/apiserver.go
View File

@ -181,7 +181,7 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
c.FeatureGates = make(map[string]string)
}
if clusterSpec.CloudConfig != nil && clusterSpec.CloudConfig.AWSEBSCSIDriver != nil && fi.ValueOf(clusterSpec.CloudConfig.AWSEBSCSIDriver.Enabled) {
if clusterSpec.CloudProvider.AWS != nil && clusterSpec.CloudProvider.AWS.EBSCSIDriver != nil && fi.ValueOf(clusterSpec.CloudProvider.AWS.EBSCSIDriver.Enabled) {
if _, found := c.FeatureGates["InTreePluginAWSUnregister"]; !found {
c.FeatureGates["InTreePluginAWSUnregister"] = "true"

11
pkg/model/components/awsebscsidriver.go
View File

@ -30,18 +30,17 @@ type AWSEBSCSIDriverOptionsBuilder struct {
var _ loader.OptionsBuilder = &AWSEBSCSIDriverOptionsBuilder{}
func (b *AWSEBSCSIDriverOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec := o.(*kops.ClusterSpec)
if clusterSpec.GetCloudProvider() != kops.CloudProviderAWS {
aws := o.(*kops.ClusterSpec).CloudProvider.AWS
if aws == nil {
return nil
}
cc := clusterSpec.CloudConfig
if cc.AWSEBSCSIDriver == nil {
cc.AWSEBSCSIDriver = &kops.AWSEBSCSIDriver{
if aws.EBSCSIDriver == nil {
aws.EBSCSIDriver = &kops.EBSCSIDriverSpec{
Enabled: fi.PtrTo(b.IsKubernetesGTE("1.22")),
}
}
c := cc.AWSEBSCSIDriver
c := aws.EBSCSIDriver
if !fi.ValueOf(c.Enabled) {
return nil

2
pkg/model/components/kubecontrollermanager.go
View File

@ -181,7 +181,7 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
}
}
if clusterSpec.CloudConfig != nil && clusterSpec.CloudConfig.AWSEBSCSIDriver != nil && fi.ValueOf(clusterSpec.CloudConfig.AWSEBSCSIDriver.Enabled) {
if clusterSpec.CloudProvider.AWS != nil && clusterSpec.CloudProvider.AWS.EBSCSIDriver != nil && fi.ValueOf(clusterSpec.CloudProvider.AWS.EBSCSIDriver.Enabled) {
if kcm.FeatureGates == nil {
kcm.FeatureGates = make(map[string]string)

2
pkg/model/components/kubelet.go
View File

@ -188,7 +188,7 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec.Kubelet.FeatureGates = make(map[string]string)
}
if clusterSpec.CloudConfig != nil && clusterSpec.CloudConfig.AWSEBSCSIDriver != nil && fi.ValueOf(clusterSpec.CloudConfig.AWSEBSCSIDriver.Enabled) {
if clusterSpec.CloudProvider.AWS != nil && clusterSpec.CloudProvider.AWS.EBSCSIDriver != nil && fi.ValueOf(clusterSpec.CloudProvider.AWS.EBSCSIDriver.Enabled) {
if _, found := clusterSpec.Kubelet.FeatureGates["CSIMigrationAWS"]; !found {
clusterSpec.Kubelet.FeatureGates["CSIMigrationAWS"] = "true"
}

2
pkg/model/components/kubescheduler.go
View File

@ -57,7 +57,7 @@ func (b *KubeSchedulerOptionsBuilder) BuildOptions(o interface{}) error {
}
}
if clusterSpec.CloudConfig != nil && clusterSpec.CloudConfig.AWSEBSCSIDriver != nil && fi.ValueOf(clusterSpec.CloudConfig.AWSEBSCSIDriver.Enabled) {
if clusterSpec.CloudProvider.AWS != nil && clusterSpec.CloudProvider.AWS.EBSCSIDriver != nil && fi.ValueOf(clusterSpec.CloudProvider.AWS.EBSCSIDriver.Enabled) {
if config.FeatureGates == nil {
config.FeatureGates = make(map[string]string)

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

@ -164,11 +164,10 @@ func TestPolicyGeneration(t *testing.T) {
},
},
CloudProvider: kops.CloudProviderSpec{
AWS: &kops.AWSSpec{},
},
CloudConfig: &kops.CloudConfiguration{
AWSEBSCSIDriver: &kops.AWSEBSCSIDriver{
Enabled: fi.PtrTo(true),
AWS: &kops.AWSSpec{
EBSCSIDriver: &kops.EBSCSIDriverSpec{
Enabled: fi.PtrTo(true),
},
},
},
Networking: kops.NetworkingSpec{

3
tests/integration/conversion/aws/v1alpha2.yaml
View File

@ -24,6 +24,9 @@ spec:
awsLoadBalancerController:
enableWAF: true
channel: stable
cloudConfig:
awsEBSCSIDriver:
volumeAttachLimit: 65
cloudProvider: aws
configBase: memfs://clusters.example.com/minimal.example.com
egressProxy:

3
tests/integration/conversion/aws/v1alpha3.yaml
View File

@ -22,8 +22,11 @@ spec:
authorization:
alwaysAllow: {}
channel: stable
cloudConfig: {}
cloudProvider:
aws:
ebsCSIDriver:
volumeAttachLimit: 65
loadBalancerController:
enableWAF: true
nodeTerminationHandler:

3
tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
View File

@ -133,8 +133,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
View File

@ -133,9 +133,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
View File

@ -133,9 +133,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
View File

@ -131,7 +131,7 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir
echo "H4sIAAAAAAAA/+xWX5PaNhB/96fQTCdvORvnrmnryQuBNEeTS11Imr4u0mJUZMldSebop+9IsoG7kGQ6ec0wA3j/af/89idzZbyYGb2RTZUxBnv76uVqtlrMSfZIQcQYalgrFBXbgLKYMdaChgZXzhA0OFNgLdqKOfKYcaMdSI209NrJFit2lIiTUoTAyjRvsUdVMak3JmOsR7LS6IqV+U1eXmfC8F3Kwe5kt9DWgVLDOag5HTonjR6SZ9orlaHjYqa8dUg2OGKP2tlUxjH8dQof6pD6sm7n1zitFyukoQuglNnXJHupsAm9iFkwBtroQ2u8nXq3PXUIOjn1QqLmGE+/YiEiaXRoc9vzXOAGvHLJNB0zM167ipVB5t3WkPwXQoF3RmDFpmoPBzsNaWSMraUWUyEIra3YJI+fjLE4zZpMLwVSFaaZjeObilbaUGOtfCP1kNU7aNF2wPGt3CA/cIVR/Fa20i1BN0jxOSQoOU45DzlG0TwVcA6Cc/l7o5Bi+ivkRoukvPMOnNTNMZmPuN4as4vKP0FJ8Xn1OyNwidaR5CFslC3RGk8c//DGQSjVcZGaOdS3da6zVVGUz36KTSqrm8mkfGj5e49EUoyDKhJmfrjo+ixjTLbQYMUIG2kdHfLdzzaXpggDvoJO2oSZvsyflXEoQaHQ1YQbJMJxbu8P3XjkQjskDWpRx8dbY52GNo3i1f2Z7rQyIRHCfzxat0UQSBEZKOJAU1RoGsIGnKHHtq/uHcFt/Buykvejy19XS2yNw6tocfXY7zUZ3yW/xw5R9dj+gw2pt3jZJWjDbiP3hLUhV7Gbm+soOUfbwlofwDzOAzqZy6FhOTdtF5qZ4z20ncIg+CTCbx/frD4sF/8jRGE61FIUfVn8vd/ZU8SBWxZ1XI6KlZNJ/vwm4KOIjGLTOrwEvkMtqgizxCYzox0ZpZDuInseWYWDw4Dt2WK+tCdecQ74do7hexk2iEuFq4PmNZI0omJlO7Gf23iesgwRU4q/PE8plidlAEog54v945FTPeEshF8a7wLBj+T2pQXgxzKv2qHO0yaohD6FcYMT857JjsU/hLm3+JB/ZoQCtZOgxn6Fo2sy94fqq9V3fpkgGnXtV8rpYtCzCs4yCwYrvkXhVZrmlwLZo+G3tWMgk+rzVw9vwioO9zezB+uwFUf50hhXseIryJm/W51hu5ycaUy8NMfHPOBXHS+ZOa5900jd3IIWKqz8WAP2ibZvgUTFWmwNHXLoQarg96KcTO7kU20EbuwD8ZNRKMOv/ZUQX/z45Gls9Semo/SB7cDACdI1hFYVPVCh5LoYulmcDD5Bn0a3N7RLt+awNFpmjHVGLPSGYDa+1Cwuj78Db7G6zp8nnzvQcoPWDZmg48Xp1aBoB62NVBoCIQ0YC1Ue22m33gmz168JOI6UcB0Z4YJqRtJJDqo2woa52qyFEPnNdzB9B9O3g+k/AAAA//8BAAD//2cAbMVEDAAA" | base64 -d | gzip -d > conf/cluster_spec.yaml
echo "H4sIAAAAAAAA/+xWQXPbNhO961dg5pvcIlKM/aUtJxdVSmM1ccpKSdMrBKwoVCDALgDK6q/vLEBKsi3H08k14xlL3F0s3u6+fZTQNsiZNRtVlyPGGm54DStvkdcw09w5cCXzGGAkrPFcGcBlMF41ULKjRZ6ckrJoW3+ADnTJlNnYEWMdoFPWlKzIrrPiaiSt2AFSqNupdmGc51r394AReGi9sqaHxUzQegReyJkOzgM6OggdGB+/naW/SumpDmUu+3ZhDdNqsQLsEgKutd1XqDqloQbZo2CMG2sOjQ1uGvy2ZBuuXTS3ahqkAiMg3j5mlBENeHCZ60QmYcOD9ik0XTOzwfiSFWQLfmtR/cOpwFsroWRTvecHNyUYI8bWysiplAjOlWySxb8RY3FOFdpOScCS8b2jHhi+1jCVjXJUY6VDrUyP6iNvwLVcwAe1AXEQGqL5g2qUX3JTA8ZnAqgETIUgjNE0TwWck+Dc/slqwAh/BcIamZy3wXOvTH0E8wXWW2t30fkH10o+7f5oJSzBeVSC0kbbEpwNKOD3YD2nUr2QqZl9fVvvW1fmefHqh9ikoryeTIr7kb91gKjkMKg8ceZ/F4++GjGmGl5DyRBq5Twest2PLlM2pwGPeatc4kxXZK+KOBRyaPAVwgYQYZjbp0M7XLkwHtBwvaji44113vAmjeLt3ZnvtDIEBOHvAM5vgUvAyAyQcaApK69rhJp7iw9j39555DfxK6FSd8ORP8dLaKyHcYwYPzz3Dm1o07mHB6LrYfxnR9AbuHyEvLTbIAJCZdGX7Pr6KlrO2bZwLhCZh3nwVmWqb1gmbNNSMzO4402rgQyPMvz65f3q83LxH1LktgWjZN4V+V/7nTtl7LVlUcXlKFkxmWSvr4kfeVQUl9bhZy52YGQZaZbUZGaNR6s14G1Uz6OqCO6BuD1bzJfupCvec7GdA/1f0gYJpWF1MKICVFaWrGgm7qmNFwklZUwQf3qdIBYnJxGFxPli/0TU1IAwo/RLGzwJ/CBuX1sAcSxz3PR1njZBJ/ZpiBuclPfMdiz+Ps2Dg/v6M0OQYLzieugXXV2hvTuUz1bfhmWiaPQ1z5TTxqRnFZwho4CV2IIMOk3za4ncMfDb2tGLSfn0q0fUtIpzVKRCzB2ch0Ye7UtrfcnyZ5gz/7g643YxOfPY+NIcHjPirz6+ZOawDnWtTH3DjdS08kMN0CXZvuEoS9ZAY/GQ8Y4rTefeFJPJrXpprISNu2d+MRgVfbpfEODN/1+8jK1+FDpY78X2CpwoXXFqVd5xzLVa530381PAI/YZ8HuLu/TW7JfGqBFjrZULs0E+G37ULC6Pv+XBQXmVvU5nbrlRG3C+RwJe5KefBnnTe12UUkoE2HOMqjy2022Dl3Zv3iEXMEjCVVSEC64ZKq8E15WVjubqRg2nzO+/k+k7mb6dTP8CAAD//wEAAP//ZDsHch4MAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml
echo "H4sIAAAAAAAA/1SOsU7DMBRFd3+FfyBN2SJLDNhDEyFKg0TT9eG80ES2n+VnQ8TXo6hT1qt7jo5xVMZLop95xKQk/LIwFKb5WwOjkh79xKqurSucMfEBV/DR4cGSry35mJB3o+gCZwgWT4lKPIPfJLCxVeEqI+fqCfanD3KopKGQE7mLg4DiTCOW+Ahpge9Kvr22TVqaqb++fPX97e929et7p08d6WNsBt1GM0QY7svx81n8AwAA//8BAAD//+IbB8fVAAAA" | base64 -d | gzip -d > conf/kube_env.yaml

2
tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
View File

@ -131,7 +131,7 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir
echo "H4sIAAAAAAAA/2ySz27bMAzG734KXnrrZLvtik3oZUu2NcBaBMkTMBbjEpHFTJSc5e0HO3Gzbj0Z/j6Kf35k4yW7mYQtt7YAwIN++7qerRfzyD3FQQKggBtPzsIWvVIB0GHAltZJIrY086hKaiHFTEUjISEHiqscEndk4VVxF9MNib20P6knb4HDVgqAnqKyBAu1uTP1beGk2Z160B3vF0ETen+us8sbWkb5fRzsxmdNFGeL+cpCXVXm872pTFXW9WDu84p+ZdI0el0BwB22ZCFSy5ri0ew+qWEph5wf9mPSvjY3tanedHkzFvWURlBBwrGTrF9yermQadooeX+GB3rURJ171VciyUI5dizZLaP07IZAPOhljPnz+jTF/Z2pTF395UiHHOz0a7w06ItpQXPa5Lbl0D5icJ7itBIA6rlJLOERo7PQUSfxaLBH9sO7h7qqnvg6iKOtvpGvJpGHr36PRA8fr65HfP+FTuqb2AJggNaMB7bEAVXZYyw9b8ozzfIS8A9ugEDpIHG39Lnl8IzjOQUuAPbiFmEbcTZd1OL9le4xK9lbc39684SBt6Tp3AmlZqweAyXSsju7wy5OiSiumxdyeZzyFae+5OTkEH5EbGhJkcVZuK30fWsWOXGDfilOh71q8QcAAP//AQAA//9u6M/pdAMAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml
echo "H4sIAAAAAAAA/2xSwW7bMAy9+yt46a2T7bYrNqGXIcHWAGsRpF/AWIxLRBY9SnKXvx/kJu2y9WT4vSc+8pGdl+wWEnbc2wpgwIA9PSVR7GnhMUaKFpJmqjoJCTmQbnJIPJCFN8S9k65U8dL/pIm8BQ47qQAm0sgSLLTmxrTXlZNuT1qkcc/jKsSE3h999nlLa5Xfh0J3PsdEulgtNxbapjFfb01jmrptCznmDf3KFNPMDRUAD9iTBaWeY9KD2X+JhqUuNT+Nc9GpNVetac66vJpNPaViiUHCYZAcv+X0bGGHPlIx61XyuFSeSC3EQ0w0uDd8I5Is1HPHkt1aZWJXhPgS38dYPj69TnF7YxrTNn8xMiAHe/o1Xjr0FQAF3Hpa0jb3PYf+HoPzpKeVANDEXWIJ96jOwkCD6MHghOzLu7u2aR74MoijXTyDL04gl2/8rkR3ny8u5/j+k57QM20FUELr5tNZY4mqnlBrz9v6mGb9LvgnboBA6UV0v/a55/CI8zkFrgBGcauwU1ycLmr18UpHzJHstbl9ffOAgXcU07ETSt3sroESxXo4smUXr4VIn7pncnme8i3O+JyTk5fwQ7GjNSmLs3DdxI+phXLiDv1aXCx7jdUfAAAA//8BAAD//1htlDFOAwAA" | base64 -d | gzip -d > conf/cluster_spec.yaml
echo "H4sIAAAAAAAA/6yUS4+qSBTH934K9ua2iIpg0osDVSDaIC/h0jvE4qE8ioeWmvnwE+1JbiZzM5lMuha1+P9zfouTX45aNpej3TXX4ki6FRezfqQ2dVpkHumupFuNOE4FlXRDkRZJPJB+xf0x4jiO+/F8CtYNi1Ox6xuaoYKPX+mrNw1DOZxUFdwiA2YokBmmRsFqFSRZHpIE2Hsm8LrqtbpnHGbIwYrK9mAq2U07wf4FUTIrUMD0UThMoyq4H6qA//xpDpGA2TpPLPOEmfWAmYkStkPAwmf2+JW9IK/iBJHpRkyDCAWOgzCbdsdwUybVojzqweMjtHJTYww50WbbfBr5NbHAwYriAHpBPAbMg40ClmbMHh3vn6Vz14fSlZ1Skz42uzJ0JHEqXvVZZMdCC5mxDObNlqUBfzey6QtyGsZrMZ3bE3a2wfZtP3WpbNylZo2xxngVGAaILdXEwFAWocDlbXDWEwUcBBnWvxYLkg7T/REzrEyYo5lgKpBKbO28BnaKEmHN0meP4OQnH+WGoX4zn2xlFCy3Tb6HvyD/3DzwGBTpyM/SSGDLcEvTnSC3hiAv6EVQ50ksQxHoO5p5ifSCDJXTt2KX3IaZP+4OC0m2g+HBV2ySbP3b7ixma0FV1fF9nd4F9v7+yxtsod9b83+tulZezO+gjKqf2++1yjeF31v1LL7NKlMTtXn8eaSEd/f0fj/HCg3Zp1qzQ5rmkb5j47QX3ePHZd8uHdWqNtUEt8sXJAx3j8KMUGHI3iEpKRqLTrHhrRluKQ3232jVh1FREdyTjWAt1rkx7pMwGGaOfKj/1arACW4Lcz9cwCDEvthys5jeBuoLnqhd00LazA31VpdfasrKco+ES58ngWYPMWk+ZD29SHE0324U0rbZojmV87Zyaz8//Rer+q9LxuXDQPvVZHJuaP8jaeqha8qSdG9FPZCujsu3pKloR/r+jdziipbkGaxmsiRNRkbdD3GdEL1rLtSKK7Li6uZI+r8XblOSFWc1RzJ6fhf6dUrXcZ+vOKXTbrLrfqbN4zwupp4t3yfzbq5hTSeP887OaaOh+MovbOd99CcAAAD//wEAAP//IrnY75cFAAA=" | base64 -d | gzip -d > conf/kube_env.yaml

2
tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: docker
containerd:

2
tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: docker
containerd:

2
tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

3
tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,9 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: true
version: v1.13.0
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -124,8 +124,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

Some files were not shown because too many files have changed in this diff Show More