🐛fix: classic elb fix for TLS issues #5346
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,12 +32,12 @@ import ( | |
|
|
||
| "sigs.k8s.io/cluster-api-provider-aws/v2/feature" | ||
| clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" | ||
| "sigs.k8s.io/cluster-api/util/defaulting" | ||
| ) | ||
|
|
||
| func TestAWSClusterDefault(t *testing.T) { | ||
| cluster := &AWSCluster{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default"}} | ||
| t.Run("for AWSCluster", defaultValidateTest(cluster, true)) | ||
| cluster.Default() | ||
| g := NewWithT(t) | ||
| g.Expect(cluster.Spec.IdentityRef).NotTo(BeNil()) | ||
|
|
@@ -699,7 +699,7 @@ func TestAWSClusterValidateCreate(t *testing.T) { | |
| } | ||
|
|
||
| func TestAWSClusterValidateUpdate(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| oldCluster *AWSCluster | ||
| newCluster *AWSCluster | ||
|
|
@@ -967,23 +967,45 @@ func TestAWSClusterValidateUpdate(t *testing.T) { | |
| wantErr: true, | ||
| }, | ||
| { | ||
| name: "Should fail if controlPlaneLoadBalancer healthcheckprotocol is updated and not classic elb", | ||
| oldCluster: &AWSCluster{ | ||
| Spec: AWSClusterSpec{ | ||
| ControlPlaneLoadBalancer: &AWSLoadBalancerSpec{ | ||
| LoadBalancerType: LoadBalancerTypeNLB, | ||
| HealthCheckProtocol: &ELBProtocolTCP, | ||
| }, | ||
| }, | ||
| }, | ||
| newCluster: &AWSCluster{ | ||
| Spec: AWSClusterSpec{ | ||
| ControlPlaneLoadBalancer: &AWSLoadBalancerSpec{ | ||
| LoadBalancerType: LoadBalancerTypeNLB, | ||
| HealthCheckProtocol: &ELBProtocolSSL, | ||
| }, | ||
| }, | ||
| }, | ||
| wantErr: true, | ||
| }, | ||
| { | ||
| name: "Should pass if controlPlaneLoadBalancer healthcheckprotocol is updated and a classic elb", | ||
| oldCluster: &AWSCluster{ | ||
| Spec: AWSClusterSpec{ | ||
| ControlPlaneLoadBalancer: &AWSLoadBalancerSpec{ | ||
| LoadBalancerType: LoadBalancerTypeClassic, | ||
| HealthCheckProtocol: &ELBProtocolSSL, | ||
| }, | ||
| }, | ||
| }, | ||
| newCluster: &AWSCluster{ | ||
| Spec: AWSClusterSpec{ | ||
| ControlPlaneLoadBalancer: &AWSLoadBalancerSpec{ | ||
| LoadBalancerType: LoadBalancerTypeClassic, | ||
| HealthCheckProtocol: &ELBProtocolTCP, | ||
| }, | ||
| }, | ||
| }, | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "Should pass if old secondary lb is absent", | ||
| oldCluster: &AWSCluster{ | ||
|
|
@@ -1017,19 +1039,43 @@ func TestAWSClusterValidateUpdate(t *testing.T) { | |
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "Should fail if controlPlaneLoadBalancer healthcheckprotocol is changed to non-default if it was not set before update for non-classic elb", | ||
| oldCluster: &AWSCluster{ | ||
| Spec: AWSClusterSpec{ | ||
| ControlPlaneLoadBalancer: &AWSLoadBalancerSpec{ | ||
| LoadBalancerType: LoadBalancerTypeNLB, | ||
| }, | ||
| }, | ||
| }, | ||
| newCluster: &AWSCluster{ | ||
| Spec: AWSClusterSpec{ | ||
| ControlPlaneLoadBalancer: &AWSLoadBalancerSpec{ | ||
| LoadBalancerType: LoadBalancerTypeNLB, | ||
| HealthCheckProtocol: &ELBProtocolTCP, | ||
| }, | ||
| }, | ||
| }, | ||
| wantErr: true, | ||
| }, | ||
| { | ||
| name: "Should pass if controlPlaneLoadBalancer healthcheckprotocol is changed to non-default if it was not set before update for classic elb", | ||
| oldCluster: &AWSCluster{ | ||
| Spec: AWSClusterSpec{ | ||
| ControlPlaneLoadBalancer: &AWSLoadBalancerSpec{ | ||
| LoadBalancerType: LoadBalancerTypeClassic, | ||
| }, | ||
| }, | ||
| }, | ||
| newCluster: &AWSCluster{ | ||
| Spec: AWSClusterSpec{ | ||
| ControlPlaneLoadBalancer: &AWSLoadBalancerSpec{ | ||
| LoadBalancerType: LoadBalancerTypeNLB, | ||
| HealthCheckProtocol: &ELBProtocolTCP, | ||
| }, | ||
| }, | ||
| }, | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "correct GC tasks annotation", | ||
| oldCluster: &AWSCluster{ | ||
|
|
@@ -1357,3 +1403,48 @@ func TestAWSClusterDefaultAllowedCIDRBlocks(t *testing.T) { | |
| }) | ||
| } | ||
| } | ||
|
|
||
| // defaultValidateTest returns a new testing function to be used in tests to | ||
| // make sure defaulting webhooks also pass validation tests on create, | ||
| // update and delete. | ||
| // NOTE: This is a copy of the DefaultValidateTest function in the cluster-api | ||
| // package, but it has been modified to allow warnings to be returned. | ||
| func defaultValidateTest(object defaulting.DefaultingValidator, allowWarnings bool) func(*testing.T) { | ||
| return func(t *testing.T) { | ||
| t.Helper() | ||
|
|
||
| createCopy := object.DeepCopyObject().(defaulting.DefaultingValidator) | ||
| updateCopy := object.DeepCopyObject().(defaulting.DefaultingValidator) | ||
| deleteCopy := object.DeepCopyObject().(defaulting.DefaultingValidator) | ||
| defaultingUpdateCopy := updateCopy.DeepCopyObject().(defaulting.DefaultingValidator) | ||
|
|
||
| t.Run("validate-on-create", func(t *testing.T) { | ||
| g := NewWithT(t) | ||
| createCopy.Default() | ||
| warnings, err := createCopy.ValidateCreate() | ||
| g.Expect(err).ToNot(HaveOccurred()) | ||
| if !allowWarnings { | ||
| g.Expect(warnings).To(BeEmpty()) | ||
| } | ||
| }) | ||
| t.Run("validate-on-update", func(t *testing.T) { | ||
| g := NewWithT(t) | ||
| defaultingUpdateCopy.Default() | ||
| updateCopy.Default() | ||
| warnings, err := defaultingUpdateCopy.ValidateUpdate(updateCopy) | ||
| g.Expect(err).ToNot(HaveOccurred()) | ||
| if !allowWarnings { | ||
| g.Expect(warnings).To(BeEmpty()) | ||
| } | ||
| }) | ||
| t.Run("validate-on-delete", func(t *testing.T) { | ||
| g := NewWithT(t) | ||
| deleteCopy.Default() | ||
| warnings, err := deleteCopy.ValidateDelete() | ||
| g.Expect(err).ToNot(HaveOccurred()) | ||
| if !allowWarnings { | ||
| g.Expect(warnings).To(BeEmpty()) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This case shouldn't even be possible, see the webhook: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/api/v1beta2/awscluster_webhook.go#L322
That being said, I think we can remove this code in a follow up PR rather than block this further.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great catch!
Also see #5346 (comment)