From 24965f43b239b0a341f5a709e4f840ea03cb2626 Mon Sep 17 00:00:00 2001 From: DingGGu Date: Fri, 8 Apr 2022 18:01:17 +0900 Subject: [PATCH] Run apimachinery for nth excludeLoadBalancers --- pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 2 ++ pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go | 5 +++++ pkg/apis/kops/v1alpha3/zz_generated.conversion.go | 2 ++ pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go | 5 +++++ pkg/apis/kops/zz_generated.deepcopy.go | 5 +++++ .../data/aws_s3_bucket_object_cluster-completed.spec_content | 1 + .../data/aws_s3_bucket_object_cluster-completed.spec_content | 1 + .../data/aws_s3_bucket_object_cluster-completed.spec_content | 1 + .../data/aws_s3_bucket_object_cluster-completed.spec_content | 1 + .../data/aws_s3_bucket_object_cluster-completed.spec_content | 1 + 10 files changed, 24 insertions(+) diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 44735db9e4..db2df2f6ac 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -6389,6 +6389,7 @@ func autoConvert_v1alpha2_NodeTerminationHandlerConfig_To_kops_NodeTerminationHa out.EnableRebalanceDraining = in.EnableRebalanceDraining out.EnablePrometheusMetrics = in.EnablePrometheusMetrics out.EnableSQSTerminationDraining = in.EnableSQSTerminationDraining + out.ExcludeFromLoadBalancers = in.ExcludeFromLoadBalancers out.ManagedASGTag = in.ManagedASGTag out.MemoryRequest = in.MemoryRequest out.CPURequest = in.CPURequest @@ -6409,6 +6410,7 @@ func autoConvert_kops_NodeTerminationHandlerConfig_To_v1alpha2_NodeTerminationHa out.EnableRebalanceDraining = in.EnableRebalanceDraining out.EnablePrometheusMetrics = in.EnablePrometheusMetrics out.EnableSQSTerminationDraining = in.EnableSQSTerminationDraining + out.ExcludeFromLoadBalancers = in.ExcludeFromLoadBalancers out.ManagedASGTag = in.ManagedASGTag out.MemoryRequest = in.MemoryRequest out.CPURequest = in.CPURequest diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index 8d8f015e9d..18df8d5ee4 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -4426,6 +4426,11 @@ func (in *NodeTerminationHandlerConfig) DeepCopyInto(out *NodeTerminationHandler *out = new(bool) **out = **in } + if in.ExcludeFromLoadBalancers != nil { + in, out := &in.ExcludeFromLoadBalancers, &out.ExcludeFromLoadBalancers + *out = new(bool) + **out = **in + } if in.ManagedASGTag != nil { in, out := &in.ManagedASGTag, &out.ManagedASGTag *out = new(string) diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index 3eba4ba01b..26fbc5c6f8 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -6354,6 +6354,7 @@ func autoConvert_v1alpha3_NodeTerminationHandlerConfig_To_kops_NodeTerminationHa out.EnablePrometheusMetrics = in.EnablePrometheusMetrics out.EnableSQSTerminationDraining = in.EnableSQSTerminationDraining out.ManagedASGTag = in.ManagedASGTag + out.ExcludeFromLoadBalancers = in.ExcludeFromLoadBalancers out.MemoryRequest = in.MemoryRequest out.CPURequest = in.CPURequest out.Version = in.Version @@ -6373,6 +6374,7 @@ func autoConvert_kops_NodeTerminationHandlerConfig_To_v1alpha3_NodeTerminationHa out.EnableRebalanceDraining = in.EnableRebalanceDraining out.EnablePrometheusMetrics = in.EnablePrometheusMetrics out.EnableSQSTerminationDraining = in.EnableSQSTerminationDraining + out.ExcludeFromLoadBalancers = in.ExcludeFromLoadBalancers out.ManagedASGTag = in.ManagedASGTag out.MemoryRequest = in.MemoryRequest out.CPURequest = in.CPURequest diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go index b2204b5bf6..f245a7d3d2 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go @@ -4341,6 +4341,11 @@ func (in *NodeTerminationHandlerConfig) DeepCopyInto(out *NodeTerminationHandler *out = new(string) **out = **in } + if in.ExcludeFromLoadBalancers != nil { + in, out := &in.ExcludeFromLoadBalancers, &out.ExcludeFromLoadBalancers + *out = new(bool) + **out = **in + } if in.MemoryRequest != nil { in, out := &in.MemoryRequest, &out.MemoryRequest x := (*in).DeepCopy() diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index 31b60a79c6..d6077f0159 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -4611,6 +4611,11 @@ func (in *NodeTerminationHandlerConfig) DeepCopyInto(out *NodeTerminationHandler *out = new(bool) **out = **in } + if in.ExcludeFromLoadBalancers != nil { + in, out := &in.ExcludeFromLoadBalancers, &out.ExcludeFromLoadBalancers + *out = new(bool) + **out = **in + } if in.ManagedASGTag != nil { in, out := &in.ManagedASGTag, &out.ManagedASGTag *out = new(string) diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 49f325cba9..c2cb6831c2 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -212,6 +212,7 @@ spec: enableScheduledEventDraining: false enableSpotInterruptionDraining: true enabled: true + excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi prometheusEnable: false diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content index 4cc3d9944d..2318145ae8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -222,6 +222,7 @@ spec: enableScheduledEventDraining: false enableSpotInterruptionDraining: true enabled: true + excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi prometheusEnable: false diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content index 69945ab545..82729d01fa 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -211,6 +211,7 @@ spec: enableScheduledEventDraining: false enableSpotInterruptionDraining: true enabled: true + excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi prometheusEnable: false diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content index d9a16f44d4..512e63baa5 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -202,6 +202,7 @@ spec: enableScheduledEventDraining: false enableSpotInterruptionDraining: true enabled: true + excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi prometheusEnable: false diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content index c878cc140d..e58120903c 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -167,6 +167,7 @@ spec: enableScheduledEventDraining: false enableSpotInterruptionDraining: true enabled: true + excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi prometheusEnable: false