test: update tls cert locations

coreos · Jan 24, 2018 · a76dc9b · a76dc9b
1 parent 74190e9
commit a76dc9b
Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tests/rspec/lib/tls_certs.rb b/tests/rspec/lib/tls_certs.rb
@@ -13,8 +13,9 @@ def generate_tls(path, cluster_name, domain, etcd_server_count, expiration_date
 
   [
     ['kube/ca.crt', root_kube.to_pem],
-    ['kube/kubelet.key', client_kube.key_material.private_key],
-    ['kube/kubelet.crt', client_kube.to_pem],
+    ['kube/ca.key', root_kube.key_material.private_key],
+    ['kube/admin.key', client_kube.key_material.private_key],
+    ['kube/admin.crt', client_kube.to_pem],
     ['kube/apiserver.key', server_kube.key_material.private_key],
     ['kube/apiserver.crt', server_kube.to_pem],
 

diff --git a/tests/smoke/user_provided_tls/tls.tf b/tests/smoke/user_provided_tls/tls.tf
@@ -31,8 +31,9 @@ module "kube_certs" {
   source = "../../modules/tls/kube/user-provided"
 
   ca_cert_pem_path        = "../../tests/smoke/user_provided_tls/certs/kube/ca.crt"
-  kubelet_cert_pem_path   = "../../tests/smoke/user_provided_tls/certs/kube/kubelet.crt"
-  kubelet_key_pem_path    = "../../tests/smoke/user_provided_tls/certs/kube/kubelet.key"
+  ca_key_pem_path         = "../../tests/smoke/user_provided_tls/certs/kube/ca.key"
+  admin_cert_pem_path     = "../../tests/smoke/user_provided_tls/certs/kube/admin.crt"
+  admin_key_pem_path      = "../../tests/smoke/user_provided_tls/certs/kube/admin.key"
   apiserver_cert_pem_path = "../../tests/smoke/user_provided_tls/certs/kube/apiserver.crt"
   apiserver_key_pem_path  = "../../tests/smoke/user_provided_tls/certs/kube/apiserver.key"
 }