Merge pull request #16179 from rifelpet/lbc-wh

Ignore cert-manager in LBC's webhooks
kubernetes · Dec 20, 2023 · 40ec87b · 40ec87b
2 parents c49fcbe + 7e78ef5
commit 40ec87b
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 9 deletions.
diff --git a/tests/e2e/scenarios/aws-lb-controller/run-test.sh b/tests/e2e/scenarios/aws-lb-controller/run-test.sh
@@ -25,8 +25,8 @@ NETWORKING="amazonvpc"
 
 OVERRIDES="${OVERRIDES-} --set=cluster.spec.cloudProvider.aws.loadBalancerController.enabled=true"
 OVERRIDES="${OVERRIDES} --set=cluster.spec.certManager.enabled=true"
-OVERRIDES="${OVERRIDES} --master-size=t4g.medium --node-size=t4g.medium"
-OVERRIDES="${OVERRIDES} --image=${INSTANCE_IMAGE:-099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20230811}"
+OVERRIDES="${OVERRIDES} --master-size=t3.medium --node-size=t3.medium" # Use amd64 because LBC's E2E suite uses single-arch amd64 test images
+OVERRIDES="${OVERRIDES} --image=${INSTANCE_IMAGE:-099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20231208}"
 
 # shellcheck disable=SC2034
 ZONES="eu-west-1a,eu-west-1b,eu-west-1c"

diff --git a/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@@ -1063,6 +1063,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""
@@ -1094,6 +1095,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""

diff --git a/...cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -148,7 +148,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 62e52a735ecf0a976a1ca912758a92ddb9ffbac09d4f7cd0e2331f1d3e702f89
+    manifestHash: 1c7618e2ac4639ab78b8cab895782fc62d521f4fd208b4bff4a0558fa771afc3
     name: aws-load-balancer-controller.addons.k8s.io
     needsPKI: true
     selector:

diff --git a/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@@ -1063,6 +1063,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""
@@ -1094,6 +1095,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""

diff --git a/...ster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...ster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -163,7 +163,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 62e52a735ecf0a976a1ca912758a92ddb9ffbac09d4f7cd0e2331f1d3e702f89
+    manifestHash: 1c7618e2ac4639ab78b8cab895782fc62d521f4fd208b4bff4a0558fa771afc3
     name: aws-load-balancer-controller.addons.k8s.io
     needsPKI: true
     selector:

diff --git a/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@@ -1063,6 +1063,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""
@@ -1094,6 +1095,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""

diff --git a/...er/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...er/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -170,7 +170,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 62e52a735ecf0a976a1ca912758a92ddb9ffbac09d4f7cd0e2331f1d3e702f89
+    manifestHash: 1c7618e2ac4639ab78b8cab895782fc62d521f4fd208b4bff4a0558fa771afc3
     name: aws-load-balancer-controller.addons.k8s.io
     needsPKI: true
     selector:

diff --git a/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@@ -1063,6 +1063,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""
@@ -1094,6 +1095,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""

diff --git a/...er/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...er/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -170,7 +170,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 62e52a735ecf0a976a1ca912758a92ddb9ffbac09d4f7cd0e2331f1d3e702f89
+    manifestHash: 1c7618e2ac4639ab78b8cab895782fc62d521f4fd208b4bff4a0558fa771afc3
     name: aws-load-balancer-controller.addons.k8s.io
     needsPKI: true
     selector:

diff --git a/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@@ -1063,6 +1063,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""
@@ -1094,6 +1095,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""

diff --git a/...er/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...er/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -171,7 +171,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 62e52a735ecf0a976a1ca912758a92ddb9ffbac09d4f7cd0e2331f1d3e702f89
+    manifestHash: 1c7618e2ac4639ab78b8cab895782fc62d521f4fd208b4bff4a0558fa771afc3
     name: aws-load-balancer-controller.addons.k8s.io
     needsPKI: true
     selector:

diff --git a/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@@ -1069,6 +1069,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""
@@ -1100,6 +1101,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""

diff --git a/...e_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...e_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -163,7 +163,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: 35f62f8f1ce737681494453c1ca84ebebcdde1baeefd414edeedb1f396e5dc3c
+    manifestHash: 4b7e10379beabe347fe4d72ddfc00ae77daab278c65251f5a8a56a6e91c2a907
     name: aws-load-balancer-controller.addons.k8s.io
     needsPKI: true
     selector:

diff --git a/...any-addons.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/...any-addons.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
@@ -1069,6 +1069,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""
@@ -1100,6 +1101,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""

diff --git a/...e_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content b/...e_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content
@@ -163,7 +163,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
-    manifestHash: a2f8441f322c19711b1ea935c5eb21e9fa2a231e86c898f6eddf0279ad9c361c
+    manifestHash: ea17759bdf2e9ace58d6cd23a0f5f0697736eef8e52a25a30c3bbef8b77aaa48
     name: aws-load-balancer-controller.addons.k8s.io
     needsPKI: true
     selector:

diff --git a/...loudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml.template b/...loudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml.template
@@ -1008,6 +1008,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""
@@ -1039,6 +1040,7 @@ webhooks:
       operator: NotIn
       values:
       - aws-load-balancer-controller
+      - cert-manager
   rules:
   - apiGroups:
     - ""