cluster: partial cert bump
Done:
1. etcd peer CA & certs
2. etcd client CA & certs
3. kube CA (currently all components set to accept both new and old CA,
new CA called ca-kube-new)
4. kube apiserver
5. kubelet & kube-proxy
6. prodvider intermediate
TODO:
1. kubernetes controller-manager & kubernetes scheduler
2. kubefront CA
3. admitomatic?
4. undo bundle on kube CA components to fully transition away from old
CA
Change-Id: If529eeaed9a6a2063bed23c9d81c57b36b9a0115
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1487
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/cluster/certs/ca-etcd.crt b/cluster/certs/ca-etcd.crt
index 03242d6..802e58c 100644
--- a/cluster/certs/ca-etcd.crt
+++ b/cluster/certs/ca-etcd.crt
@@ -1,23 +1,10 @@
-----BEGIN CERTIFICATE-----
-MIIDwDCCAqigAwIBAgIUcCMt3kFz7oTod8UKTvyS/5KAU4AwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEQMA4GA1UEAxMHZXRjZCBjYTAeFw0xOTA0MDYxNzU5MDBaFw0y
-NDA0MDQxNzU5MDBaMHgxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tp
-ZTEPMA0GA1UEBxMGV2Fyc2F3MRswGQYDVQQKExJXYXJzYXcgSGFja2Vyc3BhY2Ux
-EzARBgNVBAsTCmNsdXN0ZXJjZmcxEDAOBgNVBAMTB2V0Y2QgY2EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCq97dwVeisx1h8wwNFvCl0XGRHbrCxdOb7
-Znye8X9HZ6biM+o1WFfU1KPMr1+AIDukJwOXZLNYSdaUTjYRN7DFAvEwliScI5dK
-KaM+7ZNoLrEU4JR3I8sjUGjvVml19BlcGAwwV2waodE1a4THxQpyQClygfKlv1NQ
-SxQZ/Ju1b0wTf1Lupm1ZBXPyFmcs8/bgpkjkjMp3lF9JhU2E6Fzc3YOnto5ovSM2
-d46CN8BKyf+FXuTiEqwvsGuOOhby6Uwq3za7OtUu1qld0Ja5vQJgXrjxS1xTJPsB
-i83OqFHhiHhcqFxg5GfQgI0BxGTwPc1BW9e1ZyDumRbnjzRqFGETAgMBAAGjQjBA
-MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTxWbhm
-TT7D50LugaPURn85U3X5DzANBgkqhkiG9w0BAQsFAAOCAQEAXSFdkAvgj4hynjs0
-X79FVZ4dvv8n+m4q6XJLqQIqfPwxs2FUUowQH7NiKrenZa0aaZVCcr5edcZ7F9n0
-u/HsvrGxumZkqIDT1KhO0/U0SS0nI28PdusAl1CTHX55rF6GVmUAhA2Vv7jJqAdy
-VKqC02AMrUels7Ebf/j+XveBxyEMnfFR5X4piVqip5VKcV0wk4leC3LWNlK6E7rE
-4qo9KM+HLtvj8I3u3MIigUZFSyaqnpMTut52CqsATOvR8qIgerpGKn3Mhq32iyWm
-RLbtLjicTSKWAOxbvfceEcZqJUXyi+akndx0XyJEbNG8tQ5ShIPeqNDXS4cVwgaE
-cMQ1hQ==
+MIIBTzCCAQGgAwIBAgIQEp1RM5CHVMEwy0lkViy9dDAFBgMrZXAwEjEQMA4GA1UE
+AxMHZXRjZCBjYTAgFw0yMzAzMzExMTU1MjlaGA85OTk5MTIzMTIzNTk1OVowEjEQ
+MA4GA1UEAxMHZXRjZCBjYTAqMAUGAytlcAMhAFS48WErN6bQRzSgWPzVOU1rb+Nr
+LxywAykg1vLa0deFo2swaTAOBgNVHQ8BAf8EBAMCAYYwJwYDVR0lBCAwHgYIKwYB
+BQUHAwIGCCsGAQUFBwMBBggrBgEFBQcDCTAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBTd0G1YWn+8LBYKlL7jTWY2Wypb1jAFBgMrZXADQQDBGfhtZEw1XzXhY1K/
+Hu7lJFRS+9Jt1hztg3UFMceKlzUHXC4SoFXLWDTg2UNIabCQs5PMFWRYCqLhaq0S
+Jb8O
-----END CERTIFICATE-----
diff --git a/cluster/certs/ca-etcdpeer.crt b/cluster/certs/ca-etcdpeer.crt
index e335f35..0022428 100644
--- a/cluster/certs/ca-etcdpeer.crt
+++ b/cluster/certs/ca-etcdpeer.crt
@@ -1,23 +1,10 @@
-----BEGIN CERTIFICATE-----
-MIIDyjCCArKgAwIBAgIUFEezYLKVElTQapJv+PMKnH5VMCwwDQYJKoZIhvcNAQEL
-BQAwfTELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEVMBMGA1UEAxMMZXRjZCBwZWVyIGNhMB4XDTE5MDQwNjE3NTkw
-MFoXDTI0MDQwNDE3NTkwMFowfTELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93
-aWVja2llMQ8wDQYDVQQHEwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJz
-cGFjZTETMBEGA1UECxMKY2x1c3RlcmNmZzEVMBMGA1UEAxMMZXRjZCBwZWVyIGNh
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuRyVtX1kTDeWHKYJA/q
-H8SUpvbdtgMZKfbeXeUTIOH3nqiO2LePvzlwADzTOyi8uCdGmT4y87BxgzOW/Ghj
-eCr8NYMC3f/sKaJwZGenqoOnAn0qkvLSE5mVDSp5xJPqeYgRTJMQxjC5JfwAZinT
-uZNdqnS+RDt7EfujiP8bJJE4hHTue8v0+OPN5XeL35dotDbVmHFk/NEZJrtYK6lG
-fkY97TWgqCU0v+K4TRIDJBh9LX867LgxuW3VhNYZ8xc8PRAfnnPF3g+fnzAGcuhk
-YptBA9di6r5YESdK86IGI1RaQ3VKF/fPQ0789RbMsN7ZV/vQVYnjfmvAHr5n2Fxh
-QwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
-HQ4EFgQULXuar2iqGaTMKoi++HbkvSenJA4wDQYJKoZIhvcNAQELBQADggEBAFJQ
-58q8yXOzYIE0skbSZYXVo4U3Sc/10r5gdbhPTN5XYl+3cK9ier8CBQEv3vKfNtjD
-My+X6OeQr8NSGK5ZNK+ijlv9h8g/NFFEMyRFiULrDt8MiUFQysLMuVdNSozz40P6
-+TAx5S6cnsIrr93+qCoF45Lfzx8lB/REWpa+Z7Tn+40taCepaJJmrEGkwI9XqVsp
-1pB6G4g1qsdFoLgUgy85RjA14Nw2MSxfwUcxGEvXbj1914ktkAiWA8HH/IKIbS4B
-1hoQuAsO46+mnqZHV+qV6KyIfOxafApHY2qmtvSioRRL9eXF8qpVMkr0wrb8WYox
-hkWi5S3B6YRE9Ld9UdI=
+MIIBWTCCAQugAwIBAgIQfUsnDAuyirtt6K6cdD8BOjAFBgMrZXAwFzEVMBMGA1UE
+AxMMZXRjZCBwZWVyIGNhMCAXDTIzMDMzMTExMjcyMloYDzk5OTkxMjMxMjM1OTU5
+WjAXMRUwEwYDVQQDEwxldGNkIHBlZXIgY2EwKjAFBgMrZXADIQB1Wg0r5Fn1ifKP
+5R3gHptr/sKPJ4JpmermY5VoPLqnC6NrMGkwDgYDVR0PAQH/BAQDAgGGMCcGA1Ud
+JQQgMB4GCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwkwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUC8DBq1ngR0i8hOQ7XRY525ufLvkwBQYDK2VwA0EABU36
+StuVX1k35rgxuqfSkkzjeqr4Uk2Yc+5YSV2qV0XctlZOEOUAtAbaBMOQ41EpeZcH
+tQ4P+5PFMoiroByOCA==
-----END CERTIFICATE-----
diff --git a/cluster/certs/ca-kube-new-and-old.crt b/cluster/certs/ca-kube-new-and-old.crt
new file mode 100644
index 0000000..6c54778
--- /dev/null
+++ b/cluster/certs/ca-kube-new-and-old.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIBZTCCARegAwIBAgIQH2KNL4wIPawUN1HO9EPCejAFBgMrZXAwHTEbMBkGA1UE
+AxMSa3ViZXJuZXRlcyBtYWluIENBMCAXDTIzMDMzMTEyNTI0M1oYDzk5OTkxMjMx
+MjM1OTU5WjAdMRswGQYDVQQDExJrdWJlcm5ldGVzIG1haW4gQ0EwKjAFBgMrZXAD
+IQAqZ7QDUNbcC3XL6jiyL4yEb2CpZJKq4qEPXSNnZ+HdaqNrMGkwDgYDVR0PAQH/
+BAQDAgGGMCcGA1UdJQQgMB4GCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwkw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUycQ+wTWsc0lNe+5ixgJAxIOccw8w
+BQYDK2VwA0EAFTrB2XCpWLOAFbwNzHXM8suamZweWX3YNPyEYeRKJO2f/tEuqcq3
++S29scjKwxjnnX0eLephWLyFrbIxzh3bAA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2DCCAsCgAwIBAgIUfa+oMG9sYHFeuhBgb8wSWHJ7ozUwDQYJKoZIhvcNAQEL
+BQAwgYMxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tpZTEPMA0GA1UE
+BxMGV2Fyc2F3MRswGQYDVQQKExJXYXJzYXcgSGFja2Vyc3BhY2UxEzARBgNVBAsT
+CmNsdXN0ZXJjZmcxGzAZBgNVBAMTEmt1YmVybmV0ZXMgbWFpbiBDQTAeFw0xOTA0
+MDYxNzU5MDBaFw0yNDA0MDQxNzU5MDBaMIGDMQswCQYDVQQGEwJQTDEUMBIGA1UE
+CBMLTWF6b3dpZWNraWUxDzANBgNVBAcTBldhcnNhdzEbMBkGA1UEChMSV2Fyc2F3
+IEhhY2tlcnNwYWNlMRMwEQYDVQQLEwpjbHVzdGVyY2ZnMRswGQYDVQQDExJrdWJl
+cm5ldGVzIG1haW4gQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7
+YfhSQTCObcBQrKrb7lhmSKUDqkcBlMxrC1Xx9IUWKpAj8+5evRA/vA1dVss8x75+
+g+6BWCPDJDm51b5KScvRdKZ8ARZOCwiXEDdw/BJUAO/uan3US9Qj6jpV/m3bsMz4
+adGDthA74y5//tD6CVBtMrVjRtpYkO0p4fzPOwNXTCXzDEVFApxoSF3MMmYDViFh
+X/qM/brgK3mh4ZouyPXx6QaL+DCYBu/YKg049Ev3z3NiK1P/t0VeBkvImKurf2Fa
+A27yZ+RsoI8OepN6EL6WsYhQhCSwD+oxB1mMlJkaB/zkVyM+YOro37ugkKgoHhhh
+nCOVyDXJpHa0EGTMMbQDAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBSYMl0OTzMe+wnpiSQTFkJqgNGZ0DANBgkqhkiG
+9w0BAQsFAAOCAQEAIhXBmcWgf/5cO+FAPnYoEi3QoG+EhB5j4wSyKJE+qedV4ogP
+YjztG1BbNAn7Zm6zarJ2JVRjfS56noRj5pvRDBTysLBjirpmsw/v/+/GMSfy1yJA
+0x2OLa8SDh01+hjchaxsjfDCmB11X/HZrGu7QvqQQa7KBFyGriWqXMNMaHXk9gfJ
+Wmz7aVEP0xhksVIml4ShuQqf1C1y1ut7FXfJUPppnvrfjSvR7p6zQgJ+5VAh+k9p
+NBnIrkplq0gGUSgeTu+BMMRS2/AxmSnfvsqvx52mnypWn7fUG+b6IASOesVv1hry
+TgHlXjl3Dv5hQ6//pWi+rgD8wT7OLkLf/ekVvQ==
+-----END CERTIFICATE-----
diff --git a/cluster/certs/ca-kube-new.crt b/cluster/certs/ca-kube-new.crt
new file mode 100644
index 0000000..825ae1f
--- /dev/null
+++ b/cluster/certs/ca-kube-new.crt
@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE-----
+MIIBZTCCARegAwIBAgIQH2KNL4wIPawUN1HO9EPCejAFBgMrZXAwHTEbMBkGA1UE
+AxMSa3ViZXJuZXRlcyBtYWluIENBMCAXDTIzMDMzMTEyNTI0M1oYDzk5OTkxMjMx
+MjM1OTU5WjAdMRswGQYDVQQDExJrdWJlcm5ldGVzIG1haW4gQ0EwKjAFBgMrZXAD
+IQAqZ7QDUNbcC3XL6jiyL4yEb2CpZJKq4qEPXSNnZ+HdaqNrMGkwDgYDVR0PAQH/
+BAQDAgGGMCcGA1UdJQQgMB4GCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwkw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUycQ+wTWsc0lNe+5ixgJAxIOccw8w
+BQYDK2VwA0EAFTrB2XCpWLOAFbwNzHXM8suamZweWX3YNPyEYeRKJO2f/tEuqcq3
++S29scjKwxjnnX0eLephWLyFrbIxzh3bAA==
+-----END CERTIFICATE-----
diff --git a/cluster/certs/ca-kube-prodvider.cert b/cluster/certs/ca-kube-prodvider.cert
index 0b08699..a6e9e04 100644
--- a/cluster/certs/ca-kube-prodvider.cert
+++ b/cluster/certs/ca-kube-prodvider.cert
@@ -1,31 +1,11 @@
-----BEGIN CERTIFICATE-----
-MIIFQzCCBCugAwIBAgIUWy0KdFoBoGT7Wfw5ZsB2JRBvc+UwDQYJKoZIhvcNAQEL
-BQAwgYMxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tpZTEPMA0GA1UE
-BxMGV2Fyc2F3MRswGQYDVQQKExJXYXJzYXcgSGFja2Vyc3BhY2UxEzARBgNVBAsT
-CmNsdXN0ZXJjZmcxGzAZBgNVBAMTEmt1YmVybmV0ZXMgbWFpbiBDQTAeFw0yMjA5
-MDkyMjA5MDBaFw0yMzA5MDkyMjA5MDBaMIGsMQswCQYDVQQGEwJQTDEUMBIGA1UE
-CBMLTWF6b3dpZWNraWUxDzANBgNVBAcTBldhcnNhdzEbMBkGA1UEChMSV2Fyc2F3
-IEhhY2tlcnNwYWNlMSowKAYDVQQLEyFrdWJlcm5ldGVzIHByb2R2aWRlciBpbnRl
-cm1lZGlhdGUxLTArBgNVBAMTJGt1YmVybmV0ZXMgcHJvZHZpZGVyIGludGVybWVk
-aWF0ZSBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL/38OKQgrqI
-9WZKRubACVF1QUmZS9IIzcmmxsAJEvNwCirAr6Rx45G+uBlUx0PmHK+783Pa0WEO
-deTHpZZt5o6YrQGvEzkI9ckDraUjRcQEQewi3kygmAdPW6GMWZd7fjCjsEQ0Engc
-qJ7BkEWNfJYLh8VpEwPz1ClqFrlbHU55hbuvNNg3Ro0enFmTu3PPZYUIcdX3jyJz
-p/fsE7K/f2OhHG2ej0Ji2Ssz6Bo9bB6yHLMN1oYzGB5H8Xa5dQ6LqpU0wUBqtGC8
-06ZUfNA1gtpTOj+ApDX/OYucoOE422r1lT6SfgeBhHGN3xalcYyiPumFsCBUSq+B
-7oLRW3emWJcjlOdmhtx26yl5/XpONY8u/jPG56CnT3tNGPdYnpVQ/969NrKA7yd4
-TRA4rU6Nyg5f3x8Xrw5QPci5Uuz2X2feFy53x25i2tRT2fm5VabzdjsO9mXCZbl8
-BO8mLVJ4Ojw5ER/sIw/OME29+tcBL3j31OoBUAHo82ca4B0KJBCWDHrjDTlchFfT
-fQfFWuRluZaa1kGU/9hEuHe8wXNsMlkCW+68xZ5SXLX29ruhx7SoDk3+SMk1GMNv
-vZr6CjWer94OajPN+scW7Pol2mhqENWFsTDA0WFN0HwLjLna9vQJg6vZeobm3bWZ
-DWl93HqdKeINlp9Q0HQ7nR+LUkeodWf7AgMBAAGjgYMwgYAwDgYDVR0PAQH/BAQD
-AgGmMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBRpjeqS08ZAgwwhQZnMEmrNN2PdszAfBgNVHSMEGDAWgBSY
-Ml0OTzMe+wnpiSQTFkJqgNGZ0DANBgkqhkiG9w0BAQsFAAOCAQEACAfpUfeejHhH
-/uTR9fMZTLP+6p1XUm68gVFK8AKd8EcltVaYtDjIFfP1Hv59jj6Af+0VH9Veqmoo
-h/B0tU+fTFG/9M6aJBVGYo7JfnG6KsSjIVRPl0zkfa/8RTqIHe4JRzP49ptiAp7d
-CVrBiEQR6zaiqyAZXuxN3TJ8JYgJzljd5nzku8+pSxP1wq5TQ/mkN7V9DNCdiXYP
-TA9CRTKwoiqIQsiwN5G8bi070HYkHb0aGXX3wzXkaYqLWTgGgW4ensItXty4lJFn
-cS3jKWvQaLHYCy2Fs+AiVFzYFC0IxwcDv9GGC6Lci/M9XKkaus5x4AFCpvNQYber
-a3WFKi5Q2w==
+MIIBlzCCAUmgAwIBAgIQA63/xPOSvZ9onKb3O7EFsTAFBgMrZXAwHTEbMBkGA1UE
+AxMSa3ViZXJuZXRlcyBtYWluIENBMCAXDTIzMDMzMTEyNTczOVoYDzk5OTkxMjMx
+MjM1OTU5WjAsMSowKAYDVQQDEyFrdWJlcm5ldGVzIHByb2R2aWRlciBpbnRlcm1l
+ZGlhdGUwKjAFBgMrZXADIQC5ZBgq9LF3+welMRx8eIVS7XOMFFeh/RhbZDcGpPsW
+paOBjTCBijAOBgNVHQ8BAf8EBAMCAaYwJwYDVR0lBCAwHgYIKwYBBQUHAwIGCCsG
+AQUFBwMBBggrBgEFBQcDCTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSCDPEq
+pWsmDJath+nc+WtOnfPBvDAfBgNVHSMEGDAWgBTJxD7BNaxzSU177mLGAkDEg5xz
+DzAFBgMrZXADQQDFX41Ol0uQWqxnNhR6Tc/GhwQuYIIz82vffcWUu9xlZ13VLhSz
+tJHSumwL/qjC/HNsLIuxnRE33HhoUNi1GlIL
-----END CERTIFICATE-----
diff --git a/cluster/certs/etcd-bc01n01.hswaw.net.cert b/cluster/certs/etcd-bc01n01.hswaw.net.cert
index 92fdd01..14235cb 100644
--- a/cluster/certs/etcd-bc01n01.hswaw.net.cert
+++ b/cluster/certs/etcd-bc01n01.hswaw.net.cert
@@ -1,30 +1,10 @@
-----BEGIN CERTIFICATE-----
-MIIFHDCCBASgAwIBAgIUR2oIveAsYn4IdAGapvyvgh3xVyIwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEQMA4GA1UEAxMHZXRjZCBjYTAeFw0yMjA0MDQxNjQ4MDBaFw0y
-MzA0MDQxNjQ4MDBaMHcxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tp
-ZTEPMA0GA1UEBxMGV2Fyc2F3MSUwIwYDVQQLExxub2RlIGV0Y2Qgc2VydmVyIGNl
-cnRpZmljYXRlMRowGAYDVQQDExFiYzAxbjAxLmhzd2F3Lm5ldDCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAKkSjQ1EVgGR6w/MTgdnd4GSTqOOFgp/cTpk
-nma6/qhWO/azC0LYqk7EoRlKEZEtp3zmLmJMqB9BkAXugnvPviD3x6tcvOSlqv2N
-PZ77HLBM3oq54KHZH9nM7hGil+bw6VU+V6Ba+xzw0QpFD7lLEpQ7HT3jQGOQjSiu
-rqjbnPXqkjOrXvQfpm7dBQnM94lPZ8sP4Up3WSLegXhAaQHsoH6DboFG9Nti6Dze
-s2PPcW5BO/xp41XZdeDwsx8KMlDgB9ohzsHqKgFpnSZos/Nh9SuHEBzdSQFi7M8i
-u0WodsU9D4hWEW5ke3mYiHopEzo2AIGxJ1MHdi6dVsdBlLoDbXG4MBYWOhoikA0o
-Kt90MHENxkCkF4Adkfip7kNCeJMt8eYh42vt3wKdey03t9IFgw53MFaSuOiJazKp
-viw5MIFrO3CewyWiCKz2ywwsj9xo42b4ocR6Tdg+jQRUbGWyc6W853SXOxDvcQMh
-1cnbtpWiJr3+Mc13BEKalgS9Qz+4EdJ89Ke2jA5HK8LX2pjxxjgi2Jogco5k4tf3
-/2+Hxg7UOHpfgP6hF4daC38yHtr79LPE+tZeZV6s3d4EA3qSFKDYdi3tEIfdrHSK
-cHBVoemDqZfo7QTTdjuhDqxEW+UkKpaw2EZBwK+94Dev8wi187CbvzugyPP5ycMp
-JRtiB8SxAgMBAAGjgZ4wgZswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTKhiQ/ZeBG
-JuOq1RG7YfHouV2kSTAfBgNVHSMEGDAWgBTxWbhmTT7D50LugaPURn85U3X5DzAc
-BgNVHREEFTATghFiYzAxbjAxLmhzd2F3Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEA
-a32RX3ySrZ01ATAaogYDYU1T4DObBIVzlk71LcAgxsC0ENXE9isT8XPO6lU7fetF
-HnnbAwRdC+3qfgQePUEv3JFe55n3G+fJeVvXAi9bFtNV+J82Rkw8WVEcYifcQlze
-eqED83wMmb5VnKiZYsyYgzmkpj8MyDUITUiDyoFWk+1RRq/Bo8+3QeViYo1WLzcC
-pUT/LXFNwVdwmNyU7LsnhDr2lBANoIsQ8yk2klI0kno68SaJNgmDFBgqK/bFl5Kd
-r7YWkc9luMyCjE+gR2liWaQykQC6RmgDZoiyoovvj6ROXY1egIddwi6mDEGNz1fk
-DIEY9TGmmYriX4vbCMYTRg==
+MIIBaTCCARugAwIBAgIQAIDkQoj0n8N/Awb6sygDYTAFBgMrZXAwEjEQMA4GA1UE
+AxMHZXRjZCBjYTAgFw0yMzAzMzExMjQxMjRaGA85OTk5MTIzMTIzNTk1OVowJzEl
+MCMGA1UEAxMcbm9kZSBldGNkIHNlcnZlciBjZXJ0aWZpY2F0ZTAqMAUGAytlcAMh
+APIlquMjihz+FQa4R5mjVRNLPLvfiKSt5PZaHy29jkPHo3AwbjAOBgNVHQ8BAf8E
+BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB8GA1UdIwQYMBaA
+FN3QbVhaf7wsFgqUvuNNZjZbKlvWMBwGA1UdEQQVMBOCEWJjMDFuMDEuaHN3YXcu
+bmV0MAUGAytlcANBAMCar3ZkZRjLgD1NEU2XMeKsqkSUONA47bnnBhsePA9vy81H
+/XLENRFtUiSEPJ3ZrkoQ8sY/sezOygWcu0/pVA4=
-----END CERTIFICATE-----
diff --git a/cluster/certs/etcd-bc01n02.hswaw.net.cert b/cluster/certs/etcd-bc01n02.hswaw.net.cert
index 6cc4226..0799961 100644
--- a/cluster/certs/etcd-bc01n02.hswaw.net.cert
+++ b/cluster/certs/etcd-bc01n02.hswaw.net.cert
@@ -1,30 +1,10 @@
-----BEGIN CERTIFICATE-----
-MIIFHDCCBASgAwIBAgIUf7Gn97/jD2Qw+Z4DeBtt1FdKl2AwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEQMA4GA1UEAxMHZXRjZCBjYTAeFw0yMjA0MDQxNzQxMDBaFw0y
-MzA0MDQxNzQxMDBaMHcxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tp
-ZTEPMA0GA1UEBxMGV2Fyc2F3MSUwIwYDVQQLExxub2RlIGV0Y2Qgc2VydmVyIGNl
-cnRpZmljYXRlMRowGAYDVQQDExFiYzAxbjAyLmhzd2F3Lm5ldDCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAMKzDo59mxEhwx8x3ju95KmjbND9wCga9YGf
-U36YOts5GoecL1t6EOOP1rm8BHhGRou4pt0q6sJqghS5ihxpKVcd+KnZbE4CmvLA
-sSH68/ELjl1vH6+vJf4SJFF1xN3CMMTgVr0ZM5B/e26lp620jrzLhark0DaaQO8p
-5Vp0j9S9iqrsGk5/IcoLkicAkohQKfHe0oShwim/prLhV2HjYT0Z035by7jZoPCH
-rEzExfQ9ENpOmmf4zxo1KCQELH7a5wyM/Fpc4EGq2khGFuRa1U1mbZdGW0WZjpNu
-cFNJmUey+oaRcAHj7IBolPUov3z1bwDZPIdAIRPpvJNpru/RrMOk5rxVOSk/IzTW
-V2oBy1I7qgMKxRM9emov2dFEH55/jRsKeAYqDYmbo353Ydw+6j3QncQjiUt6sB2d
-hvs+iZhetTdYRcEecKysY7IGZkF0E5vi+pqU9CQbLP7hHE4mXtShBz1MxFr/YL4X
-c3lzwDCo9eT+BkAjMhPt6M1jNlqWXS2hpWkNHziZuBvt4bN1eg16+OC6UgyVqPHV
-Q1BgYIzmMCV4MmsclhSk8JRwWGXgLXeI6Ss6sMOnfhtdhFExw3OoF2lbuwbK1LJU
-Yx3bj0EjDLUoEudiuySYedcVian/i40vKYxOqjt58ewJyYQPrA2lKcbV0Hy3xXp5
-KreXmIubAgMBAAGjgZ4wgZswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSv6oLJS4Ov
-F3EnzsT1IOfrUVwQszAfBgNVHSMEGDAWgBTxWbhmTT7D50LugaPURn85U3X5DzAc
-BgNVHREEFTATghFiYzAxbjAyLmhzd2F3Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEA
-RvuCKJIExJre1toOtwyjA+kkhSOyfoTwCqYasKZm6bxRbDAEOaNKHByqBHhKSVgq
-vqeau9MuOI2rib3FfqSTGcv3ryRXv9wUAnX4ZUmfzBvp2bOuu6Db3iIbE7kSOrhP
-RzdQ2shb+QIyldaErcyFLdBQ2k1+cTYfwqEST2h3YMgPvgjvcinpyWslC9Gs7yyA
-E8iVkRV5BfwumlBaMIJO4L9D3UoF0iZQJA9HYfpc61SndQWMdWlGo4ZPo01ZPlrE
-Sxd8bIaaOK89WSRnyfs/g51SxV3OR+nvpwxcf1aiIZEBYLcBMVSyxAVA0DAIldpU
-fjFqPq4RZj5zYJeWARrDYA==
+MIIBaTCCARugAwIBAgIQMKmJnztXsn6GlsDfjbj0LDAFBgMrZXAwEjEQMA4GA1UE
+AxMHZXRjZCBjYTAgFw0yMzAzMzExMjQxMjRaGA85OTk5MTIzMTIzNTk1OVowJzEl
+MCMGA1UEAxMcbm9kZSBldGNkIHNlcnZlciBjZXJ0aWZpY2F0ZTAqMAUGAytlcAMh
+AEM5dyX+hJUX/k8yx4NQFVTDymtJca3SE7NsPnvumCuto3AwbjAOBgNVHQ8BAf8E
+BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB8GA1UdIwQYMBaA
+FN3QbVhaf7wsFgqUvuNNZjZbKlvWMBwGA1UdEQQVMBOCEWJjMDFuMDIuaHN3YXcu
+bmV0MAUGAytlcANBAPOWyI4SZZaJSqTJPl5Fwr3J8L2WtiMUh6vFhwBa+4E4Tq5a
+pe41A8RxdJaGgkoLI4YcTrLeukyYpHA3IMxTXgk=
-----END CERTIFICATE-----
diff --git a/cluster/certs/etcd-calico.cert b/cluster/certs/etcd-calico.cert
deleted file mode 100644
index 28637f0..0000000
--- a/cluster/certs/etcd-calico.cert
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFBjCCA+6gAwIBAgIUPHOtWSQEe+/bamO1mXOSSSGJ0IIwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEQMA4GA1UEAxMHZXRjZCBjYTAeFw0yMjA0MDQxNjQ4MDBaFw0y
-MzA0MDQxNjQ4MDBaMGwxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tp
-ZTEPMA0GA1UEBxMGV2Fyc2F3MSUwIwYDVQQLExxyb290IGV0Y2QgY2xpZW50IGNl
-cnRpZmljYXRlMQ8wDQYDVQQDEwZjYWxpY28wggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQC9VRlI8AnvZKPMhtDef9mrYydfINlI/QS8+CE8aLkFfhQQJHyj
-qobGTq+8ZWFWWat/t5w8rx0C4wRLSBxPDN6LRxmRoUPavmK2nH5sTzx6Zp9NomEq
-CeFg6hnaC1P9sohIOhyOcXOhmIs8e7XTwskXjHbMiCeacO8ROWXTNfemtVOQdDtI
-9akoOv89vlhgY97IqMNaomz2LkHypwDgESNnU4a9+yxr2DFqp8JiYtlDajhMvMn8
-7bWYaQ/X728fC8Du2Um7CylZMfl5iBbfmqAOkAePNDrt8+yPoTr2fx40L/2fkTYN
-LgaEFjOiJW41guXxRZRd4NSrcL4/zlniBa2BqsQI6yBDD/gKUZAyW3RCojBv7pcL
-lR6y1+hGINeToloaveX3aTSDedHPsglTRov7dgKGcPFB5z8tNU7bmEsNQzSF7Svl
-dymM/8heK4HAJaXFLqEmHGEDZAaR0mU+R55CGCDGhTlmKkzxg8Tu2rJMr3X69KRi
-5lfr5rrW7iSzuA1EHSFvCWl4RRNC9sOvfgW4dpcrjPfPs9d+zU1kQ0fQFhukAMgO
-0mBgq8aZSNjwQhcfmBTTm7soi1RtaVhqXG3Wkw8V8daxeMt6CV8n7voPXMVOOwrr
-aBc3ZW1Tt2ph78jHVoJFgU+qHJO3iIX/ArpZif4Kbx9KELlPID/jwOYD+QIDAQAB
-o4GTMIGQMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUYjrCSKoTAgECdKZTntUm3/7d
-2PUwHwYDVR0jBBgwFoAU8Vm4Zk0+w+dC7oGj1EZ/OVN1+Q8wEQYDVR0RBAowCIIG
-Y2FsaWNvMA0GCSqGSIb3DQEBCwUAA4IBAQBoyRL5csIkBvsNQz3jXh7QKSCTFcK7
-tH7AaNlQIRuMBf+puhtkxdGA5/wROvcVFHksq4HEcaYKckY3ntYi5CKff093aZHW
-pvCXh+wkOy6r9MBVAAt4uU0CkEopRvCvSo6a5eVXAALvZVYAd1+IrJ+EIphxhrNX
-DKkAgmMDZXiLBRnkn3YYIBspKJw6owFjQ7ux1kmK1wmcq9CwpjUxuByuOaTcyF9Z
-o+9S//MVyQN9GUDK8USKtrmp3Ray1NLVobu/z9s0R14PFnPw0YJac8Aimc99Uany
-n5J5fZC+kw5MLNzZe8xsZ7nlfZ9MBLk9WVqJmLgC+z2tYO69GZkGBmBZ
------END CERTIFICATE-----
diff --git a/cluster/certs/etcd-dcr01s22.hswaw.net.cert b/cluster/certs/etcd-dcr01s22.hswaw.net.cert
index 157d652..fb1c101 100644
--- a/cluster/certs/etcd-dcr01s22.hswaw.net.cert
+++ b/cluster/certs/etcd-dcr01s22.hswaw.net.cert
@@ -1,30 +1,10 @@
-----BEGIN CERTIFICATE-----
-MIIFHjCCBAagAwIBAgIUCryXyuDTaO2ReZPFaHplVq8zVNAwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEQMA4GA1UEAxMHZXRjZCBjYTAeFw0yMjEwMDIxMzI1MDBaFw0y
-MzEwMDIxMzI1MDBaMHgxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tp
-ZTEPMA0GA1UEBxMGV2Fyc2F3MSUwIwYDVQQLExxub2RlIGV0Y2Qgc2VydmVyIGNl
-cnRpZmljYXRlMRswGQYDVQQDExJkY3IwMXMyMi5oc3dhdy5uZXQwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQDib61eHI9KxUqLPqI/KeUVB1VmNsuu+lxR
-rHSLikDDNMJx5Kez1CM8jLk9bSsa5AL5dyitE0JZwQj0gxdLpRAeHbpyFQTNAEUt
-MwW0e0gZkKzqMm4XsmItWefoXUwn1yrn6GvGkomrh9msbBS982Qi/qKziLLn4pJK
-RQU6GSMMnpEtTI06nWDKeni9S4plDRJPDRF+rj14O2QcQwVeeOqm5zGI3M7EN233
-D/nAlLjqJe7dCq7LGyqQk7/fbAIzA+II2vYX5kQFi+g8+j8iLziUFmWEU4RYPX3P
-cwzgrnBi4TSq9uXmfZFOOJT2N4Pl4UvQVX7CTuuy4jwT3x0ECEHNupPKeVLkToQw
-DhTBOCWFcEFS9PbdDbH2J+sKUo0R7MsuaXk8k5XJinJjfObUFPeCihZ2NKkuxPq9
-B9cd6uB8vilQW1xluJJzuJiRj1QO6ZtX+XS/Pm2iLXKRK00H+6KH/BCXjfOxS69Y
-GQtUjoJ0Ermor5CfvnkrfWPwcTB6RKZnGkg4N/p+VsGpdgZzeqCuS8sI8L0dyYXj
-W0PFqnthRhPYXv3VP2wIL8MQ5OkTq5hX4QnegmF78zyCkWEO5Rj+3AHkQaF77kNS
-BJImZIl4KlWEvsfxEWrJbr8gOOnjWkljqrlnTxym+VWtavYBqbzOD6AElFhhDv7Q
-mBVuMoKtRwIDAQABo4GfMIGcMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUH4gHxXmo
-ZnxR/Tf2BJMylqE9YYAwHwYDVR0jBBgwFoAU8Vm4Zk0+w+dC7oGj1EZ/OVN1+Q8w
-HQYDVR0RBBYwFIISZGNyMDFzMjIuaHN3YXcubmV0MA0GCSqGSIb3DQEBCwUAA4IB
-AQBQS/i7TjM39GT32s/Zwa/nekpDS68U9P+fM8RzxvO+FHa3J0gXAyu1p0m6O3tC
-uvXffmUqZ6C8SFeiiO/H7b6iyJe2LxpYvE7w7Q44Soqa6SF8QGg2zhUPjSgQgq3p
-1h/yyNIytfbxm1Kp+veQV0HaZNNnAiz8kY7jmJ98OmQUVvPQcla3KEXnzCT/xfYa
-yN2RB1EP8uPO8WgRq9eSIvMWld6jzi3OQU/4CC+K+UdgwvFpGiQ9+J7hsjQjTNSn
-EI+2ISwzO5O7lRORt9MmAC78J2fl3Y0Vt+oPUbZ+vNB4pJg1+sd7gv8Lh6GGDcNE
-VheLb9JimU2Zh0hbK2CZsqtT
+MIIBajCCARygAwIBAgIQMFJcyjF8qcP1axdKPaB+ZDAFBgMrZXAwEjEQMA4GA1UE
+AxMHZXRjZCBjYTAgFw0yMzAzMzExMjQxMjRaGA85OTk5MTIzMTIzNTk1OVowJzEl
+MCMGA1UEAxMcbm9kZSBldGNkIHNlcnZlciBjZXJ0aWZpY2F0ZTAqMAUGAytlcAMh
+AEuKCEPrXPgtlD97lokOQ/L5tyKHLOZIE2cZECC+OuF3o3EwbzAOBgNVHQ8BAf8E
+BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB8GA1UdIwQYMBaA
+FN3QbVhaf7wsFgqUvuNNZjZbKlvWMB0GA1UdEQQWMBSCEmRjcjAxczIyLmhzd2F3
+Lm5ldDAFBgMrZXADQQC/OIWxpEjtNS9NSgAqEtigJJGOuMuPVZ0Ek61FlKL2TYaE
+q+kYf4zOSKySEzNAtVDXCw58qZRRo1PDaKzTybkC
-----END CERTIFICATE-----
diff --git a/cluster/certs/etcd-dcr01s24.hswaw.net.cert b/cluster/certs/etcd-dcr01s24.hswaw.net.cert
index ce5a22a..643ba76 100644
--- a/cluster/certs/etcd-dcr01s24.hswaw.net.cert
+++ b/cluster/certs/etcd-dcr01s24.hswaw.net.cert
@@ -1,30 +1,10 @@
-----BEGIN CERTIFICATE-----
-MIIFHjCCBAagAwIBAgIUZyJSwTpPYQNrq/9v7jF/W40l8HEwDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEQMA4GA1UEAxMHZXRjZCBjYTAeFw0yMjEwMDIxMzUzMDBaFw0y
-MzEwMDIxMzUzMDBaMHgxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tp
-ZTEPMA0GA1UEBxMGV2Fyc2F3MSUwIwYDVQQLExxub2RlIGV0Y2Qgc2VydmVyIGNl
-cnRpZmljYXRlMRswGQYDVQQDExJkY3IwMXMyNC5oc3dhdy5uZXQwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCl0NRZ5k7SgPeq7v0L/yGjgW8ifJV/3HJQ
-6gkltWOr2AyQDPHfHMglMFq6BPPVrnhzb6B8YAX8EQNQDyPapPgSYfrOJ0X734wl
-oRqGOg91byYHP5jNtaxxWZ3iM30V9mpkLGhqpsoauLELXim4I8LV9QmfDaaTC8M1
-7JrpGZyVE6u97xxpz8dfwDcRD7LrXxPyRE+bfjtUSXKpQOi9Ahaw4YN6PAkhl+fV
-0G4mbX8nlY8QDZktyLo/mDB9yhN5zawVOX0owKM9sUPlnsIMHaydwtxShxWpRF6T
-iUi4SMRF7tNe/URfO6ByahCt3V55ze4jVHFeGw3qqElE5NTQ4gI5iY+CpHHEQAm+
-s0eI1jQCC/emkjt87JJlC3q9OtJ/V1ISg5lwg4tE06MMPeR5Qzs8yctf8eSZXfP7
-p/tYA+CA498+rmJ2I8jqqQClWRq9Ub1g66oJUu9pnEAaNunTgANB7iTYolhcS0W9
-I1AHUD9C07z65e1QGRkAfgOojafB+o8lDbPXH+KKLRs+1Uua3CJNFvD+BSk96ARX
-Req3sZiQNvUcdbw5SqrawRj+FXBbjhecslDha052KvVG5KJgM6v8RXOxrZvB3oGS
-ZLiLOgex7HiDLrvX+Doi6JtBpX62tbx94gsm0M70zpfP5tIe/ECVFUEFelCTnSak
-mLCtTKuDyQIDAQABo4GfMIGcMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUyyvX/j6W
-TiyCWhZjXwJavrVm+McwHwYDVR0jBBgwFoAU8Vm4Zk0+w+dC7oGj1EZ/OVN1+Q8w
-HQYDVR0RBBYwFIISZGNyMDFzMjQuaHN3YXcubmV0MA0GCSqGSIb3DQEBCwUAA4IB
-AQCWGQbo2sflojML5GP2CAnoA2VKeMy0IoNnRgcLrId91AW1gD+rRQwjwIN3irgq
-5BCSSE3wh9yRObUiDpoSMPoktn8GUsZiJg/8l4+s7jKsQtJol5q/j39JjtAbt60A
-UkLKXkroHSxsfnex3AJylBMUqfQVEGS01DqtqRHTg29rkQSJc0O8rlkvOANa6T9l
-bC3RLr5L1O7pU7yf8DKtYhSP2N6qnYp8I8Tg8VfJ9GxLb+JToX0DvFGzyRy8V6sm
-aG7bFo+MQPFoPAe1zc0TTfIZatrlKRIs41AVVBqDK9L3jk4G5wbTsWziq3vIUYZU
-9W6wSIwHoUMgJYUUSJntGHjs
+MIIBajCCARygAwIBAgIQAfs6YlM09bKgkHzA41hfMTAFBgMrZXAwEjEQMA4GA1UE
+AxMHZXRjZCBjYTAgFw0yMzAzMzExMjQxMzZaGA85OTk5MTIzMTIzNTk1OVowJzEl
+MCMGA1UEAxMcbm9kZSBldGNkIHNlcnZlciBjZXJ0aWZpY2F0ZTAqMAUGAytlcAMh
+AHDMNKihjxhdgmZ3sM2Sfuvdd6qzJ2K47NpGsgdw/ZBko3EwbzAOBgNVHQ8BAf8E
+BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB8GA1UdIwQYMBaA
+FN3QbVhaf7wsFgqUvuNNZjZbKlvWMB0GA1UdEQQWMBSCEmRjcjAxczI0Lmhzd2F3
+Lm5ldDAFBgMrZXADQQB5ncl/z62C3eHQE3jrxY/XbMBwOK/MB4Vph+o1zY84v93n
+DxOqFwLlQ3WabeX6EBwDigc9qUaV4oGQ/D63c0MG
-----END CERTIFICATE-----
diff --git a/cluster/certs/etcd-kube.cert b/cluster/certs/etcd-kube.cert
index 3a53955..51536dd 100644
--- a/cluster/certs/etcd-kube.cert
+++ b/cluster/certs/etcd-kube.cert
@@ -1,29 +1,10 @@
-----BEGIN CERTIFICATE-----
-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
+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
+feYRVTUI
-----END CERTIFICATE-----
diff --git a/cluster/certs/etcd-root.cert b/cluster/certs/etcd-root.cert
deleted file mode 100644
index b98e2b9..0000000
--- a/cluster/certs/etcd-root.cert
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFAjCCA+qgAwIBAgIULyf0zVf+s4DWMTNFsg//9t5PtaowDQYJKoZIhvcNAQEL
-BQAweDELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEQMA4GA1UEAxMHZXRjZCBjYTAeFw0yMjA0MDQxNjQ4MDBaFw0y
-MzA0MDQxNjQ4MDBaMGoxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tp
-ZTEPMA0GA1UEBxMGV2Fyc2F3MSUwIwYDVQQLExxyb290IGV0Y2QgY2xpZW50IGNl
-cnRpZmljYXRlMQ0wCwYDVQQDEwRyb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAudCBVJv66aRyizfh20/PeIt7iSP9HpTorxxtG0Ti7ybjhu7gpkPY
-AK4Zf6YyYPgIjmv2hagp1iCO/PZYlqUL73x3QyfRFrAighRcEh/v7zMGbgIrZPO2
-ida7A7q4V0VcPaK/zPNt0gAlcoZSXuD5WDKCdFA9elDRLpdsgtDe7BjTgBp0MTzj
-2NBUoTRso36Depxuh2OgnvQa/nGhAOV5GCovMQ6PA19mhnZnK+JUZXwYWSnOfzay
-R7Rjy3eRsnoQq7x7Dur+RAnX9BDXUObULJgA6cHpEfxU/fnpCqWXZOWYgougeWdR
-9C8VyB0G7neVQDZGDYSVx+VH7D22DPLmmqRAgsFs7aF6E1Yp15no3P2kTxHEYPcM
-us8aNOZgs4pgeiFwPmu+aT+vW2mf82IHjPPAFfhkrzBodS/LjHDpAFklb+/wp/yp
-MYtCuXucm9kbV0oXxx4la0qAYSAfL13wHTU6WXs9WAMEeqqQqLYRmvmssVtanYJU
-aRNZjCOYzTTi5gILUTLzBBPxgTpLsbCO97EueVrAer4s9C0dBcYksRXs024+N//g
-4pYyJAIuI/ZRJIbtHItkmw8mdwizynXtkRtvWl2lV1qHilo+p3xhSrh0vFBGO+wu
-T8aragUdbC/XGDoecHBr7KDZIYx7cZw2vI9xMqujP4hLhG9d6Zko810CAwEAAaOB
-kTCBjjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFDDZWVeg57MP21XCkTRqzFR2Omtt
-MB8GA1UdIwQYMBaAFPFZuGZNPsPnQu6Bo9RGfzlTdfkPMA8GA1UdEQQIMAaCBHJv
-b3QwDQYJKoZIhvcNAQELBQADggEBAJEqE+bfRVdt637gY/FFZy69b49cTOFqSbbM
-23xf00uOnO1isA7dZuO6aVEYE3DaLPF5geLaMCylQIDgLx3kMkToBOLTwCJSv0q9
-VIVm3B+uiqNrhuYQ+f6VJEeEfmpN2FaHcSuaU5414slsfnDDhNDDUR2ACxyDFoT6
-tInDQd2SsqYoowVfYnG/ZdA4Pa/Fj3Fm/DIywbxW85vegRK0QDu6q4Hlq8WRo5bX
-19AyXt+2cbG0JlmHI9X7F5syb8GtqUf8JtVETIxtbyW/n3aS1iYaDIpYBIoKhSDp
-Bt/o/lJSML34zo0fdEw0rLL77Ljg0M7yeZQOVAq1TAHzTawOgsE=
------END CERTIFICATE-----
diff --git a/cluster/certs/etcdpeer-bc01n01.hswaw.net.cert b/cluster/certs/etcdpeer-bc01n01.hswaw.net.cert
index 4347338..109aa1e 100644
--- a/cluster/certs/etcdpeer-bc01n01.hswaw.net.cert
+++ b/cluster/certs/etcdpeer-bc01n01.hswaw.net.cert
@@ -1,30 +1,10 @@
-----BEGIN CERTIFICATE-----
-MIIFHzCCBAegAwIBAgIUbnHH1gt1UHETXeDGnnqHIuR99rowDQYJKoZIhvcNAQEL
-BQAwfTELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEVMBMGA1UEAxMMZXRjZCBwZWVyIGNhMB4XDTIyMDQwNDE2NDgw
-MFoXDTIzMDQwNDE2NDgwMFowdTELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93
-aWVja2llMQ8wDQYDVQQHEwZXYXJzYXcxIzAhBgNVBAsTGm5vZGUgZXRjZCBwZWVy
-IGNlcnRpZmljYXRlMRowGAYDVQQDExFiYzAxbjAxLmhzd2F3Lm5ldDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBANQ4DOd1qBoznMwL9bcmjZydm0C45RPY
-hFsUtt8R6+eFUxMOnP5Rvi9xP1wdI3+AiZQUfaYN+D4UxG3FzpvR9jIeVOVvsukP
-pgrthXSiua2o/G8W2BjTIQ84PfG3dj6g8WRX5E7Fas8y3oEQ7rPkNQDDFpB8RS8b
-kDF06lHdOdxpnemukZMI6nsJkct/onfbs0W8pxMvTC+ihpT01rzIKhGL74MBs9Oc
-LUmRDKdKYXhZKT3rXoAtuRkOSkAntmtsyenhVtyKYiMJl8gu7DCDRgxY4E248JlS
-0hGlToGF/anWC6VzZc04HcQOtQJVeS0hdDOFSS6bKyunnNaXHXcsuC8MwDwCWNwd
-98b7pWkg/gcaXTztktgdv7S5oYYQuwxr/lHsC0FWfsjwAjElLZgA4T3SATsDFMJ8
-WsOFiqQkaVP+ToUn1dzimQ+XoyUt+B9GKVwD54Kv03dJC97LiBlAShQlDCEN6pBK
-7nBqBlheRwQ3TgO70wKOUOMll4Lpi1OpDFxuaOC8XNPo7M1/DKa5UNTo+3NqnzPz
-NLW2qxKWokhXDcmnCTZf7orjT/I1BoXbvkeXsp13EQ6TV7ig3WcXwM61d4qaqbtt
-mK1TGvL7hNR1C/Vn23kEd7GD2OQhpqKwP3t361IYtulMCZ0rBWckLL6xeIhA0J/w
-jY2YqZ/kzPGLAgMBAAGjgZ4wgZswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ+AVJ4
-b1WbetRtLuoHoZkRG3TyJDAfBgNVHSMEGDAWgBQte5qvaKoZpMwqiL74duS9J6ck
-DjAcBgNVHREEFTATghFiYzAxbjAxLmhzd2F3Lm5ldDANBgkqhkiG9w0BAQsFAAOC
-AQEArI2xofhvLuKd/0G3OjKjkozjytmo9WeDm46ozj+8vu+xKexJ6L8+TP+VeGpR
-ajUdRQ5mw+ZXWRxfjGDUvK1aTKThaA2Q2TJU5py/EQMl2MNp4NCjC6otOoE4yuDA
-fbgoJ987EPduCsnmUdEVmdp2AObL1vaH7CLnp5DTvyrl5a7FYzjnhiMCGpF4rdNv
-mEWWIvWKMsymYuKDSZLG0X8WomurHpdRoTxe/nQd+h6cO02t9zk9hFxTjeYPFuuS
-OsUbbIDUJ+qD7KB1pW2zLc+65lXG1WFW39iUBY7V1hFczODc/x1Mj5ahbSdcN21E
-krWkIN7uxLObfGOEJLlP2e01xg==
+MIIBbDCCAR6gAwIBAgIQexZGbzXAw9hwMok1XVYUTzAFBgMrZXAwFzEVMBMGA1UE
+AxMMZXRjZCBwZWVyIGNhMCAXDTIzMDMzMTExMjcyMloYDzk5OTkxMjMxMjM1OTU5
+WjAlMSMwIQYDVQQDExpub2RlIGV0Y2QgcGVlciBjZXJ0aWZpY2F0ZTAqMAUGAytl
+cAMhAK9djihIX5NezBk82kzPZ2aftKZ6kye+Sbck3ABMkWRuo3AwbjAOBgNVHQ8B
+Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB8GA1UdIwQY
+MBaAFAvAwatZ4EdIvITkO10WOdubny75MBwGA1UdEQQVMBOCEWJjMDFuMDEuaHN3
+YXcubmV0MAUGAytlcANBACAYTSgxoU95wOk9ObcNy5m6Y+Als88MPX4mOu1t/KhQ
+qxnISO+jMFd6xmhOn8rf4quD3cZgAzaP76OlJ3sg4Q4=
-----END CERTIFICATE-----
diff --git a/cluster/certs/etcdpeer-bc01n02.hswaw.net.cert b/cluster/certs/etcdpeer-bc01n02.hswaw.net.cert
index 8a72d94..c866663 100644
--- a/cluster/certs/etcdpeer-bc01n02.hswaw.net.cert
+++ b/cluster/certs/etcdpeer-bc01n02.hswaw.net.cert
@@ -1,30 +1,10 @@
-----BEGIN CERTIFICATE-----
-MIIFHzCCBAegAwIBAgIUe12YvvMmr61zSw3WgNKoP8S6XVEwDQYJKoZIhvcNAQEL
-BQAwfTELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEVMBMGA1UEAxMMZXRjZCBwZWVyIGNhMB4XDTIyMDQwNDE3NDEw
-MFoXDTIzMDQwNDE3NDEwMFowdTELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93
-aWVja2llMQ8wDQYDVQQHEwZXYXJzYXcxIzAhBgNVBAsTGm5vZGUgZXRjZCBwZWVy
-IGNlcnRpZmljYXRlMRowGAYDVQQDExFiYzAxbjAyLmhzd2F3Lm5ldDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMWfZpYs+wH/qg95+KXgIPMDUN5fuwmp
-TeiiTpzpck6Jt+9aXA+fTtVM+O/v5lkef3X0Atj3ONisVjjoeGGd8y3WDaDakul5
-MkeNJ97nOWp+sSWDmgkG7wANZ3JtdQJhiKAZdgSjgvxYmEK/kbKZTrTezRjmDSy8
-YreoQpuw68Kru2WtiUdGA33yWepDbWlivuTONKUf3KAlGuAn/eJuC4bC1W4rQxq1
-7QpkDkFUD+FX/27rvFDvnvq4BhDp0v5EaQYlSEfmpw/rlWEmEDz4TFnw4uiQ1eet
-Snqfo70pBV+DVs9ez7k0oogA/tIsr8T10kQ0cdpcpbvyLzp/a5FS9ZEnw1tQKyxp
-Um3d6sreFyiwoCDIRy0Evyp5iDoTp4S/WbCQZHqvQRIBCGWuZS/HUzsLClvuzal1
-q+9WgUpYv1Wi5bYflbz8ZYZETi1v+gZXhLIJIf7eE2dlXEUtPhVkIMrOP27UiUfp
-SnDBJKAa2vVlxF+34ray1ivvYzuj11X+l9GPHG1i37qrmhNrOJe7sBp5VZrBgXdf
-e/C/XExiueeAvhc46+25ZAqU1JXhodG1zT9Iw0ufiLuAB0oT+SQLEgMizI7JK0h4
-ZbXFodA+xknc+R2MkSjRI8YPJRZnB/1N2tObJAW1tb1RAliPcMhsNdoPLX67YIhO
-tROPnfKN2iTpAgMBAAGjgZ4wgZswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQzpNgs
-s57/rdxm88PxZpnFUvIiTzAfBgNVHSMEGDAWgBQte5qvaKoZpMwqiL74duS9J6ck
-DjAcBgNVHREEFTATghFiYzAxbjAyLmhzd2F3Lm5ldDANBgkqhkiG9w0BAQsFAAOC
-AQEANbv9ZUfLtr2j5XgohsVXS7x7r3lSPAKSWDKwUqKwY4yLrlzODIYASDpneazv
-zZdgX6tCPComOYoAGf90DYu4BTQN++RilxqdekmAQvg5uSRmg1RimCugpD/YvvQy
-QoHotSCHfQYdAbE41SQ2LCxnY4ximSOASKhK/okez38HY/ty4ZvyrxwJE4AXUJHK
-WPvqr84KHx7d96DmRSgM6++/zo7s2wXSgOG4HWNyy67S0SPsCuiL5fcNts7F3Yjq
-9/e998WHGh57VksIiNaSQ6Ti2+Sp0mBRtB8pQIhjJ4m8M1hZM2yvHCtGhLyD9H20
-qN2xKFeyr+Llc+cu5XG4eg60BQ==
+MIIBbDCCAR6gAwIBAgIQWRNKKtlk1mHJS2pg28GIlDAFBgMrZXAwFzEVMBMGA1UE
+AxMMZXRjZCBwZWVyIGNhMCAXDTIzMDMzMTExMjcyMloYDzk5OTkxMjMxMjM1OTU5
+WjAlMSMwIQYDVQQDExpub2RlIGV0Y2QgcGVlciBjZXJ0aWZpY2F0ZTAqMAUGAytl
+cAMhAFLXlqfeIAteY5v28//w1Y5UTbU48EJgBIwieHYY2Dvao3AwbjAOBgNVHQ8B
+Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB8GA1UdIwQY
+MBaAFAvAwatZ4EdIvITkO10WOdubny75MBwGA1UdEQQVMBOCEWJjMDFuMDIuaHN3
+YXcubmV0MAUGAytlcANBADGaU1sTmi7W5CS2AglkxM/EOS7M4UTUwojEjRGNOxzq
+/sPapDV0oUQTekKAtAxgNLSeAg9wN2TntuoNGb9r/wM=
-----END CERTIFICATE-----
diff --git a/cluster/certs/etcdpeer-dcr01s22.hswaw.net.cert b/cluster/certs/etcdpeer-dcr01s22.hswaw.net.cert
index 421de7d..57f00b3 100644
--- a/cluster/certs/etcdpeer-dcr01s22.hswaw.net.cert
+++ b/cluster/certs/etcdpeer-dcr01s22.hswaw.net.cert
@@ -1,30 +1,10 @@
-----BEGIN CERTIFICATE-----
-MIIFITCCBAmgAwIBAgIUcBO3XRpETW4fzQbhEJ3RSZdIXr0wDQYJKoZIhvcNAQEL
-BQAwfTELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEVMBMGA1UEAxMMZXRjZCBwZWVyIGNhMB4XDTIyMTAwMjEzMjUw
-MFoXDTIzMTAwMjEzMjUwMFowdjELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93
-aWVja2llMQ8wDQYDVQQHEwZXYXJzYXcxIzAhBgNVBAsTGm5vZGUgZXRjZCBwZWVy
-IGNlcnRpZmljYXRlMRswGQYDVQQDExJkY3IwMXMyMi5oc3dhdy5uZXQwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC8CX6AHfDOCXrNacddsGApq2PZMQ5w
-UpDZQvS5ZacFvnP0zXyktcNYuqrwwnUCsMBdceG0WLiUuvmQNdx7+c/OtHJzS6Yn
-RG+TV3K6gYzcm2KlcD7R7THZuPxkwM3EhlGiwdzfgWXpqve2v3zIOQ21fRi+qJdQ
-8ZtVz74CD0rLNBgST+EHraLdeeAxmiYJFZ1Ge/Eh06Pa6ZyCI6Rfp9w2VDhBhhMF
-gVFl6J/7s56DnO6B/ecz0K1ZQlUxgZKzEIxdnv5380QikN8OApHAXxFmkOi+jTsq
-igzzJ0l9ZxuVFVDdTFQI3L4wjFF0hqcfmOV7n8rpDhp7DMqomPFNyQHliwRkBhG8
-In2N+nAPPwEKKWR7tnzk599B88msYpuv9PBpLxnlxWc8DFkn2bOJwLXB3HajmSb6
-r+a0Cs3nJhCfuynBJhusXbiwAGLJ5WRFKi3MDeFLffovO0jZ92y+PzoJb5RlIGE2
-2vhV8zZAI4WU1QOjgX86o/FIRVUz1WqXE80ZIyoB+wnAgBCTwLSaA5IgPpEMaKH/
-ierbL7L/2hnrUGMMUNRGH99VJoTDsoufZTvPmwrWD7uK0s+91o/fWPc1IOaCJBeE
-SUS2dwjHdqWwQRvkQyAbiXh8CRMs+aOoLA7Mwdg6s2fJbRE/U11Bs/5BTl9AWvqj
-2GFIxKbDMZ3vVQIDAQABo4GfMIGcMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU1Yhk
-16mTklzv3gvOdw38WrodcA0wHwYDVR0jBBgwFoAULXuar2iqGaTMKoi++HbkvSen
-JA4wHQYDVR0RBBYwFIISZGNyMDFzMjIuaHN3YXcubmV0MA0GCSqGSIb3DQEBCwUA
-A4IBAQB1XV1J9f2CToNo3i9IRGY6nAaE5J4xigAUyqto1Og1zs/aG6M5APeMnATM
-qZ9cf7aiCnEgFmUY/kzTeKhu/GrdDzBqrl9GA5A6UE7VuHA2rOsMdY0/5TRkdHYz
-pOjopDgzg5qfFz/aq4rD4nmRNhBET7OxxoFmMecUKBbSCOZ0znf6J+qE6sa59mdi
-fbVjYJO4JULaqMoe5JpE6Cs3+OZu6qdUNIQMaZxV1DLIa9YLtZtyQCBUh3COwV7s
-dgBx6lshnHfuXMn9v0eOkicMlv3KQXHtG0VBNJVmOkft4zUUYD4ItCCf9B8LlNGV
-p+nfyiIyV9UR9mBIlUhX9QOfb5tr
+MIIBbTCCAR+gAwIBAgIQXs801vVV/83F/ts4i9tl4zAFBgMrZXAwFzEVMBMGA1UE
+AxMMZXRjZCBwZWVyIGNhMCAXDTIzMDMzMTExMjcyMloYDzk5OTkxMjMxMjM1OTU5
+WjAlMSMwIQYDVQQDExpub2RlIGV0Y2QgcGVlciBjZXJ0aWZpY2F0ZTAqMAUGAytl
+cAMhAOrYrTCVdYQayhGlNnmXNvZrm6fnV8Z3MeA2eHO2hjz8o3EwbzAOBgNVHQ8B
+Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB8GA1UdIwQY
+MBaAFAvAwatZ4EdIvITkO10WOdubny75MB0GA1UdEQQWMBSCEmRjcjAxczIyLmhz
+d2F3Lm5ldDAFBgMrZXADQQBSy98ou7deo8+/GoBM+fTx4j5haNg1A7vFUxybRYg6
+D+RrVHNVXpBgsURyOzIYBkHR4y5hrMX8TG5XQ0gmkGUI
-----END CERTIFICATE-----
diff --git a/cluster/certs/etcdpeer-dcr01s24.hswaw.net.cert b/cluster/certs/etcdpeer-dcr01s24.hswaw.net.cert
index 0dfb977..9fb551c 100644
--- a/cluster/certs/etcdpeer-dcr01s24.hswaw.net.cert
+++ b/cluster/certs/etcdpeer-dcr01s24.hswaw.net.cert
@@ -1,30 +1,10 @@
-----BEGIN CERTIFICATE-----
-MIIFITCCBAmgAwIBAgIUZBeHSXUE+8zeQwmW7u0bvALWxMwwDQYJKoZIhvcNAQEL
-BQAwfTELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93aWVja2llMQ8wDQYDVQQH
-EwZXYXJzYXcxGzAZBgNVBAoTEldhcnNhdyBIYWNrZXJzcGFjZTETMBEGA1UECxMK
-Y2x1c3RlcmNmZzEVMBMGA1UEAxMMZXRjZCBwZWVyIGNhMB4XDTIyMTAwMjEzNTMw
-MFoXDTIzMTAwMjEzNTMwMFowdjELMAkGA1UEBhMCUEwxFDASBgNVBAgTC01hem93
-aWVja2llMQ8wDQYDVQQHEwZXYXJzYXcxIzAhBgNVBAsTGm5vZGUgZXRjZCBwZWVy
-IGNlcnRpZmljYXRlMRswGQYDVQQDExJkY3IwMXMyNC5oc3dhdy5uZXQwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYaeLRNwXmdRabgLr4AxRpEHOfMtru
-VmpsCTQ7RMF6PaHrRNcx640iGmV4YPo3NDGVxncMYW34vmTeM71vnO1raB2bgESP
-jo4ghRLrXNCTgVDyQxSlRUiF2uc5sNH2ekevCiO9Mq88s5yFTqIAHDtgXPX+Ae1Y
-VIZ2p3iow6nyRn/ohVlzgdwSjIrpzQ0q02morbB5CWqweMWXSow6lhOVeCZnS6fM
-8Whe3wVja/sB00+/AgNKFylmZdq34CviRu5SdAO+dRJeoPQCXLquhQSGIRk/VaWA
-YS6QPYNwP9+LuIQrPXqe3oezCoPgLR7Vb4El7J841Fu1jrjESzUMyvCfs9Y582dD
-W+gimbKdD8/W6i3AbSyGACECJIciW/N6lx9PPfu6uLDa7fuXMieF8sC4T3/jw+21
-pLGCtEoJaXlGng0y0uWGNmdNv8upspHDnwxAGxWPcn+m8VgV0KmU1nlM+gRGlQLc
-O9vgz+laysPC5C3m40edOFsPe5SQWOalOkiQ6REQJolx6IVPZeB+ZOYE2LYwxFnh
-7Jbp4Dx5IlAVRS4OYqSBY5+vwWp2f2AshrUZi9rEY3Mk29oJcGM1uoPg8iNo6+aM
-ZJQ+fe7OxSfD+oRX/g+jZjrWfbW4trtqRtH8JOE2zRSmNOzJZYGwnaG5M0/R0zOb
-Lcpe5xu0kDXB+QIDAQABo4GfMIGcMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUI6hU
-9NpYy72mFYPrD2Rs8pEFR6cwHwYDVR0jBBgwFoAULXuar2iqGaTMKoi++HbkvSen
-JA4wHQYDVR0RBBYwFIISZGNyMDFzMjQuaHN3YXcubmV0MA0GCSqGSIb3DQEBCwUA
-A4IBAQB77DOGa1Q3ubshyIXDKABSlXlKHcd0k8DcK/Wk4l9ke9w7sC30jGKKRcEd
-SSqnF07XZ+U0r4DyiD132DuiE9rzIOdRf5S60gr36XpszA5OFfVTBmxa/9P24On7
-YYsP0GsTl4SeUskCl+GqW0pBhqj/3Bz5ZmUUH0a/bsRSkbZk49mPwWuoRiPkiBxE
-xFHi8J1gT5QrnZ42SZGkJWWWx/k2cjfQxfSSrHuMhXBryMq1aS5nwVIqD6Wb7ML4
-s7YBkor9GT5umjpcD5u+vipL3aHi6RwmZ2X6ljluG3HXGEbocOZb/rvFRZoI3VMf
-9kXmPKSV4MOcRjWf5iWXkXGjcD+X
+MIIBbTCCAR+gAwIBAgIQdVjs1BeyU8IjNMwC++xHVzAFBgMrZXAwFzEVMBMGA1UE
+AxMMZXRjZCBwZWVyIGNhMCAXDTIzMDMzMTExMjcyMloYDzk5OTkxMjMxMjM1OTU5
+WjAlMSMwIQYDVQQDExpub2RlIGV0Y2QgcGVlciBjZXJ0aWZpY2F0ZTAqMAUGAytl
+cAMhAIv3+5GXDFullaE4VsiePx2FPyCFgoPWjJ7UegLVYTk/o3EwbzAOBgNVHQ8B
+Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB8GA1UdIwQY
+MBaAFAvAwatZ4EdIvITkO10WOdubny75MB0GA1UdEQQWMBSCEmRjcjAxczI0Lmhz
+d2F3Lm5ldDAFBgMrZXADQQABTWauXlcaxpqXE/+7eF8KA6Txe6twpieqMG1Rsx1z
+3qmd5/Q9+A5XY19pXXjVLm+Z0o/y+Lp37FkbrjR0Tw0C
-----END CERTIFICATE-----
diff --git a/cluster/certs/kube-apiserver.cert b/cluster/certs/kube-apiserver.cert
index 4186b6c..b78083b 100644
--- a/cluster/certs/kube-apiserver.cert
+++ b/cluster/certs/kube-apiserver.cert
@@ -1,30 +1,11 @@
-----BEGIN CERTIFICATE-----
-MIIFOzCCBCOgAwIBAgIUewr6xBQ9YR/GYKoblU+eCaA2ddYwDQYJKoZIhvcNAQEL
-BQAwgYMxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tpZTEPMA0GA1UE
-BxMGV2Fyc2F3MRswGQYDVQQKExJXYXJzYXcgSGFja2Vyc3BhY2UxEzARBgNVBAsT
-CmNsdXN0ZXJjZmcxGzAZBgNVBAMTEmt1YmVybmV0ZXMgbWFpbiBDQTAeFw0yMjEw
-MDIxMzI1MDBaFw0yMzEwMDIxMzI1MDBaMGQxCzAJBgNVBAYTAlBMMRQwEgYDVQQI
-EwtNYXpvd2llY2tpZTEPMA0GA1UEBxMGV2Fyc2F3MRcwFQYDVQQLEw5LdWJlcm5l
-dGVzIEFQSTEVMBMGA1UEAxMMazAuaHN3YXcubmV0MIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEAsx1dks+6hu3dWLizbUf5egqRfax9oaKJn7H2+F0ndoIX
-OJNi13aIAWjwD8OBza5xVTmzv1o1jF0AksHqioCjDbMF4MwdYUToj0ELysSX4eeG
-8Ho8Fq+sSXK3/TSSB2zb/OzY+Ox2B6DQRQjv0a0XmxOXY2mIvHMb3bckhhoWchBD
-YY/HU3840wpsnLvj7zPcZCsmKhnWywWErLvBN9I/28GraTszOKS3+NId9OTPlESB
-s4xnSfNB25JJ+vVhbZaNB2oq2FJjeR7yytR54rC4M5rgPwiOjSc1Po7m+aeJa0EV
-Or4iUT+5kn+S4ckdkP9EkzYDZZENoz2A4BacjRE/JM16Xd/4Yp+O1lreTlEWOelD
-XeKcAkLm+ZePB0hYixuR3vRvfhca+UQv8Y3v8dAAit/shEULmas3JUTGt/OdLYH3
-rz8ITYOn9f5sYP5J81AQIM5IyW9NuGltN9Kv4IeBN+L8DQcLJ6WHBI54u8IrW4pl
-GU/heu8KNFxsLNaIOQY8elGZHYTL6UBs5MqFrk/AQK0qmyLS8oSa1WlzwbPiaNXq
-aE3Hl1VF+3A4qEx7y9NQmJr3x24YY7xGhfXXwz8Ac+OBct0sx/2u3W+NQ+u5zI1C
-CZQVKln1s/oO40pxTB1SAlIJW3Kd8gvcJ+ZdIiRJDTO3YWf8JcpNYrSe270r/W0C
-AwEAAaOBxDCBwTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFKBFe5T0rvllN4ZQuSFH
-UGOcke7SMB8GA1UdIwQYMBaAFJgyXQ5PMx77CemJJBMWQmqA0ZnQMEIGA1UdEQQ7
-MDmCDGswLmhzd2F3Lm5ldIIja3ViZXJuZXRlcy5kZWZhdWx0LnN2Yy5rMC5oc3dh
-dy5uZXSHBAoKDAEwDQYJKoZIhvcNAQELBQADggEBAICzG8usQwna6lEieTwTm2u/
-g2e1k9s2+QFJn3X9/2v32lWWFlgKJenIuALfaeLq5ISoo7L0eiLy3Z+CKrlm3d17
-svvHNF76Kpdc4qv5p+R+2mmt558SHwUYLnbFL8omXb/JrtRUIY6ALBataqJUxOh7
-t8duPee+94++Gl4G3zitVzjOS3fBepxfCsiA6/ku2bYygJAU4TesYv8SjtITeXpa
-xX0IQB2Tp/3InECkkH+6bczi5eYOvuRfEfI0Dq/NjmHHKcaLtnzfXk2/5CQvkhAm
-kIz6tb65ax0OSd3jQ5QBlGn/lk66djxrqPJ298TgkrGYibd8wAryihgBDvql3Xc=
+MIIBjDCCAT6gAwIBAgIQE4AB6OJkrNroVln8m3IqRTAFBgMrZXAwHTEbMBkGA1UE
+AxMSa3ViZXJuZXRlcyBtYWluIENBMCAXDTIzMDMzMTEzMDk0OFoYDzk5OTkxMjMx
+MjM1OTU5WjAXMRUwEwYDVQQDEwxrMC5oc3dhdy5uZXQwKjAFBgMrZXADIQArO7UZ
+Nch+NbI772smnkBycEZxKKqPZYnPAKCU9JMbzKOBlzCBlDAOBgNVHQ8BAf8EBAMC
+BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB8GA1UdIwQYMBaAFMnE
+PsE1rHNJTXvuYsYCQMSDnHMPMEIGA1UdEQQ7MDmCDGswLmhzd2F3Lm5ldIIja3Vi
+ZXJuZXRlcy5kZWZhdWx0LnN2Yy5rMC5oc3dhdy5uZXSHBAoKDAEwBQYDK2VwA0EA
+F9y75TSuG/wdW5RDyboz4B2lxYrZ+NifYWIz19E5XfgjO92vHxCJ9R1Eje1jOSYh
+NwZ+Fq6Ce+mcqmQJ2bACAg==
-----END CERTIFICATE-----
diff --git a/cluster/certs/kube-kubelet-bc01n01.hswaw.net.cert b/cluster/certs/kube-kubelet-bc01n01.hswaw.net.cert
index aedde0e..9ab8d52 100644
--- a/cluster/certs/kube-kubelet-bc01n01.hswaw.net.cert
+++ b/cluster/certs/kube-kubelet-bc01n01.hswaw.net.cert
@@ -1,31 +1,12 @@
-----BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIUXKffSPzBdHHsKI5PV1MaBtJdXG4wDQYJKoZIhvcNAQEL
-BQAwgYMxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tpZTEPMA0GA1UE
-BxMGV2Fyc2F3MRswGQYDVQQKExJXYXJzYXcgSGFja2Vyc3BhY2UxEzARBgNVBAsT
-CmNsdXN0ZXJjZmcxGzAZBgNVBAMTEmt1YmVybmV0ZXMgbWFpbiBDQTAeFw0yMjA0
-MDQxNjQ4MDBaFw0yMzA0MDQxNjQ4MDBaMIGFMQswCQYDVQQGEwJQTDEUMBIGA1UE
-CBMLTWF6b3dpZWNraWUxDzANBgNVBAcTBldhcnNhdzEVMBMGA1UEChMMc3lzdGVt
-Om5vZGVzMRAwDgYDVQQLEwdLdWJlbGV0MSYwJAYDVQQDEx1zeXN0ZW06bm9kZTpi
-YzAxbjAxLmhzd2F3Lm5ldDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-AMCCerGanIpykEvuJnxkz1ZqoHDvrAfM7Yyb7Ca7+njBPmrg7WVkHFQdn1ylSvRZ
-69vrtosUheOfkzAPT5sqRhQ/8VIAoHA1bXhAW19NmkK5I1FyWGjjGn1sjfmEvk4o
-cLf6gcvErRJdPbGz/vzBZ0X0FeCfqGPcUnLZYbh8wCdS9PkqeEq6m2CH6Toxb8jx
-Kz1fZbJf3gVnGxR3xUA9Fj8FmhpyOvnTXVa4mLh67x197lII1t86yTuc+8uwVQUR
-iC8PK15hgUm2q+MNWlNlXAxq0V5ZnZfiI9Qwdh43TqCKPI2kmgEu8ehT0qICbr6J
-SaB8OASLqhb3xI5CQLeZtX2tTdyQDD9DpGKquQHjdZ7uEA437KsG9MHLhrRW48RY
-O4bMgwhQ9V0+5Hc1NWOrccn4qmULwgFXaDWMjId5jRcWxBKtRW+jy0Vgqo4iFwZk
-b50unO0/VMmNw5bQQpfMnH1ubbctialjZqUevrV8zqcVaUMrHqdQbVjiitVzZghg
-FQL2wALYLNYt+dXYAQan2OqEaL+WuCUeP1LGlhXHqxfNjhXJjj1U/EAvEnNzFQ0M
-QQwe1QTYA4k0i1GlbbvtK4/PFECY/YzVgm70/lnH5AkkC+dQduQ69KTZx2YDD0iD
-QaaisNvK2CqFoim0cjiBWWTlpUxv3XF0TCnlso18z5EVAgMBAAGjgb0wgbowDgYD
-VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV
-HRMBAf8EAjAAMB0GA1UdDgQWBBRQZwM3WgGW+l8MKQBF2DZ5IWBh6jAfBgNVHSME
-GDAWgBSYMl0OTzMe+wnpiSQTFkJqgNGZ0DA7BgNVHREENDAyghFiYzAxbjAxLmhz
-d2F3Lm5ldIYdc3lzdGVtOm5vZGU6YmMwMW4wMS5oc3dhdy5uZXQwDQYJKoZIhvcN
-AQELBQADggEBADGEplxPFZ7CRABGb7JImNm6hMxz7TORCkR5VtShSf/xG3gEo+a1
-Oqw0j0af3zuPLlugBZ3TfklpEzJAyVHhQHu2z7Wly0f5FAQ9egMRAVISIz+dVeIh
-BywsgwgnvDeOjQPYg422Lsgm0Br6NlgxpFqBdCebytjUP95a7wsYwiH6H0PL7eCk
-HgxRUe43Lu6RpVfa+Iuszdx35m5crvHN5NdtqTckJH6d23pjjVAfJ/6VOVpS1Jzv
-U2eYLw1xwMu8TLNY3qjvPSdrfMJ8/48U7dSLQ2g8kMJcqpR0+nUTzrmmXQT41fVC
-zBhQTU142SMEUZnO95rCao19uUuAOItoYoQ=
+MIIBrTCCAV+gAwIBAgIQZbN5QcEmxO13HJiCqRRl2DAFBgMrZXAwHTEbMBkGA1UE
+AxMSa3ViZXJuZXRlcyBtYWluIENBMCAXDTIzMDMzMTE3NTk0NFoYDzk5OTkxMjMx
+MjM1OTU5WjA/MRUwEwYDVQQKEwxzeXN0ZW06bm9kZXMxJjAkBgNVBAMTHXN5c3Rl
+bTpub2RlOmJjMDFuMDEuaHN3YXcubmV0MCowBQYDK2VwAyEAP0FKz99+82ernmEP
+uSiClRXUZAYbE1vborosXYalVy2jgZAwgY0wDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAfBgNVHSMEGDAWgBTJxD7BNaxzSU17
+7mLGAkDEg5xzDzA7BgNVHREENDAygh1zeXN0ZW06bm9kZTpiYzAxbjAxLmhzd2F3
+Lm5ldIIRYmMwMW4wMS5oc3dhdy5uZXQwBQYDK2VwA0EAWMUaRIyKCbA19mOZFsY5
+fogxsN8zgvqEbUBoz+AjjIVrFV1DkUt/DaicjMR7ImiB/ilZ6Oq7GkqrvpkT4hRO
+Bg==
-----END CERTIFICATE-----
diff --git a/cluster/certs/kube-kubelet-bc01n02.hswaw.net.cert b/cluster/certs/kube-kubelet-bc01n02.hswaw.net.cert
index 633139a..d75686f 100644
--- a/cluster/certs/kube-kubelet-bc01n02.hswaw.net.cert
+++ b/cluster/certs/kube-kubelet-bc01n02.hswaw.net.cert
@@ -1,31 +1,12 @@
-----BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIUHF4mcNjnQkCZS8UIhlQjOTTWqeUwDQYJKoZIhvcNAQEL
-BQAwgYMxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tpZTEPMA0GA1UE
-BxMGV2Fyc2F3MRswGQYDVQQKExJXYXJzYXcgSGFja2Vyc3BhY2UxEzARBgNVBAsT
-CmNsdXN0ZXJjZmcxGzAZBgNVBAMTEmt1YmVybmV0ZXMgbWFpbiBDQTAeFw0yMjA0
-MDQxNzQxMDBaFw0yMzA0MDQxNzQxMDBaMIGFMQswCQYDVQQGEwJQTDEUMBIGA1UE
-CBMLTWF6b3dpZWNraWUxDzANBgNVBAcTBldhcnNhdzEVMBMGA1UEChMMc3lzdGVt
-Om5vZGVzMRAwDgYDVQQLEwdLdWJlbGV0MSYwJAYDVQQDEx1zeXN0ZW06bm9kZTpi
-YzAxbjAyLmhzd2F3Lm5ldDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-ALGiO5ptrZhlirWp39sHiO7qw0/MXuNsluwdXV0DlOsnnTUF3LcyANpZukJQNEq/
-IBZmvnYTyRIvLCJWXXr3jTjqCpIU+I3xRFu39190aohcqGbu2Qkj3weqYQiwCM7l
-0qh4YUTEVoiYMAShgXl5+MDvcJYw3jpfm0P9VUukVznzlhMsesV0TZlgHF04FHeM
-hTwtzgDBsNkCpJP+2Wba1IVegjIU9m7ayKjurjQaSxlDUL1MTTTrU7bNVwyvIpHh
-0jBCCtWrFVZF6eZFrpipGl7rmNC5weIVz9m/4D39DX049m0nsqUj2vjZFM7zT/sl
-Z+Ne+4L6pv4+Fwm3TzFXXxIxdZzCgTbqmgqd57Esr1s928tckrYOCC8paZ/oNW8i
-ndXFkolN1umc5CBb7TVNtXQ42mrZ7Hw66sF8gmF3l+xWNXWj04BmbTkfPULYd53+
-CD7/Pslvo0kOeaEA8UVjdIS8siAdhgCP5T3kUubaneQvRDuRHjzbmi//bUDkxFQ8
-CkkP6oDcjPfnJZ4KkZdfDflGdLRnY5ODzPYCd2xiy5+fFCS+pgtks3Q2SoYkkfV1
-ACl7JmpVhX+4hRi7/QkrwnLkNC+3zwouWCKy+DrVCOBjtJYFOStdCwh41zJB5lC6
-GJzRDqOv3q3hGo7+a6gVMU60DHsgTFbTKJ1TUh0V+D1nAgMBAAGjgb0wgbowDgYD
-VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV
-HRMBAf8EAjAAMB0GA1UdDgQWBBSnIgfLJiK7R+k9wfSCeKuqjpkYNjAfBgNVHSME
-GDAWgBSYMl0OTzMe+wnpiSQTFkJqgNGZ0DA7BgNVHREENDAyghFiYzAxbjAyLmhz
-d2F3Lm5ldIYdc3lzdGVtOm5vZGU6YmMwMW4wMi5oc3dhdy5uZXQwDQYJKoZIhvcN
-AQELBQADggEBAKYVhMH1A5Ot+3imo3aantVWGz+mcfMWv00eYddZJpXm6XlWryrS
-9r7XQFHLhEJXBzxFv4Mqf0kEPKtZvONMY8+X3WU6NDwOua0RJOnF8umlC//jEkoM
-h0q4fMiYGnp/eoaXMz/gD9RapCciQCQHpl8NcY+Lg1i8oTd8/fsOmeCwnSpwBKmn
-ZJh7rylZarsOEByLDAykqP273wFTB1SIXdsfHqI3SubwfMdFTuE8OB12+1+j/VwV
-uzwXwK7bGYfFnnZSb9wXj2tY5+KRj7vRpRV/OS1OtOJntaDBDg7ecb3lmj3UUhOH
-tmrDyp/sioHFnnp//czj1mFSQXtxid+uo94=
+MIIBrTCCAV+gAwIBAgIQKy2P1UT9OZ9UY6Obp0WPqzAFBgMrZXAwHTEbMBkGA1UE
+AxMSa3ViZXJuZXRlcyBtYWluIENBMCAXDTIzMDMzMTE3NTk0NFoYDzk5OTkxMjMx
+MjM1OTU5WjA/MRUwEwYDVQQKEwxzeXN0ZW06bm9kZXMxJjAkBgNVBAMTHXN5c3Rl
+bTpub2RlOmJjMDFuMDIuaHN3YXcubmV0MCowBQYDK2VwAyEArpkZtvXRHOTxZg+z
+PkxgauAOkq3HCiipKTrKK1Gn5mOjgZAwgY0wDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAfBgNVHSMEGDAWgBTJxD7BNaxzSU17
+7mLGAkDEg5xzDzA7BgNVHREENDAygh1zeXN0ZW06bm9kZTpiYzAxbjAyLmhzd2F3
+Lm5ldIIRYmMwMW4wMi5oc3dhdy5uZXQwBQYDK2VwA0EAm+xFYtzpH3TiT1+uWC34
+CA608dCB3WBZZLu6Jq8tHRY4ftlujJZc3ahzMKakkt8UFP8moTWSZoNJDdR3N//2
+AQ==
-----END CERTIFICATE-----
diff --git a/cluster/certs/kube-kubelet-dcr01s22.hswaw.net.cert b/cluster/certs/kube-kubelet-dcr01s22.hswaw.net.cert
index d9e0117..08d87ea 100644
--- a/cluster/certs/kube-kubelet-dcr01s22.hswaw.net.cert
+++ b/cluster/certs/kube-kubelet-dcr01s22.hswaw.net.cert
@@ -1,31 +1,12 @@
-----BEGIN CERTIFICATE-----
-MIIFWTCCBEGgAwIBAgIUf4bbNX7acoX2FwjvaJb2kckH/+AwDQYJKoZIhvcNAQEL
-BQAwgYMxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tpZTEPMA0GA1UE
-BxMGV2Fyc2F3MRswGQYDVQQKExJXYXJzYXcgSGFja2Vyc3BhY2UxEzARBgNVBAsT
-CmNsdXN0ZXJjZmcxGzAZBgNVBAMTEmt1YmVybmV0ZXMgbWFpbiBDQTAeFw0yMjEw
-MDIxMzI1MDBaFw0yMzEwMDIxMzI1MDBaMIGGMQswCQYDVQQGEwJQTDEUMBIGA1UE
-CBMLTWF6b3dpZWNraWUxDzANBgNVBAcTBldhcnNhdzEVMBMGA1UEChMMc3lzdGVt
-Om5vZGVzMRAwDgYDVQQLEwdLdWJlbGV0MScwJQYDVQQDEx5zeXN0ZW06bm9kZTpk
-Y3IwMXMyMi5oc3dhdy5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQDf6rpfaZgIxNkFQ1D8kGmBG7F20KFt1mNAzRaUBmDBWUIFVXjPBLpAYI0odm8L
-42MqQvT1RhIQdfFI1biL/FF0ABj+au37Mrh4b473FegQk4s/lvBbkhBsk4asSYlX
-d+Rmz/P0XYmOWNRRnvm4E/LLc9t/NeqKm/B6J8ZRMzl3uUNDGXRRDebs8buDZu6X
-DCmBPr0+RFPbsh3bf/6q6e2G1LX1T3zjIn2410N4VJYu6fWi6VNOYnme6HqpcrLx
-lO7TCDDAGTNlgoKPO9c56BweZm/CBN4XcbRed4Q5/YkrLH//n7bov04K3EIZg6tp
-ZrqR0vUv6JaCt2dU1Wi4uomkv0cFiLoc+hOeLpUzQRpsR3GysM+ZbbECrNahFygA
-NaBe36ulaHnHloUonS6YPaTVscFADsjye8fGIb5bQV8oxFbOOimwnV4w8dzXykNk
-L4lSpW4D7EFdQAceKWw/Yifa7tPMlLHlqPNvIGdpqnkGuzK8f/V/PYJOmZ0rwqrO
-P7+P8rw0EYdltr/CgYD93DUG35zh80Rov+fytm4uwurroggjDS1COxVPzKtaYrzs
-EQ4YffdeE9pEuR9FIrbpXpubzSZnuKFLzfv2CBFr845hsNlSJEPsGePQuu0kz7PD
-P/E7cKrcXV2+I1xeBN91XMCFiHtsvAb9ISvpXudD/GzYdQIDAQABo4G/MIG8MA4G
-A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
-VR0TAQH/BAIwADAdBgNVHQ4EFgQUW/G38M+taLCcnLVTk/lfdpQDbrUwHwYDVR0j
-BBgwFoAUmDJdDk8zHvsJ6YkkExZCaoDRmdAwPQYDVR0RBDYwNIISZGNyMDFzMjIu
-aHN3YXcubmV0hh5zeXN0ZW06bm9kZTpkY3IwMXMyMi5oc3dhdy5uZXQwDQYJKoZI
-hvcNAQELBQADggEBAC2gA6ug8ukTN5TEu9JdSrLIvn0wu3q1J79Z3kE2vwQyiKYF
-HZOfuQfgy8o5Gwh0gy9jBA5gudlt1CgCWQ4fUKsJNSGHozs10r4f1z2RLIe+eeOD
-Zm2B8pSyk16TO9srLF2QO1UZq1aekGOMfk5svKWIYb34OBq/thjDuIePFMcYmx4D
-Rx7YOm3s1V1BIaBxy9nWdCw5QbqDU2AdITRZnUn72TOsXYC0ruetB4+FGq/++/Ug
-6XbQWb2HdegdeKlL7PVkfmuyfYHdyqrIwi66n3UOuUCrdixRlT9o6nWVIhDTVzgW
-coBUVkw9lQlv91V+LKkA5OPRmMCSpbhkwtrdkjw=
+MIIBsDCCAWKgAwIBAgIQbvpuDtO6o4GMU9Y7q3Hj+TAFBgMrZXAwHTEbMBkGA1UE
+AxMSa3ViZXJuZXRlcyBtYWluIENBMCAXDTIzMDMzMTE3NTk0NFoYDzk5OTkxMjMx
+MjM1OTU5WjBAMRUwEwYDVQQKEwxzeXN0ZW06bm9kZXMxJzAlBgNVBAMTHnN5c3Rl
+bTpub2RlOmRjcjAxczIyLmhzd2F3Lm5ldDAqMAUGAytlcAMhADwkNGnMhC5UhvLS
+iK7F3zIyKfARKXWwsrHGI1FYxbWlo4GSMIGPMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHwYDVR0jBBgwFoAUycQ+wTWsc0lN
+e+5ixgJAxIOccw8wPQYDVR0RBDYwNIIec3lzdGVtOm5vZGU6ZGNyMDFzMjIuaHN3
+YXcubmV0ghJkY3IwMXMyMi5oc3dhdy5uZXQwBQYDK2VwA0EAJZGBzNOALgUqC/TE
+b6kdztgwymtVpdGP3wDxd1UstYm1p+S2lOuDXqBOveGQUdVLX4UcUYHXjwSyISIR
+emUeDw==
-----END CERTIFICATE-----
diff --git a/cluster/certs/kube-kubelet-dcr01s24.hswaw.net.cert b/cluster/certs/kube-kubelet-dcr01s24.hswaw.net.cert
index b4d8260..634df9a 100644
--- a/cluster/certs/kube-kubelet-dcr01s24.hswaw.net.cert
+++ b/cluster/certs/kube-kubelet-dcr01s24.hswaw.net.cert
@@ -1,31 +1,12 @@
-----BEGIN CERTIFICATE-----
-MIIFWTCCBEGgAwIBAgIUHVN+wQDar/QnbVXMiQMaNnZtfuswDQYJKoZIhvcNAQEL
-BQAwgYMxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tpZTEPMA0GA1UE
-BxMGV2Fyc2F3MRswGQYDVQQKExJXYXJzYXcgSGFja2Vyc3BhY2UxEzARBgNVBAsT
-CmNsdXN0ZXJjZmcxGzAZBgNVBAMTEmt1YmVybmV0ZXMgbWFpbiBDQTAeFw0yMjEw
-MDIxMzUzMDBaFw0yMzEwMDIxMzUzMDBaMIGGMQswCQYDVQQGEwJQTDEUMBIGA1UE
-CBMLTWF6b3dpZWNraWUxDzANBgNVBAcTBldhcnNhdzEVMBMGA1UEChMMc3lzdGVt
-Om5vZGVzMRAwDgYDVQQLEwdLdWJlbGV0MScwJQYDVQQDEx5zeXN0ZW06bm9kZTpk
-Y3IwMXMyNC5oc3dhdy5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQDBvci18rAPjP2MediOv0cSTS3Hi3qXKtfHODgvZ2Db4rf6fElbS5t982f6/Ox1
-ZzNmspz2qCQCzz5IXUX+G+zV3BFbHZQv3va2NnPJFdWaxCOH5IUt08rnOXgq5+Co
-A5doiF6n+MLAo+CQVl6xXFPv1ElD3SyDa0Ba0yh5yJGmdZ/KuCYD36ZSD/oZFdcA
-Gvau87YmCnSoqvZGY8+lmGQrdujjErMN7Bl+nE1sQrhjZO7jxyRjXf7qKSLUJcFh
-TED1Z95xe2phvWHnPbPi4XY4Gg4Y0Vo0YdU7EUG8OEX8KMsNzceZqtxhqx+oF+IL
-jzoxMunqcydRATBreNEhjWr6sKn1ruCEZ9pypCbw7T0hpqkcTomeE31bZZ7/VPOm
-ZPwScL0+X+i4UmAunNuY3rxijbhwdGeJznHfba3ETg+3JKoc28bQcfl8Y/SVon6L
-nK6HT+kVcvX6z91bRTIuYbcb7Tn4GqFh7OhMgbFvMl2IJT5J4n5zLADC3PcQs7uT
-vp+OeP3Z3uYhOIU4KCaBce0t6aDuMSgLXneuKb34wMJA8qRpN9L+D84jW6qlt09Q
-KgM13vvCi5+pI0Lth9hx3ga1kaIqbEHQPjnKiZBrkW6wPfwrKN/Uo7fauf1ZcH6U
-AgHwU4jUSixZBrumyUFrHWy2U1e8URK3+OGBZhGVBVwhYwIDAQABo4G/MIG8MA4G
-A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
-VR0TAQH/BAIwADAdBgNVHQ4EFgQU98WJLNafrXaajcrVAVuoPlj3EhcwHwYDVR0j
-BBgwFoAUmDJdDk8zHvsJ6YkkExZCaoDRmdAwPQYDVR0RBDYwNIISZGNyMDFzMjQu
-aHN3YXcubmV0hh5zeXN0ZW06bm9kZTpkY3IwMXMyNC5oc3dhdy5uZXQwDQYJKoZI
-hvcNAQELBQADggEBAGH3O/Az/EWWYj9eH/n0OK5xsqsp/PYUXaVb6vgb+Pfga4ji
-ng8OJD5qA52Pp/K/3N9hgUBYL9UwfXX3cgx9iozGbxAcEBAeOvNxeOWJy1/60Q3C
-gZaVQPIUp3jD88aQdcWp4akapNFZbK1I49nIXn/WqgjUYpvQ/bk3CxdHRRLrvfZ3
-VqHnd3PxXSfcwrKvilor4C6BVLLWlIOinZVOoMuGJqoaJhV3hitWNKIBBetiZVVk
-/yauJIb2Ml7OpAp9+ZbgMsjF1ZH1lSEvYb69zlRyYBHWtnM6JYXJUoVXzLKIfJAX
-A+6qFpiCmPYPQiMt5ssSfa6S7Uk+zvKEu4GpGUQ=
+MIIBsDCCAWKgAwIBAgIQIou0S4woMeN5795tFvuD3jAFBgMrZXAwHTEbMBkGA1UE
+AxMSa3ViZXJuZXRlcyBtYWluIENBMCAXDTIzMDMzMTE3NTk0NFoYDzk5OTkxMjMx
+MjM1OTU5WjBAMRUwEwYDVQQKEwxzeXN0ZW06bm9kZXMxJzAlBgNVBAMTHnN5c3Rl
+bTpub2RlOmRjcjAxczI0Lmhzd2F3Lm5ldDAqMAUGAytlcAMhAGnfXhzOam+Owhmw
+MDKqJ2GsMXTr6ABBA09RAJAC9QKmo4GSMIGPMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHwYDVR0jBBgwFoAUycQ+wTWsc0lN
+e+5ixgJAxIOccw8wPQYDVR0RBDYwNIIec3lzdGVtOm5vZGU6ZGNyMDFzMjQuaHN3
+YXcubmV0ghJkY3IwMXMyNC5oc3dhdy5uZXQwBQYDK2VwA0EA7NpxFD/tzxBXQ534
+bkDKxST97zhuSOgW71vcc5XovzRy2YsuVIzBD3EnNR9egbg85yk+wz7hI7/Hy0yn
+uQ3ZAg==
-----END CERTIFICATE-----
diff --git a/cluster/certs/kube-proxy.cert b/cluster/certs/kube-proxy.cert
index 5bec8e9..ff337eb 100644
--- a/cluster/certs/kube-proxy.cert
+++ b/cluster/certs/kube-proxy.cert
@@ -1,31 +1,11 @@
-----BEGIN CERTIFICATE-----
-MIIFQzCCBCugAwIBAgIUNWFgJH0Du1bbdLIvAbBPzFHHh3YwDQYJKoZIhvcNAQEL
-BQAwgYMxCzAJBgNVBAYTAlBMMRQwEgYDVQQIEwtNYXpvd2llY2tpZTEPMA0GA1UE
-BxMGV2Fyc2F3MRswGQYDVQQKExJXYXJzYXcgSGFja2Vyc3BhY2UxEzARBgNVBAsT
-CmNsdXN0ZXJjZmcxGzAZBgNVBAMTEmt1YmVybmV0ZXMgbWFpbiBDQTAeFw0yMjA0
-MDQxNjQ4MDBaFw0yMzA0MDQxNjQ4MDBaMIGRMQswCQYDVQQGEwJQTDEUMBIGA1UE
-CBMLTWF6b3dpZWNraWUxDzANBgNVBAcTBldhcnNhdzEaMBgGA1UEChMRc3lzdGVt
-Omt1YmUtcHJveHkxIzAhBgNVBAsTGkt1YmVybmV0ZXMgQ29tcG9uZW50IHByb3h5
-MRowGAYDVQQDExFzeXN0ZW06a3ViZS1wcm94eTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMeIGf/vIR7lkgd6Wz9vrllQiyhOIKT1IaZlTd4deG72V/eg
-XXVI/iRkn3fIyxPgtLICZldT/75uMolYYWn50/Y32HGrQJT4uvfpV4Bt1YVdRzPO
-81DTKnkKuvhD7BERPSfEhYdCXMp5f7pjurJnixU/CaIKtUoLMV33N6pEeCS5ctcV
-vK8WC6/34guIXbgdjDZmo1k5HIYAJwWxJEfgqLCcKpnZHk2A3ytWgTLuGzCLE+3w
-Bu6zcvTwdXaEgq7RC1bYUAe32l21whWrmVVLPcXjoNj4Mzh+kKQ38+FNJqSGRhDd
-96SpVId1Ii7H+Ydyim3lHbRwxjpJAS6DAzP3hFqGVQ8RO1Pns9kajRicywbf35YO
-qtowSJZPJx9uk05uKKn7tzHayBX+LPr9H272AvSkgnzS5kU0obLTCnJ9UgKUp4Pb
-13M/7iMoEOsKiSLiFroGSzMn7QGIFe9QewRCPKhYzmg2KEru2nJG4wdcYb5XwGwP
-HEZRGln33rJTttpysbTuvcb0/TcYZCwSaV2l5fp5gNPfy8erF8x2kSRO2/Gfqc1m
-dEtaBA0KzyIVsYFF1shDw+Fr/L/SbXI/HYL2kpPr6CuW3Bnl2yEbjhGROCHumwRQ
-dOltUzeRJ3RKImAI34ll+TJeOcsD3EMD/FwMssfgAAVtXl6PhRZB4t2NDyWXAgMB
-AAGjgZ4wgZswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTn0MVsvuVE2ZiSJNZfEp6Q
-pb8u9jAfBgNVHSMEGDAWgBSYMl0OTzMe+wnpiSQTFkJqgNGZ0DAcBgNVHREEFTAT
-hhFzeXN0ZW06a3ViZS1wcm94eTANBgkqhkiG9w0BAQsFAAOCAQEAQVpDhWpt1x1P
-SMYH4yHPdCqaef8hPwdaHqyKrxbLW59pt2ezrrZ7Kyn8f1mywaPpqpi6dk+OXkSc
-uAtiFhmQTxh8NogJNX7zT5cVMBqeUZdzSXqwNVrpycHRyfjunkvJwAqKX4iRUziq
-NUBU4YH7n85lPCMX3upj7qehpG+KJ177w1p8cXJXMYt5bwqxpT/ORJPFOTX6dcj6
-/Tx2/B0ZrJTxF6bdrfT87oPBR66Kkti4Hlc4Z40V+JbI0nMNMiuQKY2bYrPhlkST
-UEQi7Ton/ddhnh+ZtAkuTglz/ZvaZElPeaaahgfhwWJfGVHD3FKN3Uqzqp3pp12d
-jW0fWTMPnA==
+MIIBhTCCATegAwIBAgIQa0LfL15b/ATeKtOnGsNyRjAFBgMrZXAwHTEbMBkGA1UE
+AxMSa3ViZXJuZXRlcyBtYWluIENBMCAXDTIzMDMzMTEzMTUyNVoYDzk5OTkxMjMx
+MjM1OTU5WjA4MRowGAYDVQQKExFzeXN0ZW06a3ViZS1wcm94eTEaMBgGA1UEAxMR
+c3lzdGVtOmt1YmUtcHJveHkwKjAFBgMrZXADIQDq0USq9D/NI2puK6JG1aybmeoI
+x7YWau5tyLN6ApjfUaNwMG4wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsG
+AQUFBwMCBggrBgEFBQcDATAfBgNVHSMEGDAWgBTJxD7BNaxzSU177mLGAkDEg5xz
+DzAcBgNVHREEFTATghFzeXN0ZW06a3ViZS1wcm94eTAFBgMrZXADQQC8Uwcq+dgZ
+LNPF6k7zlFz2Xu0ovZSPoZVByJnbC3/agB5uJ/LW3+xRH0jZWDEwNFYySEamd2V8
+GdGl3dfCYBIL
-----END CERTIFICATE-----