Merge pull request #11935 from olemarkus/manyaddons-no-oidc

Remove unused golden files from manyaddons test
kubernetes · Jul 6, 2021 · 7a22c9c · 7a22c9c
2 parents 23054c5 + 735d9a8
commit 7a22c9c
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 303 deletions.
diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go
@@ -434,7 +434,6 @@ func TestAWSLBController(t *testing.T) {
 
 func TestManyAddons(t *testing.T) {
 	newIntegrationTest("minimal.example.com", "many-addons").
-		withOIDCDiscovery().
 		withAddons("aws-ebs-csi-driver.addons.k8s.io-k8s-1.17",
 			"aws-load-balancer-controller.addons.k8s.io-k8s-1.9",
 			"certmanager.io-k8s-1.16",

diff --git a/.../data/aws_iam_role_aws-load-balancer-controller.kube-system.sa.minimal.example.com_policy b/.../data/aws_iam_role_aws-load-balancer-controller.kube-system.sa.minimal.example.com_policy
diff --git a/...er/many-addons/data/aws_iam_role_dns-controller.kube-system.sa.minimal.example.com_policy b/...er/many-addons/data/aws_iam_role_dns-controller.kube-system.sa.minimal.example.com_policy
diff --git a/...ws_iam_role_policy_aws-load-balancer-controller.kube-system.sa.minimal.example.com_policy b/...ws_iam_role_policy_aws-load-balancer-controller.kube-system.sa.minimal.example.com_policy
diff --git a/...-addons/data/aws_iam_role_policy_dns-controller.kube-system.sa.minimal.example.com_policy b/...-addons/data/aws_iam_role_policy_dns-controller.kube-system.sa.minimal.example.com_policy
diff --git a/...y-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...y-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -179,8 +179,8 @@ kubeAPIServer:
   requestheaderUsernameHeaders:
   - X-Remote-User
   securePort: 443
-  serviceAccountIssuer: https://discovery.example.com/minimal.example.com
-  serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks
+  serviceAccountIssuer: https://api.internal.minimal.example.com
+  serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks
   serviceClusterIPRange: 172.20.0.0/19
   storageBackend: etcd3
 kubeControllerManager:
@@ -252,7 +252,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
-NodeupConfigHash: elF2pwZKEmkQTctfVkBsmt8290a/elh+NffnIeyCYBQ=
+NodeupConfigHash: gCnvY+OMMVnG2kuJvvo1cVae4dzUl+rcZfd5XULISEs=
 
 __EOF_KUBE_ENV
 

diff --git a/...ation/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content b/...ation/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content
@@ -102,8 +102,8 @@ spec:
     requestheaderUsernameHeaders:
     - X-Remote-User
     securePort: 443
-    serviceAccountIssuer: https://discovery.example.com/minimal.example.com
-    serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks
+    serviceAccountIssuer: https://api.internal.minimal.example.com
+    serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks
     serviceClusterIPRange: 172.20.0.0/19
     storageBackend: etcd3
   kubeControllerManager:
@@ -201,9 +201,6 @@ spec:
   nonMasqueradeCIDR: 172.20.0.0/16
   podCIDR: 172.20.128.0/17
   secretStore: memfs://clusters.example.com/minimal.example.com/secrets
-  serviceAccountIssuerDiscovery:
-    discoveryStore: memfs://discovery.example.com/minimal.example.com
-    enableAWSOIDCProvider: true
   serviceClusterIPRange: 172.20.0.0/19
   snapshotController:
     enabled: true

diff --git a/...s/integration/update_cluster/many-addons/data/aws_s3_bucket_object_discovery.json_content b/...s/integration/update_cluster/many-addons/data/aws_s3_bucket_object_discovery.json_content
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_keys.json_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_keys.json_content
diff --git a/...date_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/...date_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content
@@ -38,8 +38,8 @@ APIServerConfig:
     requestheaderUsernameHeaders:
     - X-Remote-User
     securePort: 443
-    serviceAccountIssuer: https://discovery.example.com/minimal.example.com
-    serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks
+    serviceAccountIssuer: https://api.internal.minimal.example.com
+    serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks
     serviceClusterIPRange: 172.20.0.0/19
     storageBackend: etcd3
   ServiceAccountPublicKeys: |

diff --git a/tests/integration/update_cluster/many-addons/in-v1alpha2.yaml b/tests/integration/update_cluster/many-addons/in-v1alpha2.yaml
@@ -40,9 +40,6 @@ spec:
     enabled: true
     enableSQSTerminationDraining: false
   nonMasqueradeCIDR: 172.20.0.0/16
-  serviceAccountIssuerDiscovery:
-    discoveryStore: memfs://discovery.example.com/minimal.example.com
-    enableAWSOIDCProvider: true
   snapshotController:
     enabled: true
   sshAccess:

diff --git a/tests/integration/update_cluster/many-addons/kubernetes.tf b/tests/integration/update_cluster/many-addons/kubernetes.tf
@@ -245,17 +245,6 @@ resource "aws_iam_instance_profile" "nodes-minimal-example-com" {
   }
 }
 
-resource "aws_iam_openid_connect_provider" "minimal-example-com" {
-  client_id_list = ["amazonaws.com"]
-  tags = {
-    "KubernetesCluster"                         = "minimal.example.com"
-    "Name"                                      = "minimal.example.com"
-    "kubernetes.io/cluster/minimal.example.com" = "owned"
-  }
-  thumbprint_list = ["9e99a48a9960b14926bb7f3b02e22da2b0ab7280", "a9d53002e97e00e043244f3d170d6f4c414104fd"]
-  url             = "https://discovery.example.com/minimal.example.com"
-}
-
 resource "aws_iam_role" "masters-minimal-example-com" {
   assume_role_policy = file("${path.module}/data/aws_iam_role_masters.minimal.example.com_policy")
   name               = "masters.minimal.example.com"
@@ -498,13 +487,6 @@ resource "aws_s3_bucket_object" "cluster-completed-spec" {
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_bucket_object" "discovery-json" {
-  bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_bucket_object_discovery.json_content")
-  key                    = "discovery.example.com/minimal.example.com/.well-known/openid-configuration"
-  server_side_encryption = "AES256"
-}
-
 resource "aws_s3_bucket_object" "etcd-cluster-spec-events" {
   bucket                 = "testingBucket"
   content                = file("${path.module}/data/aws_s3_bucket_object_etcd-cluster-spec-events_content")
@@ -519,13 +501,6 @@ resource "aws_s3_bucket_object" "etcd-cluster-spec-main" {
   server_side_encryption = "AES256"
 }
 
-resource "aws_s3_bucket_object" "keys-json" {
-  bucket                 = "testingBucket"
-  content                = file("${path.module}/data/aws_s3_bucket_object_keys.json_content")
-  key                    = "discovery.example.com/minimal.example.com/openid/v1/jwks"
-  server_side_encryption = "AES256"
-}
-
 resource "aws_s3_bucket_object" "kops-version-txt" {
   bucket                 = "testingBucket"
   content                = file("${path.module}/data/aws_s3_bucket_object_kops-version.txt_content")