From 0cfd6c66bdf17d7da73534dd960623fadccefa56 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Wed, 23 Feb 2022 14:25:38 -0800 Subject: [PATCH 1/3] Centralize common test certificates, remove duplicates --- apiserver/Makefile | 14 +++++----- calicoctl/Makefile | 6 ++--- calicoctl/tests/certs/README.md | 4 --- calicoctl/tests/certs/admin-csr.json | 16 ----------- calicoctl/tests/certs/admin-key.pem | 27 ------------------- calicoctl/tests/certs/admin.csr | 17 ------------ calicoctl/tests/certs/admin.pem | 24 ----------------- calicoctl/tests/certs/ca-config.json | 13 --------- calicoctl/tests/certs/ca-csr.json | 16 ----------- calicoctl/tests/certs/ca-key.pem | 27 ------------------- calicoctl/tests/certs/ca.csr | 17 ------------ calicoctl/tests/certs/ca.pem | 22 --------------- .../certs/kube-controller-manager.kubeconfig | 18 ------------- calicoctl/tests/certs/kubeconfig | 18 ------------- calicoctl/tests/certs/kubernetes-csr.json | 16 ----------- calicoctl/tests/certs/kubernetes-key.pem | 27 ------------------- calicoctl/tests/certs/kubernetes.csr | 21 --------------- calicoctl/tests/certs/kubernetes.pem | 27 ------------------- .../tests/certs/service-account-csr.json | 16 ----------- calicoctl/tests/certs/service-account-key.pem | 27 ------------------- calicoctl/tests/certs/service-account.csr | 17 ------------ calicoctl/tests/certs/service-account.pem | 24 ----------------- cni-plugin/Makefile | 6 ++--- cni-plugin/tests/certs/README.md | 4 --- cni-plugin/tests/certs/admin-csr.json | 16 ----------- cni-plugin/tests/certs/admin-key.pem | 27 ------------------- cni-plugin/tests/certs/admin.csr | 17 ------------ cni-plugin/tests/certs/admin.pem | 24 ----------------- cni-plugin/tests/certs/ca-config.json | 13 --------- cni-plugin/tests/certs/ca-csr.json | 16 ----------- cni-plugin/tests/certs/ca-key.pem | 27 ------------------- cni-plugin/tests/certs/ca.csr | 17 ------------ cni-plugin/tests/certs/ca.pem | 22 --------------- .../certs/kube-controller-manager.kubeconfig | 18 ------------- cni-plugin/tests/certs/kubeconfig | 18 ------------- cni-plugin/tests/certs/kubernetes-csr.json | 16 ----------- cni-plugin/tests/certs/kubernetes-key.pem | 27 ------------------- cni-plugin/tests/certs/kubernetes.csr | 21 --------------- cni-plugin/tests/certs/kubernetes.pem | 27 ------------------- .../tests/certs/service-account-csr.json | 16 ----------- .../tests/certs/service-account-key.pem | 27 ------------------- cni-plugin/tests/certs/service-account.csr | 17 ------------ cni-plugin/tests/certs/service-account.pem | 24 ----------------- felix/Makefile | 2 ++ felix/fv/certs/README.md | 4 --- felix/fv/certs/admin-csr.json | 16 ----------- felix/fv/certs/admin-key.pem | 27 ------------------- felix/fv/certs/admin.csr | 17 ------------ felix/fv/certs/admin.pem | 24 ----------------- felix/fv/certs/ca-config.json | 13 --------- felix/fv/certs/ca-csr.json | 16 ----------- felix/fv/certs/ca-key.pem | 27 ------------------- felix/fv/certs/ca.csr | 17 ------------ felix/fv/certs/ca.pem | 22 --------------- .../certs/kube-controller-manager.kubeconfig | 18 ------------- felix/fv/certs/kubeconfig | 18 ------------- felix/fv/certs/kubernetes-csr.json | 16 ----------- felix/fv/certs/kubernetes-key.pem | 27 ------------------- felix/fv/certs/kubernetes.csr | 21 --------------- felix/fv/certs/kubernetes.pem | 27 ------------------- felix/fv/certs/service-account-csr.json | 16 ----------- felix/fv/certs/service-account-key.pem | 27 ------------------- felix/fv/certs/service-account.csr | 17 ------------ felix/fv/certs/service-account.pem | 24 ----------------- felix/fv/infrastructure/infra_k8s.go | 4 +-- felix/k8sfv/run-test | 4 +-- {apiserver => hack}/test/certs/README.md | 0 {apiserver => hack}/test/certs/admin-csr.json | 0 {apiserver => hack}/test/certs/admin-key.pem | 0 {apiserver => hack}/test/certs/admin.csr | 0 {apiserver => hack}/test/certs/admin.pem | 0 {apiserver => hack}/test/certs/ca-config.json | 0 {apiserver => hack}/test/certs/ca-csr.json | 0 {apiserver => hack}/test/certs/ca-key.pem | 0 {apiserver => hack}/test/certs/ca.csr | 0 {apiserver => hack}/test/certs/ca.pem | 0 .../certs/kube-controller-manager.kubeconfig | 0 {apiserver => hack}/test/certs/kubeconfig | 2 ++ .../test/certs/kubernetes-csr.json | 0 .../test/certs/kubernetes-key.pem | 0 {apiserver => hack}/test/certs/kubernetes.csr | 0 {apiserver => hack}/test/certs/kubernetes.pem | 0 .../test/certs/service-account-csr.json | 0 .../test/certs/service-account-key.pem | 0 .../test/certs/service-account.csr | 0 .../test/certs/service-account.pem | 0 kube-controllers/Makefile | 3 +-- kube-controllers/tests/certs/README.md | 4 --- kube-controllers/tests/certs/admin-csr.json | 16 ----------- kube-controllers/tests/certs/admin-key.pem | 27 ------------------- kube-controllers/tests/certs/admin.csr | 17 ------------ kube-controllers/tests/certs/admin.pem | 24 ----------------- kube-controllers/tests/certs/ca-config.json | 13 --------- kube-controllers/tests/certs/ca-csr.json | 16 ----------- kube-controllers/tests/certs/ca-key.pem | 27 ------------------- kube-controllers/tests/certs/ca.csr | 17 ------------ kube-controllers/tests/certs/ca.pem | 22 --------------- .../certs/kube-controller-manager.kubeconfig | 18 ------------- kube-controllers/tests/certs/kubeconfig | 18 ------------- .../tests/certs/kubernetes-csr.json | 16 ----------- .../tests/certs/kubernetes-key.pem | 27 ------------------- kube-controllers/tests/certs/kubernetes.csr | 21 --------------- kube-controllers/tests/certs/kubernetes.pem | 27 ------------------- .../tests/certs/service-account-csr.json | 16 ----------- .../tests/certs/service-account-key.pem | 27 ------------------- .../tests/certs/service-account.csr | 17 ------------ .../tests/certs/service-account.pem | 24 ----------------- kube-controllers/tests/testutils/utils.go | 8 +++--- lib.Makefile | 4 +++ node/Makefile | 6 ++--- 110 files changed, 33 insertions(+), 1602 deletions(-) delete mode 100644 calicoctl/tests/certs/README.md delete mode 100644 calicoctl/tests/certs/admin-csr.json delete mode 100644 calicoctl/tests/certs/admin-key.pem delete mode 100644 calicoctl/tests/certs/admin.csr delete mode 100644 calicoctl/tests/certs/admin.pem delete mode 100644 calicoctl/tests/certs/ca-config.json delete mode 100644 calicoctl/tests/certs/ca-csr.json delete mode 100644 calicoctl/tests/certs/ca-key.pem delete mode 100644 calicoctl/tests/certs/ca.csr delete mode 100644 calicoctl/tests/certs/ca.pem delete mode 100644 calicoctl/tests/certs/kube-controller-manager.kubeconfig delete mode 100644 calicoctl/tests/certs/kubeconfig delete mode 100644 calicoctl/tests/certs/kubernetes-csr.json delete mode 100644 calicoctl/tests/certs/kubernetes-key.pem delete mode 100644 calicoctl/tests/certs/kubernetes.csr delete mode 100644 calicoctl/tests/certs/kubernetes.pem delete mode 100644 calicoctl/tests/certs/service-account-csr.json delete mode 100644 calicoctl/tests/certs/service-account-key.pem delete mode 100644 calicoctl/tests/certs/service-account.csr delete mode 100644 calicoctl/tests/certs/service-account.pem delete mode 100644 cni-plugin/tests/certs/README.md delete mode 100644 cni-plugin/tests/certs/admin-csr.json delete mode 100644 cni-plugin/tests/certs/admin-key.pem delete mode 100644 cni-plugin/tests/certs/admin.csr delete mode 100644 cni-plugin/tests/certs/admin.pem delete mode 100644 cni-plugin/tests/certs/ca-config.json delete mode 100644 cni-plugin/tests/certs/ca-csr.json delete mode 100644 cni-plugin/tests/certs/ca-key.pem delete mode 100644 cni-plugin/tests/certs/ca.csr delete mode 100644 cni-plugin/tests/certs/ca.pem delete mode 100644 cni-plugin/tests/certs/kube-controller-manager.kubeconfig delete mode 100644 cni-plugin/tests/certs/kubeconfig delete mode 100644 cni-plugin/tests/certs/kubernetes-csr.json delete mode 100644 cni-plugin/tests/certs/kubernetes-key.pem delete mode 100644 cni-plugin/tests/certs/kubernetes.csr delete mode 100644 cni-plugin/tests/certs/kubernetes.pem delete mode 100644 cni-plugin/tests/certs/service-account-csr.json delete mode 100644 cni-plugin/tests/certs/service-account-key.pem delete mode 100644 cni-plugin/tests/certs/service-account.csr delete mode 100644 cni-plugin/tests/certs/service-account.pem delete mode 100644 felix/fv/certs/README.md delete mode 100644 felix/fv/certs/admin-csr.json delete mode 100644 felix/fv/certs/admin-key.pem delete mode 100644 felix/fv/certs/admin.csr delete mode 100644 felix/fv/certs/admin.pem delete mode 100644 felix/fv/certs/ca-config.json delete mode 100644 felix/fv/certs/ca-csr.json delete mode 100644 felix/fv/certs/ca-key.pem delete mode 100644 felix/fv/certs/ca.csr delete mode 100644 felix/fv/certs/ca.pem delete mode 100644 felix/fv/certs/kube-controller-manager.kubeconfig delete mode 100644 felix/fv/certs/kubeconfig delete mode 100644 felix/fv/certs/kubernetes-csr.json delete mode 100644 felix/fv/certs/kubernetes-key.pem delete mode 100644 felix/fv/certs/kubernetes.csr delete mode 100644 felix/fv/certs/kubernetes.pem delete mode 100644 felix/fv/certs/service-account-csr.json delete mode 100644 felix/fv/certs/service-account-key.pem delete mode 100644 felix/fv/certs/service-account.csr delete mode 100644 felix/fv/certs/service-account.pem rename {apiserver => hack}/test/certs/README.md (100%) rename {apiserver => hack}/test/certs/admin-csr.json (100%) rename {apiserver => hack}/test/certs/admin-key.pem (100%) rename {apiserver => hack}/test/certs/admin.csr (100%) rename {apiserver => hack}/test/certs/admin.pem (100%) rename {apiserver => hack}/test/certs/ca-config.json (100%) rename {apiserver => hack}/test/certs/ca-csr.json (100%) rename {apiserver => hack}/test/certs/ca-key.pem (100%) rename {apiserver => hack}/test/certs/ca.csr (100%) rename {apiserver => hack}/test/certs/ca.pem (100%) rename {apiserver => hack}/test/certs/kube-controller-manager.kubeconfig (100%) rename {apiserver => hack}/test/certs/kubeconfig (74%) rename {apiserver => hack}/test/certs/kubernetes-csr.json (100%) rename {apiserver => hack}/test/certs/kubernetes-key.pem (100%) rename {apiserver => hack}/test/certs/kubernetes.csr (100%) rename {apiserver => hack}/test/certs/kubernetes.pem (100%) rename {apiserver => hack}/test/certs/service-account-csr.json (100%) rename {apiserver => hack}/test/certs/service-account-key.pem (100%) rename {apiserver => hack}/test/certs/service-account.csr (100%) rename {apiserver => hack}/test/certs/service-account.pem (100%) delete mode 100644 kube-controllers/tests/certs/README.md delete mode 100644 kube-controllers/tests/certs/admin-csr.json delete mode 100644 kube-controllers/tests/certs/admin-key.pem delete mode 100644 kube-controllers/tests/certs/admin.csr delete mode 100644 kube-controllers/tests/certs/admin.pem delete mode 100644 kube-controllers/tests/certs/ca-config.json delete mode 100644 kube-controllers/tests/certs/ca-csr.json delete mode 100644 kube-controllers/tests/certs/ca-key.pem delete mode 100644 kube-controllers/tests/certs/ca.csr delete mode 100644 kube-controllers/tests/certs/ca.pem delete mode 100644 kube-controllers/tests/certs/kube-controller-manager.kubeconfig delete mode 100644 kube-controllers/tests/certs/kubeconfig delete mode 100644 kube-controllers/tests/certs/kubernetes-csr.json delete mode 100644 kube-controllers/tests/certs/kubernetes-key.pem delete mode 100644 kube-controllers/tests/certs/kubernetes.csr delete mode 100644 kube-controllers/tests/certs/kubernetes.pem delete mode 100644 kube-controllers/tests/certs/service-account-csr.json delete mode 100644 kube-controllers/tests/certs/service-account-key.pem delete mode 100644 kube-controllers/tests/certs/service-account.csr delete mode 100644 kube-controllers/tests/certs/service-account.pem diff --git a/apiserver/Makefile b/apiserver/Makefile index 0b712845517..f90ae4435f5 100644 --- a/apiserver/Makefile +++ b/apiserver/Makefile @@ -181,7 +181,7 @@ run-kubernetes-server: run-etcd stop-kubernetes-server # Run a Kubernetes apiserver using Docker. docker run --detach --net=host \ --name st-apiserver \ - -v $(CURDIR)/test/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ -e KUBECONFIG=/home/user/certs/kubeconfig \ $(CALICO_BUILD) kube-apiserver \ --etcd-servers=http://$(LOCAL_IP_ENV):2379 \ @@ -204,7 +204,7 @@ run-kubernetes-server: run-etcd stop-kubernetes-server # And run the controller manager. docker run --detach --net=host \ --name st-controller-manager \ - -v $(CURDIR)/test/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ $(CALICO_BUILD) kube-controller-manager \ --master=https://127.0.0.1:6443 \ --kubeconfig=/home/user/certs/kube-controller-manager.kubeconfig \ @@ -221,7 +221,7 @@ run-kubernetes-server: run-etcd stop-kubernetes-server --net=host \ --rm \ -v $(CURDIR)/../:/go/src/github.com/projectcalico/calico:rw \ - -v $(CURDIR)/test/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ lachlanevenson/k8s-kubectl:${KUBECTL_VERSION} \ --kubeconfig=/home/user/certs/kubeconfig \ apply -f /go/src/github.com/projectcalico/calico/libcalico-go/config/crd/ @@ -231,7 +231,7 @@ run-kubernetes-server: run-etcd stop-kubernetes-server --net=host \ --rm \ -v $(CURDIR):/manifests \ - -v $(CURDIR)/test/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ lachlanevenson/k8s-kubectl:${KUBECTL_VERSION} \ --kubeconfig=/home/user/certs/kubeconfig \ apply -f /manifests/test/mock-node.yaml @@ -242,7 +242,7 @@ run-kubernetes-server: run-etcd stop-kubernetes-server --net=host \ --rm \ -v $(CURDIR):/manifests \ - -v $(CURDIR)/test/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ lachlanevenson/k8s-kubectl:${KUBECTL_VERSION} \ --kubeconfig=/home/user/certs/kubeconfig \ apply -f /manifests/test/namespaces.yaml @@ -266,7 +266,7 @@ fv: fv-kdd .PHONY: fv-etcd fv-etcd: run-kubernetes-server hack-lib $(DOCKER_RUN) \ - -v $(CURDIR)/test/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ -e KUBECONFIG=/home/user/certs/kubeconfig \ $(CALICO_BUILD) \ sh -c 'ETCD_ENDPOINTS="http://127.0.0.1:2379" DATASTORE_TYPE="etcdv3" test/integration.sh' @@ -274,7 +274,7 @@ fv-etcd: run-kubernetes-server hack-lib .PHONY: fv-kdd fv-kdd: run-kubernetes-server hack-lib $(DOCKER_RUN) \ - -v $(CURDIR)/test/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ -e KUBECONFIG=/home/user/certs/kubeconfig \ $(CALICO_BUILD) \ sh -c 'DATASTORE_TYPE="kubernetes" test/integration.sh' diff --git a/calicoctl/Makefile b/calicoctl/Makefile index 3821acbcb0c..ebbbdcd2a8c 100644 --- a/calicoctl/Makefile +++ b/calicoctl/Makefile @@ -169,7 +169,7 @@ st: bin/calicoctl-linux-amd64 version-helper docker run --net=host --privileged \ -e MY_IP=$(LOCAL_IP_ENV) \ --rm -t \ - -v $(CURDIR)/tests/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ -v $(CURDIR):/code \ -v /var/run/docker.sock:/var/run/docker.sock \ $(TEST_CONTAINER_NAME) \ @@ -202,7 +202,7 @@ run-kubernetes-master: stop-kubernetes-master --name st-apiserver-${KUBE_APISERVER_PORT} \ -v $(CURDIR):/code \ -v $(CURDIR)/../:/go/src/github.com/projectcalico/calico \ - -v $(CURDIR)/tests/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ -e KUBECONFIG=/home/user/certs/kubeconfig \ ${CALICO_BUILD} kube-apiserver \ --secure-port=${KUBE_APISERVER_PORT} \ @@ -228,7 +228,7 @@ run-kubernetes-master: stop-kubernetes-master # And run the controller manager. docker run --detach --net=host \ --name st-controller-manager-${KUBE_APISERVER_PORT} \ - -v $(CURDIR)/tests/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ $(CALICO_BUILD) kube-controller-manager \ --master=https://127.0.0.1:${KUBE_APISERVER_PORT} \ --kubeconfig=/home/user/certs/kube-controller-manager.kubeconfig \ diff --git a/calicoctl/tests/certs/README.md b/calicoctl/tests/certs/README.md deleted file mode 100644 index 7ce867a88e1..00000000000 --- a/calicoctl/tests/certs/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# FV certificates - -The files in this directory are used only in the FV tests in this repository, and were generated according to the steps in [Kubernetes the hard -way](https://github.com/kelseyhightower/kubernetes-the-hard-way). diff --git a/calicoctl/tests/certs/admin-csr.json b/calicoctl/tests/certs/admin-csr.json deleted file mode 100644 index 960ce1d9a8c..00000000000 --- a/calicoctl/tests/certs/admin-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "admin", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "system:masters", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/calicoctl/tests/certs/admin-key.pem b/calicoctl/tests/certs/admin-key.pem deleted file mode 100644 index c29c9f95ef7..00000000000 --- a/calicoctl/tests/certs/admin-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAxgFpxKQz1MqqEUb6HnBxpWdu+3GZTyt7NCyseo+OrjbW9VOT -LFfbwBbaFig2HWPBkBCKL9xwpFlYaz94i46dYVpoelVmYseXxsLX20Qp4Kc0UU0V -AwTH2KpObDUMDwmO+KYcrQMGOWg1XIZXJI6PpSj3wA6HlA1BxD4o0ksnCxXhNIAr -skYJ1E2b1bcAvLGkvEgBAkNqI3ZvvWfCKX+vMrGxvVIqItdryQqznzWlRzFmC3M0 -HqtTLOsqw08wako4C+Cw27sNlNAtYMSuWUmavgVc8J9Km4lCAPYqC7RmIlBlEcOf -oiu0mryn+DTIBn0M4TJ9Nkm7qRoHXCGqYM7HjQIDAQABAoIBAAYK5P9rQ2mrBaWh -VOC47b7ueSSTQup3mTruYhUbbG9EnSq/ci5YQAyMpfsnHv+mm7GZz53GTGm3kEs1 -lKgtof/mkmmpUYaSML+QEqZOXjjM4XvZrlp5OuAR0nLa65NJ52MPLrDY9septncs -YlxrPVb8+RKTXu/Vt7wVaYmBYZ+k7YGO8D3uohRfwxdyyGd441AcFHH8ooscbVB5 -xtdFwr+O4v8JT0goCyE9Xqj2W+h7H7kmHNqN5QT5BsDasTVrWkqtCN6D+9Bcx92l -ZtpjTkx5IoBzD4ALzAds5lHDA/XHcIhc8HFSv64WDbcPxrCl5VO8pP1Jopo5PYr2 -LbsXVAECgYEAz/pmiZEjDZe/wkyx/yZoPsV2VaUf+lqs3JVpOiuSJUUQ+oHrv62L -j/HsoKFP6yXyYCjjt0foqPZUSeoNnzhM1ZM9iRANomokAwLqckwvdGr4p9SDKtN5 -xbMzv1XajXFTnucK6onBaj7BXAvccGrsOosczT4P2oFXEZnEIT8ZQl0CgYEA87mH -/rCkAf7g3LVS2VzG/mmVscFaJxzjHtESEx8hgQ4vv7Cb4Q31bA9fn35HaFu88uf1 -HouoGHAu+jU7KLulW446QPDxunt+DmhxNe8hOtUrjwTesMq14D5H01RmbRHVDd9E -5Gv5haT5yThxNLzFTggCI28vp1FA8SAY1ssLpvECgYBGV7TSloo6kLbE6tfRKpZb -lMHfWcglDwIkYUyD5jS58lA5yjOIUxQ/DV4xPh4ftGfz6iCK3wFsFFSR413UGmCy -Y+iOMSXLZwbjFdth6S6ru3p6mT/7/ibTnTbFYi5XZJsZxZ9FkG4glzUjAsf+Jcvc -SSzmpjUKfHCMfWt+qy7J6QKBgAvlj4TYHHlYdqNvWmbvx2rdvofZt0vXdiKn8+jp -CRqilaQWu9UleEhZC8LeSCAI8lUtC2L9UCw5NaHS/VtEpZKtg5xt5m7C3mlXoccP -MCEODL1DcJdSncQfZiQjp4hFaY/uyQ8ZUim63tJ6pdP8LulbLLeMEtho9/GNLok1 -ihERAoGBAJG6HKWres9M95bb0soh7o/qwV/IVgM6AIyPc31okfsym8bIZWqC3cXS -l6F87cLT/KT2YcKaQRaZQ0Hl98MLm/kiSyxUMsqrKBGmLeVR9brKW7Ee/oG6Abe+ -ODMhBcaJVDDdF5nINssOJtQLxgnSjQYAwaM1xLg/x2UmwKQSrGHR ------END RSA PRIVATE KEY----- diff --git a/calicoctl/tests/certs/admin.csr b/calicoctl/tests/certs/admin.csr deleted file mode 100644 index f8326afd804..00000000000 --- a/calicoctl/tests/certs/admin.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICwTCCAakCAQAwfDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMSAwHgYDVQQL -ExdLdWJlcm5ldGVzIFRoZSBIYXJkIFdheTEOMAwGA1UEAxMFYWRtaW4wggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGAWnEpDPUyqoRRvoecHGlZ277cZlP -K3s0LKx6j46uNtb1U5MsV9vAFtoWKDYdY8GQEIov3HCkWVhrP3iLjp1hWmh6VWZi -x5fGwtfbRCngpzRRTRUDBMfYqk5sNQwPCY74phytAwY5aDVchlckjo+lKPfADoeU -DUHEPijSSycLFeE0gCuyRgnUTZvVtwC8saS8SAECQ2ojdm+9Z8Ipf68ysbG9Uioi -12vJCrOfNaVHMWYLczQeq1Ms6yrDTzBqSjgL4LDbuw2U0C1gxK5ZSZq+BVzwn0qb -iUIA9ioLtGYiUGURw5+iK7SavKf4NMgGfQzhMn02SbupGgdcIapgzseNAgMBAAGg -ADANBgkqhkiG9w0BAQsFAAOCAQEAZprfwdXYJkVVQSBNHXUi2ePxKiU24EjqC1Yq -a4Z9NxzUrCPtaR8hVfo75t2c4vJLJcKdIkB0eGDJwcIOC5I1JIsgzLzQeXDElcKW -xGFF3L+W4R4iCQ5XxnfE2dpKt9xuaamxKflflPjbZFpX1w0Sj+DP8YjcuoXSJT78 -fdR2iVpUBy2CHa06Hz1rEBynqTziRtpS3lDaWZsAKtb/oP5zfJGlhzShV5DY6YMx -G7M9854qMSsdjmCWolQ3Bz/Wg77V98Mg5jeF5iua1OUpsomgIq9mKPb+Du/rxWqS -4ElAOicSc4zSHaADc/nm5GN+k0wRihkaS9yD/VHahSulfErKLg== ------END CERTIFICATE REQUEST----- diff --git a/calicoctl/tests/certs/admin.pem b/calicoctl/tests/certs/admin.pem deleted file mode 100644 index c51fffe8804..00000000000 --- a/calicoctl/tests/certs/admin.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUSjOSh8mcwPn/RPsFVnZ/Ve5uJQAwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMjAwMFoXDTIyMDkyOTIyMjAwMFowfDEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -FzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMSAwHgYDVQQLExdLdWJlcm5ldGVzIFRo -ZSBIYXJkIFdheTEOMAwGA1UEAxMFYWRtaW4wggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQDGAWnEpDPUyqoRRvoecHGlZ277cZlPK3s0LKx6j46uNtb1U5Ms -V9vAFtoWKDYdY8GQEIov3HCkWVhrP3iLjp1hWmh6VWZix5fGwtfbRCngpzRRTRUD -BMfYqk5sNQwPCY74phytAwY5aDVchlckjo+lKPfADoeUDUHEPijSSycLFeE0gCuy -RgnUTZvVtwC8saS8SAECQ2ojdm+9Z8Ipf68ysbG9Uioi12vJCrOfNaVHMWYLczQe -q1Ms6yrDTzBqSjgL4LDbuw2U0C1gxK5ZSZq+BVzwn0qbiUIA9ioLtGYiUGURw5+i -K7SavKf4NMgGfQzhMn02SbupGgdcIapgzseNAgMBAAGjfzB9MA4GA1UdDwEB/wQE -AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw -ADAdBgNVHQ4EFgQUmxH4EiI6noXA8tTH+dVq0vpMVFwwHwYDVR0jBBgwFoAUYjUx -lrW9gsYx7GSwowxQjcPbUxQwDQYJKoZIhvcNAQELBQADggEBAMWB9sEAF65Sc2p5 -LTDc04vd37wtEolHLz9LaKl/Y1ywXkJrI9v8TJK32KAsGVqNU+puaDdsjixzuLNa -Iwx5IllVKzgySxauhleSiEivniP7B9uHmiA/q2Lu0QgAD5s7JF03zgA9BZ/CQBa3 -Ii1O8jGH0iqw/QWLvRKoIQlLahIbu1Ekfx595AcxD53fdmDl9e7hcBzOaHFX9xu5 -n623mcylVPcRVYClu6cmipPPjc8t0yjdtj+0omFDC/5/6KicA4LwMAuTpgUKl6ea -HTQmw11l2/FYDbor8bE2XRjyfTmbX64mo8eRIcYL7CJWrtwkaIDZg6WngsWkHCnE -W14BZiQ= ------END CERTIFICATE----- diff --git a/calicoctl/tests/certs/ca-config.json b/calicoctl/tests/certs/ca-config.json deleted file mode 100644 index a63e0dd23e5..00000000000 --- a/calicoctl/tests/certs/ca-config.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "expiry": "8760h" - }, - "profiles": { - "kubernetes": { - "usages": ["signing", "key encipherment", "server auth", "client auth"], - "expiry": "8760h" - } - } - } -} diff --git a/calicoctl/tests/certs/ca-csr.json b/calicoctl/tests/certs/ca-csr.json deleted file mode 100644 index 8145e5036c5..00000000000 --- a/calicoctl/tests/certs/ca-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "Kubernetes", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "CA", - "ST": "Oregon" - } - ] -} diff --git a/calicoctl/tests/certs/ca-key.pem b/calicoctl/tests/certs/ca-key.pem deleted file mode 100644 index b9f3a63b2df..00000000000 --- a/calicoctl/tests/certs/ca-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA5LlDBZ6hH9U5t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka -0Mmq98pDwdGC5hgsERXOUfOVnX3/TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSTh -xIuz1vRcb1tl0maKNs1AYDHbm2SVlxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFih -ztaFhPCCC6w6ZPYnqAQgMU0QHphWEZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9 -cWY2huRmwId7K516CYwBOm0PYZue3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+a -kDIByoJV8oMaagtoQ7BSaZ9bBy3GhBpjdz2jrwIDAQABAoIBAAk8CZ6yduLoIvpu -RLYHktvHFD/dD220S0jJDi/J0He4NgulUpXXbpWujunGYbiUhULzVG8unH3NVn9u -/a+dzCpC9ch8q+8tr8SdLeDAzKxHYUSErrDWyx4Eo67DS+sgxLfNtamsmac+emOt -L7Q273Ga94eea9THUIfU1b8IjOkZj2LUnVWW/0DTBFi5Vq/4HY4+x8ErWBzXFeAv -2xil5fRwBoLqSsapaUmsmxsNAIyiqcf6gtIZoNUSw3nTDBQiO6KC4aVuZ42pimrJ -CHplTvqXW+f9kohZZUwGa7BT8wSo40aasaLBAffmcgE68Hin+zSeRoDE0bVs868M -wP/jXJECgYEA9nZqVCFcqkuiXSuSfLYrfvjXftq2JnNNLkrB9Uq/gAgz8TVMT/qD -bIJ2seNXA3wzFsZERRjx2BgtocwjpweOyKNf3uOEQiZgh5e618ATr6uuNmF3u/fy -EXG3CBqK9Lh52NWEB4C0T7OD42ru6MN7aYRY30ZuvZaXPbC1T7o04fsCgYEA7ZMd -seQCxcM+jQDVGwQ9pMeF1WT+5Du4zOb4vsNEf3oDusnwztbfYCnbVET4vKfFKwAM -C/mYqBaEaASX47M3izUqw7AbmMlY4dWahzBoLHfHbE1gjadVtHqULEhJTKXZqfZz -w0ubbLqnk0MuorGMVP2BVKgwkZzV5R/6dDuMSt0CgYBP9Y79iG1V2n/slkxKJZfq -87SGNVLPGq05jYtrlzqVwROI9++wKugkdhcoE0eRm+O/ScewWy1rHD0BtwcCE5Oh -SE+8Mjggde7vTqyRfoFkhuBYSDreQszIGAp3mJToXEk7rdnNzVWyXd02FOU5ouIR -E5z5oxIedBLRMtk/6ntprQKBgQCJUvJlM0EPAy6S3ppQBYGET/hiQwC6+HJ3rkK2 -MbTUYrjpLXVOehGgSlGHQl7s3aUwl9Rez6WX83wRjCYn7h37D35qos8w36HK2Gd8 -IVT17z6MsaVP/BukOP6RIi+MaImKnvSHPJrYnIPksX6xeCN/tREe2CFK6fcRfAyP -RyRu2QKBgQDMGJ35UVhn62fqSFIzAARsGdnhg2PzmSza2abF69E1CiHBT/gOEpsK -dGmDSDHqcNl151roBeUYxZ8Vclr2rYuZEoIXuV50GUC9+jJEUsA1E0fR/73klfJT -3KzomlRJJx6F5dppYU8DztB8jgfNfhcdFVDQXNZyv8ZbC0+oEvs+2Q== ------END RSA PRIVATE KEY----- diff --git a/calicoctl/tests/certs/ca.csr b/calicoctl/tests/certs/ca.csr deleted file mode 100644 index 326059f79c6..00000000000 --- a/calicoctl/tests/certs/ca.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICrTCCAZUCAQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNB -MRMwEQYDVQQDEwpLdWJlcm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEA5LlDBZ6hH9U5t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka0Mmq98pD -wdGC5hgsERXOUfOVnX3/TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSThxIuz1vRc -b1tl0maKNs1AYDHbm2SVlxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFihztaFhPCC -C6w6ZPYnqAQgMU0QHphWEZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9cWY2huRm -wId7K516CYwBOm0PYZue3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+akDIByoJV -8oMaagtoQ7BSaZ9bBy3GhBpjdz2jrwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEB -AKSs0yd6LXfAr5SOPycDXCAj/vszZaL1XedpFYiq9YXhyhx7SLpJ7QpRCrShMXcI -MgPXSmHfbf/Yc72HySRsbJ1j8XCVOnRsGheS17twJpI7Sekaphgq/zsNJH46GtIl -MfyPPFiB+zuVEkHhwUK8448KwfDsOTuXdVkDJAX/2o0VY1MK0OD1dy5or+6BUulj -mtXhw62vl75HX4rh9mEvveoUd/pPfJ0Hx4IpjHAz137zUX3Yb9xTo1Vw69d0qg73 -ofPPp3lcn0uD6YHmb+zNhPpsG7jruHJ/mKOunEo2G+5CGZkUMwujiwomEuQ7V/9v -iBWJ7sALM81UbGH5nQHq7/Q= ------END CERTIFICATE REQUEST----- diff --git a/calicoctl/tests/certs/ca.pem b/calicoctl/tests/certs/ca.pem deleted file mode 100644 index 1456904abbb..00000000000 --- a/calicoctl/tests/certs/ca.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDoDCCAoigAwIBAgIUYJhXyAkmYfFbFc1aKKd4wfqk2jYwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMjAwMFoXDTI2MDkyODIyMjAwMFowaDEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -EzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQDEwpLdWJl -cm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5LlDBZ6hH9U5 -t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka0Mmq98pDwdGC5hgsERXOUfOVnX3/ -TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSThxIuz1vRcb1tl0maKNs1AYDHbm2SV -lxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFihztaFhPCCC6w6ZPYnqAQgMU0QHphW -EZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9cWY2huRmwId7K516CYwBOm0PYZue -3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+akDIByoJV8oMaagtoQ7BSaZ9bBy3G -hBpjdz2jrwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB -/zAdBgNVHQ4EFgQUYjUxlrW9gsYx7GSwowxQjcPbUxQwDQYJKoZIhvcNAQELBQAD -ggEBANBzL9fFJhyJNIoARNiGHSFaKGoqEJPCP793cMdSlWoTApfQk8qNHXVGeC9J -R9l3U+I7QiJLjy3rtoDHrXwyCusnaqvReUA+hGAVQm5PZu9OETFzzFu4dTZJd3E0 -M8vwt4yRdDtl5LVjYRo7yEjJyb7jssaV3bSz7VZnwHACT9hBxPu+3VAgFxrRBy9c -uqWzxlx+cBagHLTA7YurHG41AFFH1Z10vU2MisTLf5k6k4uMeEAgE/tUDB+gZNkT -0+hUjAhZR0uikDoeqSXDoh9NvLrpjt1raQzvksBVRNcuoGWQMjF3USkBJE5jQuLc -+Q7J/UKfb8YZIw69kidmDLq/5Gk= ------END CERTIFICATE----- diff --git a/calicoctl/tests/certs/kube-controller-manager.kubeconfig b/calicoctl/tests/certs/kube-controller-manager.kubeconfig deleted file mode 100644 index b06f1b69a84..00000000000 --- a/calicoctl/tests/certs/kube-controller-manager.kubeconfig +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - insecure-skip-tls-verify: true - name: test-apiserver -contexts: -- context: - cluster: test-apiserver - user: system:kube-controller-manager - name: default -current-context: default -kind: Config -preferences: {} -users: -- name: system:kube-controller-manager - user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQ4VENDQXRtZ0F3SUJBZ0lVU2pPU2g4bWN3UG4vUlBzRlZuWi9WZTV1SlFBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2FERUxNQWtHQTFVRUJoTUNWVk14RHpBTkJnTlZCQWdUQms5eVpXZHZiakVSTUE4R0ExVUVCeE1JVUc5eQpkR3hoYm1ReEV6QVJCZ05WQkFvVENrdDFZbVZ5Ym1WMFpYTXhDekFKQmdOVkJBc1RBa05CTVJNd0VRWURWUVFECkV3cExkV0psY201bGRHVnpNQjRYRFRJeE1Ea3lPVEl5TWpBd01Gb1hEVEl5TURreU9USXlNakF3TUZvd2ZERUwKTUFrR0ExVUVCaE1DVlZNeER6QU5CZ05WQkFnVEJrOXlaV2R2YmpFUk1BOEdBMVVFQnhNSVVHOXlkR3hoYm1ReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1TQXdIZ1lEVlFRTEV4ZExkV0psY201bGRHVnpJRlJvClpTQklZWEprSUZkaGVURU9NQXdHQTFVRUF4TUZZV1J0YVc0d2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUIKRHdBd2dnRUtBb0lCQVFER0FXbkVwRFBVeXFvUlJ2b2VjSEdsWjI3N2NabFBLM3MwTEt4Nmo0NnVOdGIxVTVNcwpWOXZBRnRvV0tEWWRZOEdRRUlvdjNIQ2tXVmhyUDNpTGpwMWhXbWg2VldaaXg1Zkd3dGZiUkNuZ3B6UlJUUlVECkJNZllxazVzTlF3UENZNzRwaHl0QXdZNWFEVmNobGNram8rbEtQZkFEb2VVRFVIRVBpalNTeWNMRmVFMGdDdXkKUmduVVRadlZ0d0M4c2FTOFNBRUNRMm9qZG0rOVo4SXBmNjh5c2JHOVVpb2kxMnZKQ3JPZk5hVkhNV1lMY3pRZQpxMU1zNnlyRFR6QnFTamdMNExEYnV3MlUwQzFneEs1WlNacStCVnp3bjBxYmlVSUE5aW9MdEdZaVVHVVJ3NStpCks3U2F2S2Y0Tk1nR2ZRemhNbjAyU2J1cEdnZGNJYXBnenNlTkFnTUJBQUdqZnpCOU1BNEdBMVVkRHdFQi93UUUKQXdJRm9EQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0RBUVlJS3dZQkJRVUhBd0l3REFZRFZSMFRBUUgvQkFJdwpBREFkQmdOVkhRNEVGZ1FVbXhINEVpSTZub1hBOHRUSCtkVnEwdnBNVkZ3d0h3WURWUjBqQkJnd0ZvQVVZalV4CmxyVzlnc1l4N0dTd293eFFqY1BiVXhRd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNV0I5c0VBRjY1U2MycDUKTFREYzA0dmQzN3d0RW9sSEx6OUxhS2wvWTF5d1hrSnJJOXY4VEpLMzJLQXNHVnFOVStwdWFEZHNqaXh6dUxOYQpJd3g1SWxsVkt6Z3lTeGF1aGxlU2lFaXZuaVA3Qjl1SG1pQS9xMkx1MFFnQUQ1czdKRjAzemdBOUJaL0NRQmEzCklpMU84akdIMGlxdy9RV0x2UktvSVFsTGFoSWJ1MUVrZng1OTVBY3hENTNmZG1EbDllN2hjQnpPYUhGWDl4dTUKbjYyM21jeWxWUGNSVllDbHU2Y21pcFBQamM4dDB5amR0aiswb21GREMvNS82S2ljQTRMd01BdVRwZ1VLbDZlYQpIVFFtdzExbDIvRllEYm9yOGJFMlhSanlmVG1iWDY0bW84ZVJJY1lMN0NKV3J0d2thSURaZzZXbmdzV2tIQ25FClcxNEJaaVE9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBeGdGcHhLUXoxTXFxRVViNkhuQnhwV2R1KzNHWlR5dDdOQ3lzZW8rT3JqYlc5Vk9UCkxGZmJ3QmJhRmlnMkhXUEJrQkNLTDl4d3BGbFlhejk0aTQ2ZFlWcG9lbFZtWXNlWHhzTFgyMFFwNEtjMFVVMFYKQXdUSDJLcE9iRFVNRHdtTytLWWNyUU1HT1dnMVhJWlhKSTZQcFNqM3dBNkhsQTFCeEQ0bzBrc25DeFhoTklBcgpza1lKMUUyYjFiY0F2TEdrdkVnQkFrTnFJM1p2dldmQ0tYK3ZNckd4dlZJcUl0ZHJ5UXF6bnpXbFJ6Rm1DM00wCkhxdFRMT3NxdzA4d2FrbzRDK0N3MjdzTmxOQXRZTVN1V1VtYXZnVmM4SjlLbTRsQ0FQWXFDN1JtSWxCbEVjT2YKb2l1MG1yeW4rRFRJQm4wTTRUSjlOa203cVJvSFhDR3FZTTdIalFJREFRQUJBb0lCQUFZSzVQOXJRMm1yQmFXaApWT0M0N2I3dWVTU1RRdXAzbVRydVloVWJiRzlFblNxL2NpNVlRQXlNcGZzbkh2K21tN0daejUzR1RHbTNrRXMxCmxLZ3RvZi9ta21tcFVZYVNNTCtRRXFaT1hqak00WHZacmxwNU91QVIwbkxhNjVOSjUyTVBMckRZOXNlcHRuY3MKWWx4clBWYjgrUktUWHUvVnQ3d1ZhWW1CWVorazdZR084RDN1b2hSZnd4ZHl5R2Q0NDFBY0ZISDhvb3NjYlZCNQp4dGRGd3IrTzR2OEpUMGdvQ3lFOVhxajJXK2g3SDdrbUhOcU41UVQ1QnNEYXNUVnJXa3F0Q042RCs5QmN4OTJsClp0cGpUa3g1SW9CekQ0QUx6QWRzNWxIREEvWEhjSWhjOEhGU3Y2NFdEYmNQeHJDbDVWTzhwUDFKb3BvNVBZcjIKTGJzWFZBRUNnWUVBei9wbWlaRWpEWmUvd2t5eC95Wm9Qc1YyVmFVZitscXMzSlZwT2l1U0pVVVErb0hydjYyTApqL0hzb0tGUDZ5WHlZQ2pqdDBmb3FQWlVTZW9ObnpoTTFaTTlpUkFOb21va0F3THFja3d2ZEdyNHA5U0RLdE41CnhiTXp2MVhhalhGVG51Y0s2b25CYWo3QlhBdmNjR3JzT29zY3pUNFAyb0ZYRVpuRUlUOFpRbDBDZ1lFQTg3bUgKL3JDa0FmN2czTFZTMlZ6Ry9tbVZzY0ZhSnh6akh0RVNFeDhoZ1E0dnY3Q2I0UTMxYkE5Zm4zNUhhRnU4OHVmMQpIb3VvR0hBdStqVTdLTHVsVzQ0NlFQRHh1bnQrRG1oeE5lOGhPdFVyandUZXNNcTE0RDVIMDFSbWJSSFZEZDlFCjVHdjVoYVQ1eVRoeE5MekZUZ2dDSTI4dnAxRkE4U0FZMXNzTHB2RUNnWUJHVjdUU2xvbzZrTGJFNnRmUktwWmIKbE1IZldjZ2xEd0lrWVV5RDVqUzU4bEE1eWpPSVV4US9EVjR4UGg0ZnRHZno2aUNLM3dGc0ZGU1I0MTNVR21DeQpZK2lPTVNYTFp3YmpGZHRoNlM2cnUzcDZtVC83L2liVG5UYkZZaTVYWkpzWnhaOUZrRzRnbHpVakFzZitKY3ZjClNTem1walVLZkhDTWZXdCtxeTdKNlFLQmdBdmxqNFRZSEhsWWRxTnZXbWJ2eDJyZHZvZlp0MHZYZGlLbjgranAKQ1JxaWxhUVd1OVVsZUVoWkM4TGVTQ0FJOGxVdEMyTDlVQ3c1TmFIUy9WdEVwWkt0ZzV4dDVtN0MzbWxYb2NjUApNQ0VPREwxRGNKZFNuY1FmWmlRanA0aEZhWS91eVE4WlVpbTYzdEo2cGRQOEx1bGJMTGVNRXRobzkvR05Mb2sxCmloRVJBb0dCQUpHNkhLV3JlczlNOTViYjBzb2g3by9xd1YvSVZnTTZBSXlQYzMxb2tmc3ltOGJJWldxQzNjWFMKbDZGODdjTFQvS1QyWWNLYVFSYVpRMEhsOThNTG0va2lTeXhVTXNxcktCR21MZVZSOWJyS1c3RWUvb0c2QWJlKwpPRE1oQmNhSlZERGRGNW5JTnNzT0p0UUx4Z25TalFZQXdhTTF4TGcveDJVbXdLUVNyR0hSCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== diff --git a/calicoctl/tests/certs/kubeconfig b/calicoctl/tests/certs/kubeconfig deleted file mode 100644 index b9a24ba8a10..00000000000 --- a/calicoctl/tests/certs/kubeconfig +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - insecure-skip-tls-verify: true - server: https://127.0.0.1:6443 - name: test-apiserver -contexts: -- context: - cluster: test-apiserver - user: admin - name: admin -current-context: admin -kind: Config -users: -- name: admin - user: - client-certificate: /home/user/certs/admin.pem - client-key: /home/user/certs/admin-key.pem diff --git a/calicoctl/tests/certs/kubernetes-csr.json b/calicoctl/tests/certs/kubernetes-csr.json deleted file mode 100644 index 778db6322c2..00000000000 --- a/calicoctl/tests/certs/kubernetes-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "kubernetes", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/calicoctl/tests/certs/kubernetes-key.pem b/calicoctl/tests/certs/kubernetes-key.pem deleted file mode 100644 index 98b8676abcc..00000000000 --- a/calicoctl/tests/certs/kubernetes-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpgIBAAKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeIQcuiW8CV2JwNk4KI80kO -n76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLjarXppB0uPduIERTNc4Xv3 -/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6u+B1LqIlktMTOD+93UFi -lsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D40KYRo/7WGQDz9YLWNKqh -vGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2NlwupzpqoXwxd9e1IEMhzmGRHcC -+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQABAoIBAQC6uU4whPi09vRO -htTooxZshPRRamEMafjYJQmbbnsqp016AQjUaIz2nNWd2536AAlKOc/FTFx3xaEX -QX5xZZ2S7IYGLkdTAkFhsQYI49FxAA5CBz02nAsccjsDQ/AoyXXSEJzBKAk8XBiG -ZeiA/StY+cVvK4D0G7FFSsUnZlzz9uMrMHyQKKrRR8KkU+QnAjZnxqPkckc10K1H -1ZNumS3Jx4hRVSi5KXjCjNbqf79nBWJ96iSczev97CT+WZ1GnAPQtuWwHD2rjZmy -0DKsLnRujD8u+lJjBEhbSrdLYMDNJsO1SAtpYN9W94+8f9ZQDxNBRJ1C4f5XTLii -ymnkPD9xAoGBAPsMOPeNRgS7Z2Bwgs4gr4x53AJrYc0nIanm01d89aVWA5c+V4NJ -6+KtLjZepRcjKV6MGt+y3MR/52lUj3cgeYwVERwkIyvIVyDuSaqcc7RYlPDwAsuN -h3G/Wg8blQxDmvbRZDLTwjOsfvCG7s8VQEeJHoyJYT81F/oD/d1z4oXtAoGBAPeQ -bDJa0x7ciZcf97SY0DnnIfT1kiDIk5q1UEi4DNtVFQX/BQxsvkwyhdttVLuFe8gw -2hkiG6QavSHhxtgwGtnGMVZgDpSdrk7zLVIVERCN2EB5Lo1+a/JYkVhYedmTGqu1 -HnM2rrFPjPD04EriNKewJAx/dC8q2dBS9/N/T8xvAoGBAOX4vVqwdJqzHbDvgDPZ -J1cU7mDdA3uORD1CsQls9A3gLGvo9PvUxJwirrmpm6wFTslIqPmQ/MGYtWD80Gt9 -OTsEtWbFB978qCwHfT4oEan8l3vbMYRMAu5FLve1+aSBbbx59kLFTxpNAv/Na4gR -3I9rYau10Xq4ZV1nOLAbjz/FAoGBAIxrgcNqGvgVVYG/4yuvxeQiAvPD2tf3jSmi -kGA+7SP3dY5KIV3zzFjCC4Tz1azrwNNDSmIZI56IgCDYxIXZe1FtBo0cvQh1C+rC -KkG1q1E9c5zWX55oR+hVblOzE6Jiuy0L9bKaIKp4GdSOwS4Yco9u7HOeU5Nxdcyh -UvztiKDHAoGBAO4i6SArmLYc/e2m/npAW/jTts3Q7pNlywAlVFo8ZDdYADY+1wtO -5GL1VqoWPND8LMPVLJzfnyMeeo+g1xjezY/QciS3NSR9kgM9quqi1jl+fgLwQVbf -Snx348RF4B8r8vtfH5q1pS9NM4G3zQWYhlJv8TVgGON8yJNfoh80N1Qy ------END RSA PRIVATE KEY----- diff --git a/calicoctl/tests/certs/kubernetes.csr b/calicoctl/tests/certs/kubernetes.csr deleted file mode 100644 index 9b32900a447..00000000000 --- a/calicoctl/tests/certs/kubernetes.csr +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIDXzCCAkcCAQAwfTELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxIDAeBgNVBAsTF0t1 -YmVybmV0ZXMgVGhlIEhhcmQgV2F5MRMwEQYDVQQDEwprdWJlcm5ldGVzMIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeI -QcuiW8CV2JwNk4KI80kOn76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLja -rXppB0uPduIERTNc4Xv3/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6 -u+B1LqIlktMTOD+93UFilsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D4 -0KYRo/7WGQDz9YLWNKqhvGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2Nlwupzp -qoXwxd9e1IEMhzmGRHcC+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQAB -oIGcMIGZBgkqhkiG9w0BCQ4xgYswgYgwgYUGA1UdEQR+MHyCCmt1YmVybmV0ZXOC -Emt1YmVybmV0ZXMuZGVmYXVsdIIWa3ViZXJuZXRlcy5kZWZhdWx0LnN2Y4Iea3Vi -ZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyghxrdWJlcm5ldGVzLnN2Yy5jbHVz -dGVyLmxvY2FshwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQARwbt/QbJlGgdV5v9K -40JvhD4GPqQDdU15gZlht7/Cz1YPlIjqZy0TUaEwVYNFw8W8UW2LYhCXzBsTsHw3 -pfQw6DRjvPcceCn/UH3S2F9FjLZ9rrvu79TX7uUBAl5PDkN8MuciijlFDoHN2hX5 -1ApEWZi1V6G2akzocbywkh5bpf+WBZszWsvoC6nYB4ghK85Z0yqIAwbCKORXwSNn -DtQ9VmMtg/vyWj6gg9K/bYh0Bh3l4FONsqO4VbX7+meiEy8Ony7f04m05IkJDcO8 -mKF3OTuUMkBMEMVkZKXJJ9iI+TIrtQ6xbPc3Ctm199OXK4i65WMaO9llQ9q9iByX -py8d ------END CERTIFICATE REQUEST----- diff --git a/calicoctl/tests/certs/kubernetes.pem b/calicoctl/tests/certs/kubernetes.pem deleted file mode 100644 index 96505e7f255..00000000000 --- a/calicoctl/tests/certs/kubernetes.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEfjCCA2agAwIBAgIUepjO3FMlyIcWiO0N4/GJgV6Uj/QwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMzEwMFoXDTIyMDkyOTIyMzEwMFowfTEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -EzARBgNVBAoTCkt1YmVybmV0ZXMxIDAeBgNVBAsTF0t1YmVybmV0ZXMgVGhlIEhh -cmQgV2F5MRMwEQYDVQQDEwprdWJlcm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeIQcuiW8CV2JwNk4KI80kO -n76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLjarXppB0uPduIERTNc4Xv3 -/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6u+B1LqIlktMTOD+93UFi -lsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D40KYRo/7WGQDz9YLWNKqh -vGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2NlwupzpqoXwxd9e1IEMhzmGRHcC -+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQABo4IBCTCCAQUwDgYDVR0P -AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB -Af8EAjAAMB0GA1UdDgQWBBQNhPCXoXrtgP0M8NPQipbRggdk9DAfBgNVHSMEGDAW -gBRiNTGWtb2CxjHsZLCjDFCNw9tTFDCBhQYDVR0RBH4wfIIKa3ViZXJuZXRlc4IS -a3ViZXJuZXRlcy5kZWZhdWx0ghZrdWJlcm5ldGVzLmRlZmF1bHQuc3Zjgh5rdWJl -cm5ldGVzLmRlZmF1bHQuc3ZjLmNsdXN0ZXKCHGt1YmVybmV0ZXMuc3ZjLmNsdXN0 -ZXIubG9jYWyHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBALKCw/I9j3e5Q2NUGaSg -cUnVuzTwgJ46oTxoOm1mN6whPHe2ACPHWBKsCFhCtgMDEUy4hObrmzlEbzXhHeMr -Ri7+a0DnheYk8QDcR5nk0oxdG8XbFf6dBJdHLRMfTmYKPhFj1nM8Eh2xKZszdkIG -FWGL7Php/F3+HzwQj4rbZYDQMITiRR3ib+HU9m3aBu4VTLdAL/I4EizOXUc7LxDz -dyliu7xVzGweoYI5BE1PzaN0ClhOpvV4y9g2vUxuuqdWSo70pld712+hZ8qwAJgp -F+vvtmEfroJGckI6llbvhXmmV8Qek9ekpol2QeZDHgCX6wHw+sGVfT3oPMzI82jq -WcM= ------END CERTIFICATE----- diff --git a/calicoctl/tests/certs/service-account-csr.json b/calicoctl/tests/certs/service-account-csr.json deleted file mode 100644 index be3c0ca4b6a..00000000000 --- a/calicoctl/tests/certs/service-account-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "service-accounts", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/calicoctl/tests/certs/service-account-key.pem b/calicoctl/tests/certs/service-account-key.pem deleted file mode 100644 index 8213a751f69..00000000000 --- a/calicoctl/tests/certs/service-account-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEA7F9N9m7yq96IetGBTJK4CIG1SB11NdeGXCZD943BHXTYdUvv -WTEkbwoWhMonyicghHmDzmJTf376Bk49yClC7tBx/5TQX4J95Y2mX3EThAdPyVvh -sjYJoYGY8nd7WvXlo33yEdTCnQUqSEZ8HXgu/iWB29Yu/4Rh2ZnxLnGQbLE4dJ5f -iu64sZtExeN/BF84DOaujqiv38jkL8ah9zxDutDMk2qTMneRi8e5ArukIM/GVKBx -mJMdafeL/emObBuaAIGJCM6yPUNB8Ry8RhugiRjyrDsDMKggMQOQkWr3QO9n7Twx -nIn6BoCxd2ea6VUi7Ib/ELgC8Ie2DNWIpzRUDwIDAQABAoIBAQDAGZx04Spbv9lP -Z6EbqEnkr/WyjC5L+cL6dSbbs9r0o5efjH0TEbs4ewxeEyVPR4lH4LHcM1EE1x8/ -rKrNV6tMBx/+xOSsGpNS0lIaUv23WXHghcnhWcVt+rNgqvYXsKxWuO7Yyv73OdFp -N89668fVSIpHLcS4aNBVVqUKR8VGbxkpPADTA8mJoJ3jwS/5GQMyd3L6kd3FvvTI -YeWOCXLY6QHNZ1OrnntNZt0J8ikZW/ntmB1tNrY/rblaTBtxGihmbHWgCWSEEZfZ -iWOgcljTCgug6bxALIGJF0mTheHkiY7RXjrmx1QMeq3yS07wPl3hlDCcCYKPTEvq -i193bV3hAoGBAPxGZet1YrIfilLJ70v+QrpywQaIey8WkfOUO8Adv3PmwFA33NrZ -PkEQjYsQm/IWkSfs9IZbIEXeOkZl5ozCdT4vj6xXT4FsnL79H39sSoqlhKVq5flW -UnZhAPUWq/U2B1RyC1HSwtZEHiK977nrxpNXRoNX2yiVj7hnmALql/hnAoGBAO/c -y0U0/NlfrMMq9KIZXHGM1IbIZFBeLnpfZD+apLrSkzoQvaxqF/3l2i7xD4WI6HZP -0mTuswyAT04wBb9WeMH1qWjk/O8OWtbqfFo/bL2KSALMjHN1zLrFhMMg7Rq8a5LP -BQTep+nEEFFGQI0LJKfJ1+7VwiVDs5Ryq6WyFx4ZAoGAGL9bLi70wJ6Bdj+i/uRx -bVLmhpqK4wKmzKtE9UK1zkvbn8LrInjfN4jFKdg2RBhcovsGvctgrhnvw4ophLNq -xu/pezGRdhPOiJnSJjDcWx+DlKqY5s3GByDa9DAGLGbhbzJE1AEF5fkGr8fMJYPw -lfGg1C+hKykI0UEwU1DqGY8CgYEA5qdufM2Ye7uqGT98YUh8AeFIGZgoBrSagyip -8RPXZqPJ2eNxUZPwIEJgzhUXNPTTfboCevajDNlx6aD6VeVkWDfQwcK5i3RFXDe+ -ftZQze9kkfR69yiHR+9aXH2UI8qes10J2YX2+C+G9XDV8AuQIx1Q3SWG/WieDpk6 -gCrCWjkCgYEAmX5u+Ka4Rx0cZcci/lDrjRWlhugH87rg+ZYQyCT8Pxq5Is3DUqQQ -9bArNFagKllb1DHjZjY5Lhts3S4Yn8exFpn2Qhg5j8SH8v03SQjAeKDFtsEnGPuQ -cygzKjNNTOh2NImfrrV41Fsid6qkCzzmBZ5WKjy0RXtAVTMBtlEfOM8= ------END RSA PRIVATE KEY----- diff --git a/calicoctl/tests/certs/service-account.csr b/calicoctl/tests/certs/service-account.csr deleted file mode 100644 index 5b7c710e31a..00000000000 --- a/calicoctl/tests/certs/service-account.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICyTCCAbECAQAwgYMxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAP -BgNVBAcTCFBvcnRsYW5kMRMwEQYDVQQKEwpLdWJlcm5ldGVzMSAwHgYDVQQLExdL -dWJlcm5ldGVzIFRoZSBIYXJkIFdheTEZMBcGA1UEAxMQc2VydmljZS1hY2NvdW50 -czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOxfTfZu8qveiHrRgUyS -uAiBtUgddTXXhlwmQ/eNwR102HVL71kxJG8KFoTKJ8onIIR5g85iU39++gZOPcgp -Qu7Qcf+U0F+CfeWNpl9xE4QHT8lb4bI2CaGBmPJ3e1r15aN98hHUwp0FKkhGfB14 -Lv4lgdvWLv+EYdmZ8S5xkGyxOHSeX4ruuLGbRMXjfwRfOAzmro6or9/I5C/Gofc8 -Q7rQzJNqkzJ3kYvHuQK7pCDPxlSgcZiTHWn3i/3pjmwbmgCBiQjOsj1DQfEcvEYb -oIkY8qw7AzCoIDEDkJFq90DvZ+08MZyJ+gaAsXdnmulVIuyG/xC4AvCHtgzViKc0 -VA8CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQDS6T5JkfHATn6+47v4znVVvKfW -YiUbC0fRi7kMtnJMdhp8Oe8p2XXDmzBwaFVYneBhwSddKJG41snmYE8yv746guYh -ndnh/ZtXtP39E6q+dknMGfJ/LZyB6fPM3m7X2VMtww5uFfeXZyY4aE4GOIqRSkGO -KHP+0h6+MqE9AFYtjOuIpCSfmZ5XLf2PfxY9LxePMmhKCUV1qmf6ZftJ+LP/97H3 -RP7k+7zK8q+xq8ETE2Ub2Ux8s36EVykVzh06kElhsHK7nqkafyJE/8lkiaExTKvd -Kk5ii3CnQi6/RaZQ8TeNzjqcUMDfxigeh6JkC60xrhQThR10oUajxxd1Sg/N ------END CERTIFICATE REQUEST----- diff --git a/calicoctl/tests/certs/service-account.pem b/calicoctl/tests/certs/service-account.pem deleted file mode 100644 index 5abe649c2b8..00000000000 --- a/calicoctl/tests/certs/service-account.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID+TCCAuGgAwIBAgIUHOMlm843n+Z1yg1UdqdWicQppzswDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMzYwMFoXDTIyMDkyOTIyMzYwMFowgYMx -CzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRsYW5k -MRMwEQYDVQQKEwpLdWJlcm5ldGVzMSAwHgYDVQQLExdLdWJlcm5ldGVzIFRoZSBI -YXJkIFdheTEZMBcGA1UEAxMQc2VydmljZS1hY2NvdW50czCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAOxfTfZu8qveiHrRgUySuAiBtUgddTXXhlwmQ/eN -wR102HVL71kxJG8KFoTKJ8onIIR5g85iU39++gZOPcgpQu7Qcf+U0F+CfeWNpl9x -E4QHT8lb4bI2CaGBmPJ3e1r15aN98hHUwp0FKkhGfB14Lv4lgdvWLv+EYdmZ8S5x -kGyxOHSeX4ruuLGbRMXjfwRfOAzmro6or9/I5C/Gofc8Q7rQzJNqkzJ3kYvHuQK7 -pCDPxlSgcZiTHWn3i/3pjmwbmgCBiQjOsj1DQfEcvEYboIkY8qw7AzCoIDEDkJFq -90DvZ+08MZyJ+gaAsXdnmulVIuyG/xC4AvCHtgzViKc0VA8CAwEAAaN/MH0wDgYD -VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV -HRMBAf8EAjAAMB0GA1UdDgQWBBR9pAvzY/VK7MAcOUPSk9iZ3FkwzjAfBgNVHSME -GDAWgBRiNTGWtb2CxjHsZLCjDFCNw9tTFDANBgkqhkiG9w0BAQsFAAOCAQEAd40A -HoVSjcjctv4Xg3H/E80AKAV41hwLZtXTI6ed/ERdgQQMotbW9pgXQix1qzvT6z9e -x+gIdpKE8h89u9wS+bYkthIKJRYRLc7ZJ9Aq+izlfLO/GjxfgBgbOBLMpNKNpmdf -NlOEfoKkLriE31f1oW9Xx3SYdqdaFQJDaDaRg5guQw0YT7PBIlHemmoYGujKNc8+ -iMWYa9aeGMM8yrpH5GRwUI7BAk0+fX4DhyokOuH3mpHXWWkKdVoIfpt3q+jznKYe -l7VaABvoHr3fx9oGhusuwDgLFssraMeIJigHi5ajOTWYw7u6yN2cjh+Ng7TZ+hf/ -+nhPbMGFM/GDpGVXmg== ------END CERTIFICATE----- diff --git a/cni-plugin/Makefile b/cni-plugin/Makefile index 051f6b90570..6eb1fb7a3a6 100644 --- a/cni-plugin/Makefile +++ b/cni-plugin/Makefile @@ -151,7 +151,7 @@ ut-datastore: -e ETCD_ENDPOINTS=http://$(LOCAL_IP_ENV):2379 \ -e KUBECONFIG=/home/user/certs/kubeconfig \ -v $(CURDIR)/../:/go/src/github.com/projectcalico/calico:rw \ - -v $(CURDIR)/tests/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ $(CALICO_BUILD) sh -c '$(GIT_CONFIG_SSH) \ cd /go/src/$(PACKAGE_NAME) && \ ginkgo -cover -r -skipPackage pkg/install $(GINKGO_ARGS)' @@ -184,7 +184,7 @@ run-k8s-apiserver: stop-k8s-apiserver run-etcd docker run --detach --net=host \ --name calico-k8s-apiserver \ -v $(CURDIR)/../:/go/src/github.com/projectcalico/calico \ - -v $(CURDIR)/tests/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ -e KUBECONFIG=/home/user/certs/kubeconfig \ $(CALICO_BUILD) kube-apiserver \ --etcd-servers=http://$(LOCAL_IP_ENV):2379 \ @@ -209,7 +209,7 @@ run-k8s-apiserver: stop-k8s-apiserver run-etcd run-k8s-controller: stop-k8s-controller run-k8s-apiserver docker run --detach --net=host \ --name calico-k8s-controller \ - -v $(CURDIR)/tests/certs:/home/user/certs \ + -v $(CERTS_PATH):/home/user/certs \ $(CALICO_BUILD) kube-controller-manager \ --master=https://127.0.0.1:6443 \ --kubeconfig=/home/user/certs/kube-controller-manager.kubeconfig \ diff --git a/cni-plugin/tests/certs/README.md b/cni-plugin/tests/certs/README.md deleted file mode 100644 index 7ce867a88e1..00000000000 --- a/cni-plugin/tests/certs/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# FV certificates - -The files in this directory are used only in the FV tests in this repository, and were generated according to the steps in [Kubernetes the hard -way](https://github.com/kelseyhightower/kubernetes-the-hard-way). diff --git a/cni-plugin/tests/certs/admin-csr.json b/cni-plugin/tests/certs/admin-csr.json deleted file mode 100644 index 960ce1d9a8c..00000000000 --- a/cni-plugin/tests/certs/admin-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "admin", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "system:masters", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/cni-plugin/tests/certs/admin-key.pem b/cni-plugin/tests/certs/admin-key.pem deleted file mode 100644 index c29c9f95ef7..00000000000 --- a/cni-plugin/tests/certs/admin-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAxgFpxKQz1MqqEUb6HnBxpWdu+3GZTyt7NCyseo+OrjbW9VOT -LFfbwBbaFig2HWPBkBCKL9xwpFlYaz94i46dYVpoelVmYseXxsLX20Qp4Kc0UU0V -AwTH2KpObDUMDwmO+KYcrQMGOWg1XIZXJI6PpSj3wA6HlA1BxD4o0ksnCxXhNIAr -skYJ1E2b1bcAvLGkvEgBAkNqI3ZvvWfCKX+vMrGxvVIqItdryQqznzWlRzFmC3M0 -HqtTLOsqw08wako4C+Cw27sNlNAtYMSuWUmavgVc8J9Km4lCAPYqC7RmIlBlEcOf -oiu0mryn+DTIBn0M4TJ9Nkm7qRoHXCGqYM7HjQIDAQABAoIBAAYK5P9rQ2mrBaWh -VOC47b7ueSSTQup3mTruYhUbbG9EnSq/ci5YQAyMpfsnHv+mm7GZz53GTGm3kEs1 -lKgtof/mkmmpUYaSML+QEqZOXjjM4XvZrlp5OuAR0nLa65NJ52MPLrDY9septncs -YlxrPVb8+RKTXu/Vt7wVaYmBYZ+k7YGO8D3uohRfwxdyyGd441AcFHH8ooscbVB5 -xtdFwr+O4v8JT0goCyE9Xqj2W+h7H7kmHNqN5QT5BsDasTVrWkqtCN6D+9Bcx92l -ZtpjTkx5IoBzD4ALzAds5lHDA/XHcIhc8HFSv64WDbcPxrCl5VO8pP1Jopo5PYr2 -LbsXVAECgYEAz/pmiZEjDZe/wkyx/yZoPsV2VaUf+lqs3JVpOiuSJUUQ+oHrv62L -j/HsoKFP6yXyYCjjt0foqPZUSeoNnzhM1ZM9iRANomokAwLqckwvdGr4p9SDKtN5 -xbMzv1XajXFTnucK6onBaj7BXAvccGrsOosczT4P2oFXEZnEIT8ZQl0CgYEA87mH -/rCkAf7g3LVS2VzG/mmVscFaJxzjHtESEx8hgQ4vv7Cb4Q31bA9fn35HaFu88uf1 -HouoGHAu+jU7KLulW446QPDxunt+DmhxNe8hOtUrjwTesMq14D5H01RmbRHVDd9E -5Gv5haT5yThxNLzFTggCI28vp1FA8SAY1ssLpvECgYBGV7TSloo6kLbE6tfRKpZb -lMHfWcglDwIkYUyD5jS58lA5yjOIUxQ/DV4xPh4ftGfz6iCK3wFsFFSR413UGmCy -Y+iOMSXLZwbjFdth6S6ru3p6mT/7/ibTnTbFYi5XZJsZxZ9FkG4glzUjAsf+Jcvc -SSzmpjUKfHCMfWt+qy7J6QKBgAvlj4TYHHlYdqNvWmbvx2rdvofZt0vXdiKn8+jp -CRqilaQWu9UleEhZC8LeSCAI8lUtC2L9UCw5NaHS/VtEpZKtg5xt5m7C3mlXoccP -MCEODL1DcJdSncQfZiQjp4hFaY/uyQ8ZUim63tJ6pdP8LulbLLeMEtho9/GNLok1 -ihERAoGBAJG6HKWres9M95bb0soh7o/qwV/IVgM6AIyPc31okfsym8bIZWqC3cXS -l6F87cLT/KT2YcKaQRaZQ0Hl98MLm/kiSyxUMsqrKBGmLeVR9brKW7Ee/oG6Abe+ -ODMhBcaJVDDdF5nINssOJtQLxgnSjQYAwaM1xLg/x2UmwKQSrGHR ------END RSA PRIVATE KEY----- diff --git a/cni-plugin/tests/certs/admin.csr b/cni-plugin/tests/certs/admin.csr deleted file mode 100644 index f8326afd804..00000000000 --- a/cni-plugin/tests/certs/admin.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICwTCCAakCAQAwfDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMSAwHgYDVQQL -ExdLdWJlcm5ldGVzIFRoZSBIYXJkIFdheTEOMAwGA1UEAxMFYWRtaW4wggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGAWnEpDPUyqoRRvoecHGlZ277cZlP -K3s0LKx6j46uNtb1U5MsV9vAFtoWKDYdY8GQEIov3HCkWVhrP3iLjp1hWmh6VWZi -x5fGwtfbRCngpzRRTRUDBMfYqk5sNQwPCY74phytAwY5aDVchlckjo+lKPfADoeU -DUHEPijSSycLFeE0gCuyRgnUTZvVtwC8saS8SAECQ2ojdm+9Z8Ipf68ysbG9Uioi -12vJCrOfNaVHMWYLczQeq1Ms6yrDTzBqSjgL4LDbuw2U0C1gxK5ZSZq+BVzwn0qb -iUIA9ioLtGYiUGURw5+iK7SavKf4NMgGfQzhMn02SbupGgdcIapgzseNAgMBAAGg -ADANBgkqhkiG9w0BAQsFAAOCAQEAZprfwdXYJkVVQSBNHXUi2ePxKiU24EjqC1Yq -a4Z9NxzUrCPtaR8hVfo75t2c4vJLJcKdIkB0eGDJwcIOC5I1JIsgzLzQeXDElcKW -xGFF3L+W4R4iCQ5XxnfE2dpKt9xuaamxKflflPjbZFpX1w0Sj+DP8YjcuoXSJT78 -fdR2iVpUBy2CHa06Hz1rEBynqTziRtpS3lDaWZsAKtb/oP5zfJGlhzShV5DY6YMx -G7M9854qMSsdjmCWolQ3Bz/Wg77V98Mg5jeF5iua1OUpsomgIq9mKPb+Du/rxWqS -4ElAOicSc4zSHaADc/nm5GN+k0wRihkaS9yD/VHahSulfErKLg== ------END CERTIFICATE REQUEST----- diff --git a/cni-plugin/tests/certs/admin.pem b/cni-plugin/tests/certs/admin.pem deleted file mode 100644 index c51fffe8804..00000000000 --- a/cni-plugin/tests/certs/admin.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUSjOSh8mcwPn/RPsFVnZ/Ve5uJQAwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMjAwMFoXDTIyMDkyOTIyMjAwMFowfDEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -FzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMSAwHgYDVQQLExdLdWJlcm5ldGVzIFRo -ZSBIYXJkIFdheTEOMAwGA1UEAxMFYWRtaW4wggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQDGAWnEpDPUyqoRRvoecHGlZ277cZlPK3s0LKx6j46uNtb1U5Ms -V9vAFtoWKDYdY8GQEIov3HCkWVhrP3iLjp1hWmh6VWZix5fGwtfbRCngpzRRTRUD -BMfYqk5sNQwPCY74phytAwY5aDVchlckjo+lKPfADoeUDUHEPijSSycLFeE0gCuy -RgnUTZvVtwC8saS8SAECQ2ojdm+9Z8Ipf68ysbG9Uioi12vJCrOfNaVHMWYLczQe -q1Ms6yrDTzBqSjgL4LDbuw2U0C1gxK5ZSZq+BVzwn0qbiUIA9ioLtGYiUGURw5+i -K7SavKf4NMgGfQzhMn02SbupGgdcIapgzseNAgMBAAGjfzB9MA4GA1UdDwEB/wQE -AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw -ADAdBgNVHQ4EFgQUmxH4EiI6noXA8tTH+dVq0vpMVFwwHwYDVR0jBBgwFoAUYjUx -lrW9gsYx7GSwowxQjcPbUxQwDQYJKoZIhvcNAQELBQADggEBAMWB9sEAF65Sc2p5 -LTDc04vd37wtEolHLz9LaKl/Y1ywXkJrI9v8TJK32KAsGVqNU+puaDdsjixzuLNa -Iwx5IllVKzgySxauhleSiEivniP7B9uHmiA/q2Lu0QgAD5s7JF03zgA9BZ/CQBa3 -Ii1O8jGH0iqw/QWLvRKoIQlLahIbu1Ekfx595AcxD53fdmDl9e7hcBzOaHFX9xu5 -n623mcylVPcRVYClu6cmipPPjc8t0yjdtj+0omFDC/5/6KicA4LwMAuTpgUKl6ea -HTQmw11l2/FYDbor8bE2XRjyfTmbX64mo8eRIcYL7CJWrtwkaIDZg6WngsWkHCnE -W14BZiQ= ------END CERTIFICATE----- diff --git a/cni-plugin/tests/certs/ca-config.json b/cni-plugin/tests/certs/ca-config.json deleted file mode 100644 index a63e0dd23e5..00000000000 --- a/cni-plugin/tests/certs/ca-config.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "expiry": "8760h" - }, - "profiles": { - "kubernetes": { - "usages": ["signing", "key encipherment", "server auth", "client auth"], - "expiry": "8760h" - } - } - } -} diff --git a/cni-plugin/tests/certs/ca-csr.json b/cni-plugin/tests/certs/ca-csr.json deleted file mode 100644 index 8145e5036c5..00000000000 --- a/cni-plugin/tests/certs/ca-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "Kubernetes", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "CA", - "ST": "Oregon" - } - ] -} diff --git a/cni-plugin/tests/certs/ca-key.pem b/cni-plugin/tests/certs/ca-key.pem deleted file mode 100644 index b9f3a63b2df..00000000000 --- a/cni-plugin/tests/certs/ca-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA5LlDBZ6hH9U5t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka -0Mmq98pDwdGC5hgsERXOUfOVnX3/TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSTh -xIuz1vRcb1tl0maKNs1AYDHbm2SVlxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFih -ztaFhPCCC6w6ZPYnqAQgMU0QHphWEZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9 -cWY2huRmwId7K516CYwBOm0PYZue3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+a -kDIByoJV8oMaagtoQ7BSaZ9bBy3GhBpjdz2jrwIDAQABAoIBAAk8CZ6yduLoIvpu -RLYHktvHFD/dD220S0jJDi/J0He4NgulUpXXbpWujunGYbiUhULzVG8unH3NVn9u -/a+dzCpC9ch8q+8tr8SdLeDAzKxHYUSErrDWyx4Eo67DS+sgxLfNtamsmac+emOt -L7Q273Ga94eea9THUIfU1b8IjOkZj2LUnVWW/0DTBFi5Vq/4HY4+x8ErWBzXFeAv -2xil5fRwBoLqSsapaUmsmxsNAIyiqcf6gtIZoNUSw3nTDBQiO6KC4aVuZ42pimrJ -CHplTvqXW+f9kohZZUwGa7BT8wSo40aasaLBAffmcgE68Hin+zSeRoDE0bVs868M -wP/jXJECgYEA9nZqVCFcqkuiXSuSfLYrfvjXftq2JnNNLkrB9Uq/gAgz8TVMT/qD -bIJ2seNXA3wzFsZERRjx2BgtocwjpweOyKNf3uOEQiZgh5e618ATr6uuNmF3u/fy -EXG3CBqK9Lh52NWEB4C0T7OD42ru6MN7aYRY30ZuvZaXPbC1T7o04fsCgYEA7ZMd -seQCxcM+jQDVGwQ9pMeF1WT+5Du4zOb4vsNEf3oDusnwztbfYCnbVET4vKfFKwAM -C/mYqBaEaASX47M3izUqw7AbmMlY4dWahzBoLHfHbE1gjadVtHqULEhJTKXZqfZz -w0ubbLqnk0MuorGMVP2BVKgwkZzV5R/6dDuMSt0CgYBP9Y79iG1V2n/slkxKJZfq -87SGNVLPGq05jYtrlzqVwROI9++wKugkdhcoE0eRm+O/ScewWy1rHD0BtwcCE5Oh -SE+8Mjggde7vTqyRfoFkhuBYSDreQszIGAp3mJToXEk7rdnNzVWyXd02FOU5ouIR -E5z5oxIedBLRMtk/6ntprQKBgQCJUvJlM0EPAy6S3ppQBYGET/hiQwC6+HJ3rkK2 -MbTUYrjpLXVOehGgSlGHQl7s3aUwl9Rez6WX83wRjCYn7h37D35qos8w36HK2Gd8 -IVT17z6MsaVP/BukOP6RIi+MaImKnvSHPJrYnIPksX6xeCN/tREe2CFK6fcRfAyP -RyRu2QKBgQDMGJ35UVhn62fqSFIzAARsGdnhg2PzmSza2abF69E1CiHBT/gOEpsK -dGmDSDHqcNl151roBeUYxZ8Vclr2rYuZEoIXuV50GUC9+jJEUsA1E0fR/73klfJT -3KzomlRJJx6F5dppYU8DztB8jgfNfhcdFVDQXNZyv8ZbC0+oEvs+2Q== ------END RSA PRIVATE KEY----- diff --git a/cni-plugin/tests/certs/ca.csr b/cni-plugin/tests/certs/ca.csr deleted file mode 100644 index 326059f79c6..00000000000 --- a/cni-plugin/tests/certs/ca.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICrTCCAZUCAQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNB -MRMwEQYDVQQDEwpLdWJlcm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEA5LlDBZ6hH9U5t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka0Mmq98pD -wdGC5hgsERXOUfOVnX3/TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSThxIuz1vRc -b1tl0maKNs1AYDHbm2SVlxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFihztaFhPCC -C6w6ZPYnqAQgMU0QHphWEZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9cWY2huRm -wId7K516CYwBOm0PYZue3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+akDIByoJV -8oMaagtoQ7BSaZ9bBy3GhBpjdz2jrwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEB -AKSs0yd6LXfAr5SOPycDXCAj/vszZaL1XedpFYiq9YXhyhx7SLpJ7QpRCrShMXcI -MgPXSmHfbf/Yc72HySRsbJ1j8XCVOnRsGheS17twJpI7Sekaphgq/zsNJH46GtIl -MfyPPFiB+zuVEkHhwUK8448KwfDsOTuXdVkDJAX/2o0VY1MK0OD1dy5or+6BUulj -mtXhw62vl75HX4rh9mEvveoUd/pPfJ0Hx4IpjHAz137zUX3Yb9xTo1Vw69d0qg73 -ofPPp3lcn0uD6YHmb+zNhPpsG7jruHJ/mKOunEo2G+5CGZkUMwujiwomEuQ7V/9v -iBWJ7sALM81UbGH5nQHq7/Q= ------END CERTIFICATE REQUEST----- diff --git a/cni-plugin/tests/certs/ca.pem b/cni-plugin/tests/certs/ca.pem deleted file mode 100644 index 1456904abbb..00000000000 --- a/cni-plugin/tests/certs/ca.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDoDCCAoigAwIBAgIUYJhXyAkmYfFbFc1aKKd4wfqk2jYwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMjAwMFoXDTI2MDkyODIyMjAwMFowaDEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -EzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQDEwpLdWJl -cm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5LlDBZ6hH9U5 -t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka0Mmq98pDwdGC5hgsERXOUfOVnX3/ -TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSThxIuz1vRcb1tl0maKNs1AYDHbm2SV -lxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFihztaFhPCCC6w6ZPYnqAQgMU0QHphW -EZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9cWY2huRmwId7K516CYwBOm0PYZue -3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+akDIByoJV8oMaagtoQ7BSaZ9bBy3G -hBpjdz2jrwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB -/zAdBgNVHQ4EFgQUYjUxlrW9gsYx7GSwowxQjcPbUxQwDQYJKoZIhvcNAQELBQAD -ggEBANBzL9fFJhyJNIoARNiGHSFaKGoqEJPCP793cMdSlWoTApfQk8qNHXVGeC9J -R9l3U+I7QiJLjy3rtoDHrXwyCusnaqvReUA+hGAVQm5PZu9OETFzzFu4dTZJd3E0 -M8vwt4yRdDtl5LVjYRo7yEjJyb7jssaV3bSz7VZnwHACT9hBxPu+3VAgFxrRBy9c -uqWzxlx+cBagHLTA7YurHG41AFFH1Z10vU2MisTLf5k6k4uMeEAgE/tUDB+gZNkT -0+hUjAhZR0uikDoeqSXDoh9NvLrpjt1raQzvksBVRNcuoGWQMjF3USkBJE5jQuLc -+Q7J/UKfb8YZIw69kidmDLq/5Gk= ------END CERTIFICATE----- diff --git a/cni-plugin/tests/certs/kube-controller-manager.kubeconfig b/cni-plugin/tests/certs/kube-controller-manager.kubeconfig deleted file mode 100644 index b06f1b69a84..00000000000 --- a/cni-plugin/tests/certs/kube-controller-manager.kubeconfig +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - insecure-skip-tls-verify: true - name: test-apiserver -contexts: -- context: - cluster: test-apiserver - user: system:kube-controller-manager - name: default -current-context: default -kind: Config -preferences: {} -users: -- name: system:kube-controller-manager - user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQ4VENDQXRtZ0F3SUJBZ0lVU2pPU2g4bWN3UG4vUlBzRlZuWi9WZTV1SlFBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2FERUxNQWtHQTFVRUJoTUNWVk14RHpBTkJnTlZCQWdUQms5eVpXZHZiakVSTUE4R0ExVUVCeE1JVUc5eQpkR3hoYm1ReEV6QVJCZ05WQkFvVENrdDFZbVZ5Ym1WMFpYTXhDekFKQmdOVkJBc1RBa05CTVJNd0VRWURWUVFECkV3cExkV0psY201bGRHVnpNQjRYRFRJeE1Ea3lPVEl5TWpBd01Gb1hEVEl5TURreU9USXlNakF3TUZvd2ZERUwKTUFrR0ExVUVCaE1DVlZNeER6QU5CZ05WQkFnVEJrOXlaV2R2YmpFUk1BOEdBMVVFQnhNSVVHOXlkR3hoYm1ReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1TQXdIZ1lEVlFRTEV4ZExkV0psY201bGRHVnpJRlJvClpTQklZWEprSUZkaGVURU9NQXdHQTFVRUF4TUZZV1J0YVc0d2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUIKRHdBd2dnRUtBb0lCQVFER0FXbkVwRFBVeXFvUlJ2b2VjSEdsWjI3N2NabFBLM3MwTEt4Nmo0NnVOdGIxVTVNcwpWOXZBRnRvV0tEWWRZOEdRRUlvdjNIQ2tXVmhyUDNpTGpwMWhXbWg2VldaaXg1Zkd3dGZiUkNuZ3B6UlJUUlVECkJNZllxazVzTlF3UENZNzRwaHl0QXdZNWFEVmNobGNram8rbEtQZkFEb2VVRFVIRVBpalNTeWNMRmVFMGdDdXkKUmduVVRadlZ0d0M4c2FTOFNBRUNRMm9qZG0rOVo4SXBmNjh5c2JHOVVpb2kxMnZKQ3JPZk5hVkhNV1lMY3pRZQpxMU1zNnlyRFR6QnFTamdMNExEYnV3MlUwQzFneEs1WlNacStCVnp3bjBxYmlVSUE5aW9MdEdZaVVHVVJ3NStpCks3U2F2S2Y0Tk1nR2ZRemhNbjAyU2J1cEdnZGNJYXBnenNlTkFnTUJBQUdqZnpCOU1BNEdBMVVkRHdFQi93UUUKQXdJRm9EQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0RBUVlJS3dZQkJRVUhBd0l3REFZRFZSMFRBUUgvQkFJdwpBREFkQmdOVkhRNEVGZ1FVbXhINEVpSTZub1hBOHRUSCtkVnEwdnBNVkZ3d0h3WURWUjBqQkJnd0ZvQVVZalV4CmxyVzlnc1l4N0dTd293eFFqY1BiVXhRd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNV0I5c0VBRjY1U2MycDUKTFREYzA0dmQzN3d0RW9sSEx6OUxhS2wvWTF5d1hrSnJJOXY4VEpLMzJLQXNHVnFOVStwdWFEZHNqaXh6dUxOYQpJd3g1SWxsVkt6Z3lTeGF1aGxlU2lFaXZuaVA3Qjl1SG1pQS9xMkx1MFFnQUQ1czdKRjAzemdBOUJaL0NRQmEzCklpMU84akdIMGlxdy9RV0x2UktvSVFsTGFoSWJ1MUVrZng1OTVBY3hENTNmZG1EbDllN2hjQnpPYUhGWDl4dTUKbjYyM21jeWxWUGNSVllDbHU2Y21pcFBQamM4dDB5amR0aiswb21GREMvNS82S2ljQTRMd01BdVRwZ1VLbDZlYQpIVFFtdzExbDIvRllEYm9yOGJFMlhSanlmVG1iWDY0bW84ZVJJY1lMN0NKV3J0d2thSURaZzZXbmdzV2tIQ25FClcxNEJaaVE9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBeGdGcHhLUXoxTXFxRVViNkhuQnhwV2R1KzNHWlR5dDdOQ3lzZW8rT3JqYlc5Vk9UCkxGZmJ3QmJhRmlnMkhXUEJrQkNLTDl4d3BGbFlhejk0aTQ2ZFlWcG9lbFZtWXNlWHhzTFgyMFFwNEtjMFVVMFYKQXdUSDJLcE9iRFVNRHdtTytLWWNyUU1HT1dnMVhJWlhKSTZQcFNqM3dBNkhsQTFCeEQ0bzBrc25DeFhoTklBcgpza1lKMUUyYjFiY0F2TEdrdkVnQkFrTnFJM1p2dldmQ0tYK3ZNckd4dlZJcUl0ZHJ5UXF6bnpXbFJ6Rm1DM00wCkhxdFRMT3NxdzA4d2FrbzRDK0N3MjdzTmxOQXRZTVN1V1VtYXZnVmM4SjlLbTRsQ0FQWXFDN1JtSWxCbEVjT2YKb2l1MG1yeW4rRFRJQm4wTTRUSjlOa203cVJvSFhDR3FZTTdIalFJREFRQUJBb0lCQUFZSzVQOXJRMm1yQmFXaApWT0M0N2I3dWVTU1RRdXAzbVRydVloVWJiRzlFblNxL2NpNVlRQXlNcGZzbkh2K21tN0daejUzR1RHbTNrRXMxCmxLZ3RvZi9ta21tcFVZYVNNTCtRRXFaT1hqak00WHZacmxwNU91QVIwbkxhNjVOSjUyTVBMckRZOXNlcHRuY3MKWWx4clBWYjgrUktUWHUvVnQ3d1ZhWW1CWVorazdZR084RDN1b2hSZnd4ZHl5R2Q0NDFBY0ZISDhvb3NjYlZCNQp4dGRGd3IrTzR2OEpUMGdvQ3lFOVhxajJXK2g3SDdrbUhOcU41UVQ1QnNEYXNUVnJXa3F0Q042RCs5QmN4OTJsClp0cGpUa3g1SW9CekQ0QUx6QWRzNWxIREEvWEhjSWhjOEhGU3Y2NFdEYmNQeHJDbDVWTzhwUDFKb3BvNVBZcjIKTGJzWFZBRUNnWUVBei9wbWlaRWpEWmUvd2t5eC95Wm9Qc1YyVmFVZitscXMzSlZwT2l1U0pVVVErb0hydjYyTApqL0hzb0tGUDZ5WHlZQ2pqdDBmb3FQWlVTZW9ObnpoTTFaTTlpUkFOb21va0F3THFja3d2ZEdyNHA5U0RLdE41CnhiTXp2MVhhalhGVG51Y0s2b25CYWo3QlhBdmNjR3JzT29zY3pUNFAyb0ZYRVpuRUlUOFpRbDBDZ1lFQTg3bUgKL3JDa0FmN2czTFZTMlZ6Ry9tbVZzY0ZhSnh6akh0RVNFeDhoZ1E0dnY3Q2I0UTMxYkE5Zm4zNUhhRnU4OHVmMQpIb3VvR0hBdStqVTdLTHVsVzQ0NlFQRHh1bnQrRG1oeE5lOGhPdFVyandUZXNNcTE0RDVIMDFSbWJSSFZEZDlFCjVHdjVoYVQ1eVRoeE5MekZUZ2dDSTI4dnAxRkE4U0FZMXNzTHB2RUNnWUJHVjdUU2xvbzZrTGJFNnRmUktwWmIKbE1IZldjZ2xEd0lrWVV5RDVqUzU4bEE1eWpPSVV4US9EVjR4UGg0ZnRHZno2aUNLM3dGc0ZGU1I0MTNVR21DeQpZK2lPTVNYTFp3YmpGZHRoNlM2cnUzcDZtVC83L2liVG5UYkZZaTVYWkpzWnhaOUZrRzRnbHpVakFzZitKY3ZjClNTem1walVLZkhDTWZXdCtxeTdKNlFLQmdBdmxqNFRZSEhsWWRxTnZXbWJ2eDJyZHZvZlp0MHZYZGlLbjgranAKQ1JxaWxhUVd1OVVsZUVoWkM4TGVTQ0FJOGxVdEMyTDlVQ3c1TmFIUy9WdEVwWkt0ZzV4dDVtN0MzbWxYb2NjUApNQ0VPREwxRGNKZFNuY1FmWmlRanA0aEZhWS91eVE4WlVpbTYzdEo2cGRQOEx1bGJMTGVNRXRobzkvR05Mb2sxCmloRVJBb0dCQUpHNkhLV3JlczlNOTViYjBzb2g3by9xd1YvSVZnTTZBSXlQYzMxb2tmc3ltOGJJWldxQzNjWFMKbDZGODdjTFQvS1QyWWNLYVFSYVpRMEhsOThNTG0va2lTeXhVTXNxcktCR21MZVZSOWJyS1c3RWUvb0c2QWJlKwpPRE1oQmNhSlZERGRGNW5JTnNzT0p0UUx4Z25TalFZQXdhTTF4TGcveDJVbXdLUVNyR0hSCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== diff --git a/cni-plugin/tests/certs/kubeconfig b/cni-plugin/tests/certs/kubeconfig deleted file mode 100644 index b9a24ba8a10..00000000000 --- a/cni-plugin/tests/certs/kubeconfig +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - insecure-skip-tls-verify: true - server: https://127.0.0.1:6443 - name: test-apiserver -contexts: -- context: - cluster: test-apiserver - user: admin - name: admin -current-context: admin -kind: Config -users: -- name: admin - user: - client-certificate: /home/user/certs/admin.pem - client-key: /home/user/certs/admin-key.pem diff --git a/cni-plugin/tests/certs/kubernetes-csr.json b/cni-plugin/tests/certs/kubernetes-csr.json deleted file mode 100644 index 778db6322c2..00000000000 --- a/cni-plugin/tests/certs/kubernetes-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "kubernetes", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/cni-plugin/tests/certs/kubernetes-key.pem b/cni-plugin/tests/certs/kubernetes-key.pem deleted file mode 100644 index 98b8676abcc..00000000000 --- a/cni-plugin/tests/certs/kubernetes-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpgIBAAKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeIQcuiW8CV2JwNk4KI80kO -n76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLjarXppB0uPduIERTNc4Xv3 -/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6u+B1LqIlktMTOD+93UFi -lsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D40KYRo/7WGQDz9YLWNKqh -vGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2NlwupzpqoXwxd9e1IEMhzmGRHcC -+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQABAoIBAQC6uU4whPi09vRO -htTooxZshPRRamEMafjYJQmbbnsqp016AQjUaIz2nNWd2536AAlKOc/FTFx3xaEX -QX5xZZ2S7IYGLkdTAkFhsQYI49FxAA5CBz02nAsccjsDQ/AoyXXSEJzBKAk8XBiG -ZeiA/StY+cVvK4D0G7FFSsUnZlzz9uMrMHyQKKrRR8KkU+QnAjZnxqPkckc10K1H -1ZNumS3Jx4hRVSi5KXjCjNbqf79nBWJ96iSczev97CT+WZ1GnAPQtuWwHD2rjZmy -0DKsLnRujD8u+lJjBEhbSrdLYMDNJsO1SAtpYN9W94+8f9ZQDxNBRJ1C4f5XTLii -ymnkPD9xAoGBAPsMOPeNRgS7Z2Bwgs4gr4x53AJrYc0nIanm01d89aVWA5c+V4NJ -6+KtLjZepRcjKV6MGt+y3MR/52lUj3cgeYwVERwkIyvIVyDuSaqcc7RYlPDwAsuN -h3G/Wg8blQxDmvbRZDLTwjOsfvCG7s8VQEeJHoyJYT81F/oD/d1z4oXtAoGBAPeQ -bDJa0x7ciZcf97SY0DnnIfT1kiDIk5q1UEi4DNtVFQX/BQxsvkwyhdttVLuFe8gw -2hkiG6QavSHhxtgwGtnGMVZgDpSdrk7zLVIVERCN2EB5Lo1+a/JYkVhYedmTGqu1 -HnM2rrFPjPD04EriNKewJAx/dC8q2dBS9/N/T8xvAoGBAOX4vVqwdJqzHbDvgDPZ -J1cU7mDdA3uORD1CsQls9A3gLGvo9PvUxJwirrmpm6wFTslIqPmQ/MGYtWD80Gt9 -OTsEtWbFB978qCwHfT4oEan8l3vbMYRMAu5FLve1+aSBbbx59kLFTxpNAv/Na4gR -3I9rYau10Xq4ZV1nOLAbjz/FAoGBAIxrgcNqGvgVVYG/4yuvxeQiAvPD2tf3jSmi -kGA+7SP3dY5KIV3zzFjCC4Tz1azrwNNDSmIZI56IgCDYxIXZe1FtBo0cvQh1C+rC -KkG1q1E9c5zWX55oR+hVblOzE6Jiuy0L9bKaIKp4GdSOwS4Yco9u7HOeU5Nxdcyh -UvztiKDHAoGBAO4i6SArmLYc/e2m/npAW/jTts3Q7pNlywAlVFo8ZDdYADY+1wtO -5GL1VqoWPND8LMPVLJzfnyMeeo+g1xjezY/QciS3NSR9kgM9quqi1jl+fgLwQVbf -Snx348RF4B8r8vtfH5q1pS9NM4G3zQWYhlJv8TVgGON8yJNfoh80N1Qy ------END RSA PRIVATE KEY----- diff --git a/cni-plugin/tests/certs/kubernetes.csr b/cni-plugin/tests/certs/kubernetes.csr deleted file mode 100644 index 9b32900a447..00000000000 --- a/cni-plugin/tests/certs/kubernetes.csr +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIDXzCCAkcCAQAwfTELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxIDAeBgNVBAsTF0t1 -YmVybmV0ZXMgVGhlIEhhcmQgV2F5MRMwEQYDVQQDEwprdWJlcm5ldGVzMIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeI -QcuiW8CV2JwNk4KI80kOn76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLja -rXppB0uPduIERTNc4Xv3/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6 -u+B1LqIlktMTOD+93UFilsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D4 -0KYRo/7WGQDz9YLWNKqhvGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2Nlwupzp -qoXwxd9e1IEMhzmGRHcC+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQAB -oIGcMIGZBgkqhkiG9w0BCQ4xgYswgYgwgYUGA1UdEQR+MHyCCmt1YmVybmV0ZXOC -Emt1YmVybmV0ZXMuZGVmYXVsdIIWa3ViZXJuZXRlcy5kZWZhdWx0LnN2Y4Iea3Vi -ZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyghxrdWJlcm5ldGVzLnN2Yy5jbHVz -dGVyLmxvY2FshwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQARwbt/QbJlGgdV5v9K -40JvhD4GPqQDdU15gZlht7/Cz1YPlIjqZy0TUaEwVYNFw8W8UW2LYhCXzBsTsHw3 -pfQw6DRjvPcceCn/UH3S2F9FjLZ9rrvu79TX7uUBAl5PDkN8MuciijlFDoHN2hX5 -1ApEWZi1V6G2akzocbywkh5bpf+WBZszWsvoC6nYB4ghK85Z0yqIAwbCKORXwSNn -DtQ9VmMtg/vyWj6gg9K/bYh0Bh3l4FONsqO4VbX7+meiEy8Ony7f04m05IkJDcO8 -mKF3OTuUMkBMEMVkZKXJJ9iI+TIrtQ6xbPc3Ctm199OXK4i65WMaO9llQ9q9iByX -py8d ------END CERTIFICATE REQUEST----- diff --git a/cni-plugin/tests/certs/kubernetes.pem b/cni-plugin/tests/certs/kubernetes.pem deleted file mode 100644 index 96505e7f255..00000000000 --- a/cni-plugin/tests/certs/kubernetes.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEfjCCA2agAwIBAgIUepjO3FMlyIcWiO0N4/GJgV6Uj/QwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMzEwMFoXDTIyMDkyOTIyMzEwMFowfTEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -EzARBgNVBAoTCkt1YmVybmV0ZXMxIDAeBgNVBAsTF0t1YmVybmV0ZXMgVGhlIEhh -cmQgV2F5MRMwEQYDVQQDEwprdWJlcm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeIQcuiW8CV2JwNk4KI80kO -n76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLjarXppB0uPduIERTNc4Xv3 -/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6u+B1LqIlktMTOD+93UFi -lsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D40KYRo/7WGQDz9YLWNKqh -vGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2NlwupzpqoXwxd9e1IEMhzmGRHcC -+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQABo4IBCTCCAQUwDgYDVR0P -AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB -Af8EAjAAMB0GA1UdDgQWBBQNhPCXoXrtgP0M8NPQipbRggdk9DAfBgNVHSMEGDAW -gBRiNTGWtb2CxjHsZLCjDFCNw9tTFDCBhQYDVR0RBH4wfIIKa3ViZXJuZXRlc4IS -a3ViZXJuZXRlcy5kZWZhdWx0ghZrdWJlcm5ldGVzLmRlZmF1bHQuc3Zjgh5rdWJl -cm5ldGVzLmRlZmF1bHQuc3ZjLmNsdXN0ZXKCHGt1YmVybmV0ZXMuc3ZjLmNsdXN0 -ZXIubG9jYWyHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBALKCw/I9j3e5Q2NUGaSg -cUnVuzTwgJ46oTxoOm1mN6whPHe2ACPHWBKsCFhCtgMDEUy4hObrmzlEbzXhHeMr -Ri7+a0DnheYk8QDcR5nk0oxdG8XbFf6dBJdHLRMfTmYKPhFj1nM8Eh2xKZszdkIG -FWGL7Php/F3+HzwQj4rbZYDQMITiRR3ib+HU9m3aBu4VTLdAL/I4EizOXUc7LxDz -dyliu7xVzGweoYI5BE1PzaN0ClhOpvV4y9g2vUxuuqdWSo70pld712+hZ8qwAJgp -F+vvtmEfroJGckI6llbvhXmmV8Qek9ekpol2QeZDHgCX6wHw+sGVfT3oPMzI82jq -WcM= ------END CERTIFICATE----- diff --git a/cni-plugin/tests/certs/service-account-csr.json b/cni-plugin/tests/certs/service-account-csr.json deleted file mode 100644 index be3c0ca4b6a..00000000000 --- a/cni-plugin/tests/certs/service-account-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "service-accounts", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/cni-plugin/tests/certs/service-account-key.pem b/cni-plugin/tests/certs/service-account-key.pem deleted file mode 100644 index 8213a751f69..00000000000 --- a/cni-plugin/tests/certs/service-account-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEA7F9N9m7yq96IetGBTJK4CIG1SB11NdeGXCZD943BHXTYdUvv -WTEkbwoWhMonyicghHmDzmJTf376Bk49yClC7tBx/5TQX4J95Y2mX3EThAdPyVvh -sjYJoYGY8nd7WvXlo33yEdTCnQUqSEZ8HXgu/iWB29Yu/4Rh2ZnxLnGQbLE4dJ5f -iu64sZtExeN/BF84DOaujqiv38jkL8ah9zxDutDMk2qTMneRi8e5ArukIM/GVKBx -mJMdafeL/emObBuaAIGJCM6yPUNB8Ry8RhugiRjyrDsDMKggMQOQkWr3QO9n7Twx -nIn6BoCxd2ea6VUi7Ib/ELgC8Ie2DNWIpzRUDwIDAQABAoIBAQDAGZx04Spbv9lP -Z6EbqEnkr/WyjC5L+cL6dSbbs9r0o5efjH0TEbs4ewxeEyVPR4lH4LHcM1EE1x8/ -rKrNV6tMBx/+xOSsGpNS0lIaUv23WXHghcnhWcVt+rNgqvYXsKxWuO7Yyv73OdFp -N89668fVSIpHLcS4aNBVVqUKR8VGbxkpPADTA8mJoJ3jwS/5GQMyd3L6kd3FvvTI -YeWOCXLY6QHNZ1OrnntNZt0J8ikZW/ntmB1tNrY/rblaTBtxGihmbHWgCWSEEZfZ -iWOgcljTCgug6bxALIGJF0mTheHkiY7RXjrmx1QMeq3yS07wPl3hlDCcCYKPTEvq -i193bV3hAoGBAPxGZet1YrIfilLJ70v+QrpywQaIey8WkfOUO8Adv3PmwFA33NrZ -PkEQjYsQm/IWkSfs9IZbIEXeOkZl5ozCdT4vj6xXT4FsnL79H39sSoqlhKVq5flW -UnZhAPUWq/U2B1RyC1HSwtZEHiK977nrxpNXRoNX2yiVj7hnmALql/hnAoGBAO/c -y0U0/NlfrMMq9KIZXHGM1IbIZFBeLnpfZD+apLrSkzoQvaxqF/3l2i7xD4WI6HZP -0mTuswyAT04wBb9WeMH1qWjk/O8OWtbqfFo/bL2KSALMjHN1zLrFhMMg7Rq8a5LP -BQTep+nEEFFGQI0LJKfJ1+7VwiVDs5Ryq6WyFx4ZAoGAGL9bLi70wJ6Bdj+i/uRx -bVLmhpqK4wKmzKtE9UK1zkvbn8LrInjfN4jFKdg2RBhcovsGvctgrhnvw4ophLNq -xu/pezGRdhPOiJnSJjDcWx+DlKqY5s3GByDa9DAGLGbhbzJE1AEF5fkGr8fMJYPw -lfGg1C+hKykI0UEwU1DqGY8CgYEA5qdufM2Ye7uqGT98YUh8AeFIGZgoBrSagyip -8RPXZqPJ2eNxUZPwIEJgzhUXNPTTfboCevajDNlx6aD6VeVkWDfQwcK5i3RFXDe+ -ftZQze9kkfR69yiHR+9aXH2UI8qes10J2YX2+C+G9XDV8AuQIx1Q3SWG/WieDpk6 -gCrCWjkCgYEAmX5u+Ka4Rx0cZcci/lDrjRWlhugH87rg+ZYQyCT8Pxq5Is3DUqQQ -9bArNFagKllb1DHjZjY5Lhts3S4Yn8exFpn2Qhg5j8SH8v03SQjAeKDFtsEnGPuQ -cygzKjNNTOh2NImfrrV41Fsid6qkCzzmBZ5WKjy0RXtAVTMBtlEfOM8= ------END RSA PRIVATE KEY----- diff --git a/cni-plugin/tests/certs/service-account.csr b/cni-plugin/tests/certs/service-account.csr deleted file mode 100644 index 5b7c710e31a..00000000000 --- a/cni-plugin/tests/certs/service-account.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICyTCCAbECAQAwgYMxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAP -BgNVBAcTCFBvcnRsYW5kMRMwEQYDVQQKEwpLdWJlcm5ldGVzMSAwHgYDVQQLExdL -dWJlcm5ldGVzIFRoZSBIYXJkIFdheTEZMBcGA1UEAxMQc2VydmljZS1hY2NvdW50 -czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOxfTfZu8qveiHrRgUyS -uAiBtUgddTXXhlwmQ/eNwR102HVL71kxJG8KFoTKJ8onIIR5g85iU39++gZOPcgp -Qu7Qcf+U0F+CfeWNpl9xE4QHT8lb4bI2CaGBmPJ3e1r15aN98hHUwp0FKkhGfB14 -Lv4lgdvWLv+EYdmZ8S5xkGyxOHSeX4ruuLGbRMXjfwRfOAzmro6or9/I5C/Gofc8 -Q7rQzJNqkzJ3kYvHuQK7pCDPxlSgcZiTHWn3i/3pjmwbmgCBiQjOsj1DQfEcvEYb -oIkY8qw7AzCoIDEDkJFq90DvZ+08MZyJ+gaAsXdnmulVIuyG/xC4AvCHtgzViKc0 -VA8CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQDS6T5JkfHATn6+47v4znVVvKfW -YiUbC0fRi7kMtnJMdhp8Oe8p2XXDmzBwaFVYneBhwSddKJG41snmYE8yv746guYh -ndnh/ZtXtP39E6q+dknMGfJ/LZyB6fPM3m7X2VMtww5uFfeXZyY4aE4GOIqRSkGO -KHP+0h6+MqE9AFYtjOuIpCSfmZ5XLf2PfxY9LxePMmhKCUV1qmf6ZftJ+LP/97H3 -RP7k+7zK8q+xq8ETE2Ub2Ux8s36EVykVzh06kElhsHK7nqkafyJE/8lkiaExTKvd -Kk5ii3CnQi6/RaZQ8TeNzjqcUMDfxigeh6JkC60xrhQThR10oUajxxd1Sg/N ------END CERTIFICATE REQUEST----- diff --git a/cni-plugin/tests/certs/service-account.pem b/cni-plugin/tests/certs/service-account.pem deleted file mode 100644 index 5abe649c2b8..00000000000 --- a/cni-plugin/tests/certs/service-account.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID+TCCAuGgAwIBAgIUHOMlm843n+Z1yg1UdqdWicQppzswDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMzYwMFoXDTIyMDkyOTIyMzYwMFowgYMx -CzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRsYW5k -MRMwEQYDVQQKEwpLdWJlcm5ldGVzMSAwHgYDVQQLExdLdWJlcm5ldGVzIFRoZSBI -YXJkIFdheTEZMBcGA1UEAxMQc2VydmljZS1hY2NvdW50czCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAOxfTfZu8qveiHrRgUySuAiBtUgddTXXhlwmQ/eN -wR102HVL71kxJG8KFoTKJ8onIIR5g85iU39++gZOPcgpQu7Qcf+U0F+CfeWNpl9x -E4QHT8lb4bI2CaGBmPJ3e1r15aN98hHUwp0FKkhGfB14Lv4lgdvWLv+EYdmZ8S5x -kGyxOHSeX4ruuLGbRMXjfwRfOAzmro6or9/I5C/Gofc8Q7rQzJNqkzJ3kYvHuQK7 -pCDPxlSgcZiTHWn3i/3pjmwbmgCBiQjOsj1DQfEcvEYboIkY8qw7AzCoIDEDkJFq -90DvZ+08MZyJ+gaAsXdnmulVIuyG/xC4AvCHtgzViKc0VA8CAwEAAaN/MH0wDgYD -VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV -HRMBAf8EAjAAMB0GA1UdDgQWBBR9pAvzY/VK7MAcOUPSk9iZ3FkwzjAfBgNVHSME -GDAWgBRiNTGWtb2CxjHsZLCjDFCNw9tTFDANBgkqhkiG9w0BAQsFAAOCAQEAd40A -HoVSjcjctv4Xg3H/E80AKAV41hwLZtXTI6ed/ERdgQQMotbW9pgXQix1qzvT6z9e -x+gIdpKE8h89u9wS+bYkthIKJRYRLc7ZJ9Aq+izlfLO/GjxfgBgbOBLMpNKNpmdf -NlOEfoKkLriE31f1oW9Xx3SYdqdaFQJDaDaRg5guQw0YT7PBIlHemmoYGujKNc8+ -iMWYa9aeGMM8yrpH5GRwUI7BAk0+fX4DhyokOuH3mpHXWWkKdVoIfpt3q+jznKYe -l7VaABvoHr3fx9oGhusuwDgLFssraMeIJigHi5ajOTWYw7u6yN2cjh+Ng7TZ+hf/ -+nhPbMGFM/GDpGVXmg== ------END CERTIFICATE----- diff --git a/felix/Makefile b/felix/Makefile index 023814b59e7..20653de3fd6 100644 --- a/felix/Makefile +++ b/felix/Makefile @@ -309,6 +309,7 @@ fv fv/latency.log fv/data-races.log: $(REMOTE_DEPS) image bin/iptables-locker bi FV_NUM_BATCHES=$(FV_NUM_BATCHES) \ FV_BATCHES_TO_RUN="$(FV_BATCHES_TO_RUN)" \ FV_FELIX_LOG_LEVEL="$(FV_FELIX_LOG_LEVEL)" \ + CERTS_PATH=$(CERTS_PATH) \ PRIVATE_KEY=`pwd`/private.key \ GINKGO_ARGS='$(GINKGO_ARGS)' \ GINKGO_FOCUS="$(GINKGO_FOCUS)" \ @@ -368,6 +369,7 @@ k8sfv-test-existing-felix: $(REMOTE_DEPS) bin/k8sfv.test FV_TYPHAIMAGE=$(FV_TYPHAIMAGE) \ FV_FELIXIMAGE=$(FV_FELIXIMAGE) \ FV_K8SIMAGE=$(FV_K8SIMAGE) \ + CERTS_PATH=$(CERTS_PATH) \ PRIVATE_KEY=`pwd`/fv/private.key \ k8sfv/run-test diff --git a/felix/fv/certs/README.md b/felix/fv/certs/README.md deleted file mode 100644 index 7ce867a88e1..00000000000 --- a/felix/fv/certs/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# FV certificates - -The files in this directory are used only in the FV tests in this repository, and were generated according to the steps in [Kubernetes the hard -way](https://github.com/kelseyhightower/kubernetes-the-hard-way). diff --git a/felix/fv/certs/admin-csr.json b/felix/fv/certs/admin-csr.json deleted file mode 100644 index 960ce1d9a8c..00000000000 --- a/felix/fv/certs/admin-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "admin", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "system:masters", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/felix/fv/certs/admin-key.pem b/felix/fv/certs/admin-key.pem deleted file mode 100644 index c29c9f95ef7..00000000000 --- a/felix/fv/certs/admin-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAxgFpxKQz1MqqEUb6HnBxpWdu+3GZTyt7NCyseo+OrjbW9VOT -LFfbwBbaFig2HWPBkBCKL9xwpFlYaz94i46dYVpoelVmYseXxsLX20Qp4Kc0UU0V -AwTH2KpObDUMDwmO+KYcrQMGOWg1XIZXJI6PpSj3wA6HlA1BxD4o0ksnCxXhNIAr -skYJ1E2b1bcAvLGkvEgBAkNqI3ZvvWfCKX+vMrGxvVIqItdryQqznzWlRzFmC3M0 -HqtTLOsqw08wako4C+Cw27sNlNAtYMSuWUmavgVc8J9Km4lCAPYqC7RmIlBlEcOf -oiu0mryn+DTIBn0M4TJ9Nkm7qRoHXCGqYM7HjQIDAQABAoIBAAYK5P9rQ2mrBaWh -VOC47b7ueSSTQup3mTruYhUbbG9EnSq/ci5YQAyMpfsnHv+mm7GZz53GTGm3kEs1 -lKgtof/mkmmpUYaSML+QEqZOXjjM4XvZrlp5OuAR0nLa65NJ52MPLrDY9septncs -YlxrPVb8+RKTXu/Vt7wVaYmBYZ+k7YGO8D3uohRfwxdyyGd441AcFHH8ooscbVB5 -xtdFwr+O4v8JT0goCyE9Xqj2W+h7H7kmHNqN5QT5BsDasTVrWkqtCN6D+9Bcx92l -ZtpjTkx5IoBzD4ALzAds5lHDA/XHcIhc8HFSv64WDbcPxrCl5VO8pP1Jopo5PYr2 -LbsXVAECgYEAz/pmiZEjDZe/wkyx/yZoPsV2VaUf+lqs3JVpOiuSJUUQ+oHrv62L -j/HsoKFP6yXyYCjjt0foqPZUSeoNnzhM1ZM9iRANomokAwLqckwvdGr4p9SDKtN5 -xbMzv1XajXFTnucK6onBaj7BXAvccGrsOosczT4P2oFXEZnEIT8ZQl0CgYEA87mH -/rCkAf7g3LVS2VzG/mmVscFaJxzjHtESEx8hgQ4vv7Cb4Q31bA9fn35HaFu88uf1 -HouoGHAu+jU7KLulW446QPDxunt+DmhxNe8hOtUrjwTesMq14D5H01RmbRHVDd9E -5Gv5haT5yThxNLzFTggCI28vp1FA8SAY1ssLpvECgYBGV7TSloo6kLbE6tfRKpZb -lMHfWcglDwIkYUyD5jS58lA5yjOIUxQ/DV4xPh4ftGfz6iCK3wFsFFSR413UGmCy -Y+iOMSXLZwbjFdth6S6ru3p6mT/7/ibTnTbFYi5XZJsZxZ9FkG4glzUjAsf+Jcvc -SSzmpjUKfHCMfWt+qy7J6QKBgAvlj4TYHHlYdqNvWmbvx2rdvofZt0vXdiKn8+jp -CRqilaQWu9UleEhZC8LeSCAI8lUtC2L9UCw5NaHS/VtEpZKtg5xt5m7C3mlXoccP -MCEODL1DcJdSncQfZiQjp4hFaY/uyQ8ZUim63tJ6pdP8LulbLLeMEtho9/GNLok1 -ihERAoGBAJG6HKWres9M95bb0soh7o/qwV/IVgM6AIyPc31okfsym8bIZWqC3cXS -l6F87cLT/KT2YcKaQRaZQ0Hl98MLm/kiSyxUMsqrKBGmLeVR9brKW7Ee/oG6Abe+ -ODMhBcaJVDDdF5nINssOJtQLxgnSjQYAwaM1xLg/x2UmwKQSrGHR ------END RSA PRIVATE KEY----- diff --git a/felix/fv/certs/admin.csr b/felix/fv/certs/admin.csr deleted file mode 100644 index f8326afd804..00000000000 --- a/felix/fv/certs/admin.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICwTCCAakCAQAwfDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMSAwHgYDVQQL -ExdLdWJlcm5ldGVzIFRoZSBIYXJkIFdheTEOMAwGA1UEAxMFYWRtaW4wggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGAWnEpDPUyqoRRvoecHGlZ277cZlP -K3s0LKx6j46uNtb1U5MsV9vAFtoWKDYdY8GQEIov3HCkWVhrP3iLjp1hWmh6VWZi -x5fGwtfbRCngpzRRTRUDBMfYqk5sNQwPCY74phytAwY5aDVchlckjo+lKPfADoeU -DUHEPijSSycLFeE0gCuyRgnUTZvVtwC8saS8SAECQ2ojdm+9Z8Ipf68ysbG9Uioi -12vJCrOfNaVHMWYLczQeq1Ms6yrDTzBqSjgL4LDbuw2U0C1gxK5ZSZq+BVzwn0qb -iUIA9ioLtGYiUGURw5+iK7SavKf4NMgGfQzhMn02SbupGgdcIapgzseNAgMBAAGg -ADANBgkqhkiG9w0BAQsFAAOCAQEAZprfwdXYJkVVQSBNHXUi2ePxKiU24EjqC1Yq -a4Z9NxzUrCPtaR8hVfo75t2c4vJLJcKdIkB0eGDJwcIOC5I1JIsgzLzQeXDElcKW -xGFF3L+W4R4iCQ5XxnfE2dpKt9xuaamxKflflPjbZFpX1w0Sj+DP8YjcuoXSJT78 -fdR2iVpUBy2CHa06Hz1rEBynqTziRtpS3lDaWZsAKtb/oP5zfJGlhzShV5DY6YMx -G7M9854qMSsdjmCWolQ3Bz/Wg77V98Mg5jeF5iua1OUpsomgIq9mKPb+Du/rxWqS -4ElAOicSc4zSHaADc/nm5GN+k0wRihkaS9yD/VHahSulfErKLg== ------END CERTIFICATE REQUEST----- diff --git a/felix/fv/certs/admin.pem b/felix/fv/certs/admin.pem deleted file mode 100644 index c51fffe8804..00000000000 --- a/felix/fv/certs/admin.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUSjOSh8mcwPn/RPsFVnZ/Ve5uJQAwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMjAwMFoXDTIyMDkyOTIyMjAwMFowfDEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -FzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMSAwHgYDVQQLExdLdWJlcm5ldGVzIFRo -ZSBIYXJkIFdheTEOMAwGA1UEAxMFYWRtaW4wggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQDGAWnEpDPUyqoRRvoecHGlZ277cZlPK3s0LKx6j46uNtb1U5Ms -V9vAFtoWKDYdY8GQEIov3HCkWVhrP3iLjp1hWmh6VWZix5fGwtfbRCngpzRRTRUD -BMfYqk5sNQwPCY74phytAwY5aDVchlckjo+lKPfADoeUDUHEPijSSycLFeE0gCuy -RgnUTZvVtwC8saS8SAECQ2ojdm+9Z8Ipf68ysbG9Uioi12vJCrOfNaVHMWYLczQe -q1Ms6yrDTzBqSjgL4LDbuw2U0C1gxK5ZSZq+BVzwn0qbiUIA9ioLtGYiUGURw5+i -K7SavKf4NMgGfQzhMn02SbupGgdcIapgzseNAgMBAAGjfzB9MA4GA1UdDwEB/wQE -AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw -ADAdBgNVHQ4EFgQUmxH4EiI6noXA8tTH+dVq0vpMVFwwHwYDVR0jBBgwFoAUYjUx -lrW9gsYx7GSwowxQjcPbUxQwDQYJKoZIhvcNAQELBQADggEBAMWB9sEAF65Sc2p5 -LTDc04vd37wtEolHLz9LaKl/Y1ywXkJrI9v8TJK32KAsGVqNU+puaDdsjixzuLNa -Iwx5IllVKzgySxauhleSiEivniP7B9uHmiA/q2Lu0QgAD5s7JF03zgA9BZ/CQBa3 -Ii1O8jGH0iqw/QWLvRKoIQlLahIbu1Ekfx595AcxD53fdmDl9e7hcBzOaHFX9xu5 -n623mcylVPcRVYClu6cmipPPjc8t0yjdtj+0omFDC/5/6KicA4LwMAuTpgUKl6ea -HTQmw11l2/FYDbor8bE2XRjyfTmbX64mo8eRIcYL7CJWrtwkaIDZg6WngsWkHCnE -W14BZiQ= ------END CERTIFICATE----- diff --git a/felix/fv/certs/ca-config.json b/felix/fv/certs/ca-config.json deleted file mode 100644 index a63e0dd23e5..00000000000 --- a/felix/fv/certs/ca-config.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "expiry": "8760h" - }, - "profiles": { - "kubernetes": { - "usages": ["signing", "key encipherment", "server auth", "client auth"], - "expiry": "8760h" - } - } - } -} diff --git a/felix/fv/certs/ca-csr.json b/felix/fv/certs/ca-csr.json deleted file mode 100644 index 8145e5036c5..00000000000 --- a/felix/fv/certs/ca-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "Kubernetes", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "CA", - "ST": "Oregon" - } - ] -} diff --git a/felix/fv/certs/ca-key.pem b/felix/fv/certs/ca-key.pem deleted file mode 100644 index b9f3a63b2df..00000000000 --- a/felix/fv/certs/ca-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA5LlDBZ6hH9U5t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka -0Mmq98pDwdGC5hgsERXOUfOVnX3/TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSTh -xIuz1vRcb1tl0maKNs1AYDHbm2SVlxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFih -ztaFhPCCC6w6ZPYnqAQgMU0QHphWEZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9 -cWY2huRmwId7K516CYwBOm0PYZue3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+a -kDIByoJV8oMaagtoQ7BSaZ9bBy3GhBpjdz2jrwIDAQABAoIBAAk8CZ6yduLoIvpu -RLYHktvHFD/dD220S0jJDi/J0He4NgulUpXXbpWujunGYbiUhULzVG8unH3NVn9u -/a+dzCpC9ch8q+8tr8SdLeDAzKxHYUSErrDWyx4Eo67DS+sgxLfNtamsmac+emOt -L7Q273Ga94eea9THUIfU1b8IjOkZj2LUnVWW/0DTBFi5Vq/4HY4+x8ErWBzXFeAv -2xil5fRwBoLqSsapaUmsmxsNAIyiqcf6gtIZoNUSw3nTDBQiO6KC4aVuZ42pimrJ -CHplTvqXW+f9kohZZUwGa7BT8wSo40aasaLBAffmcgE68Hin+zSeRoDE0bVs868M -wP/jXJECgYEA9nZqVCFcqkuiXSuSfLYrfvjXftq2JnNNLkrB9Uq/gAgz8TVMT/qD -bIJ2seNXA3wzFsZERRjx2BgtocwjpweOyKNf3uOEQiZgh5e618ATr6uuNmF3u/fy -EXG3CBqK9Lh52NWEB4C0T7OD42ru6MN7aYRY30ZuvZaXPbC1T7o04fsCgYEA7ZMd -seQCxcM+jQDVGwQ9pMeF1WT+5Du4zOb4vsNEf3oDusnwztbfYCnbVET4vKfFKwAM -C/mYqBaEaASX47M3izUqw7AbmMlY4dWahzBoLHfHbE1gjadVtHqULEhJTKXZqfZz -w0ubbLqnk0MuorGMVP2BVKgwkZzV5R/6dDuMSt0CgYBP9Y79iG1V2n/slkxKJZfq -87SGNVLPGq05jYtrlzqVwROI9++wKugkdhcoE0eRm+O/ScewWy1rHD0BtwcCE5Oh -SE+8Mjggde7vTqyRfoFkhuBYSDreQszIGAp3mJToXEk7rdnNzVWyXd02FOU5ouIR -E5z5oxIedBLRMtk/6ntprQKBgQCJUvJlM0EPAy6S3ppQBYGET/hiQwC6+HJ3rkK2 -MbTUYrjpLXVOehGgSlGHQl7s3aUwl9Rez6WX83wRjCYn7h37D35qos8w36HK2Gd8 -IVT17z6MsaVP/BukOP6RIi+MaImKnvSHPJrYnIPksX6xeCN/tREe2CFK6fcRfAyP -RyRu2QKBgQDMGJ35UVhn62fqSFIzAARsGdnhg2PzmSza2abF69E1CiHBT/gOEpsK -dGmDSDHqcNl151roBeUYxZ8Vclr2rYuZEoIXuV50GUC9+jJEUsA1E0fR/73klfJT -3KzomlRJJx6F5dppYU8DztB8jgfNfhcdFVDQXNZyv8ZbC0+oEvs+2Q== ------END RSA PRIVATE KEY----- diff --git a/felix/fv/certs/ca.csr b/felix/fv/certs/ca.csr deleted file mode 100644 index 326059f79c6..00000000000 --- a/felix/fv/certs/ca.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICrTCCAZUCAQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNB -MRMwEQYDVQQDEwpLdWJlcm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEA5LlDBZ6hH9U5t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka0Mmq98pD -wdGC5hgsERXOUfOVnX3/TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSThxIuz1vRc -b1tl0maKNs1AYDHbm2SVlxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFihztaFhPCC -C6w6ZPYnqAQgMU0QHphWEZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9cWY2huRm -wId7K516CYwBOm0PYZue3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+akDIByoJV -8oMaagtoQ7BSaZ9bBy3GhBpjdz2jrwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEB -AKSs0yd6LXfAr5SOPycDXCAj/vszZaL1XedpFYiq9YXhyhx7SLpJ7QpRCrShMXcI -MgPXSmHfbf/Yc72HySRsbJ1j8XCVOnRsGheS17twJpI7Sekaphgq/zsNJH46GtIl -MfyPPFiB+zuVEkHhwUK8448KwfDsOTuXdVkDJAX/2o0VY1MK0OD1dy5or+6BUulj -mtXhw62vl75HX4rh9mEvveoUd/pPfJ0Hx4IpjHAz137zUX3Yb9xTo1Vw69d0qg73 -ofPPp3lcn0uD6YHmb+zNhPpsG7jruHJ/mKOunEo2G+5CGZkUMwujiwomEuQ7V/9v -iBWJ7sALM81UbGH5nQHq7/Q= ------END CERTIFICATE REQUEST----- diff --git a/felix/fv/certs/ca.pem b/felix/fv/certs/ca.pem deleted file mode 100644 index 1456904abbb..00000000000 --- a/felix/fv/certs/ca.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDoDCCAoigAwIBAgIUYJhXyAkmYfFbFc1aKKd4wfqk2jYwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMjAwMFoXDTI2MDkyODIyMjAwMFowaDEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -EzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQDEwpLdWJl -cm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5LlDBZ6hH9U5 -t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka0Mmq98pDwdGC5hgsERXOUfOVnX3/ -TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSThxIuz1vRcb1tl0maKNs1AYDHbm2SV -lxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFihztaFhPCCC6w6ZPYnqAQgMU0QHphW -EZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9cWY2huRmwId7K516CYwBOm0PYZue -3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+akDIByoJV8oMaagtoQ7BSaZ9bBy3G -hBpjdz2jrwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB -/zAdBgNVHQ4EFgQUYjUxlrW9gsYx7GSwowxQjcPbUxQwDQYJKoZIhvcNAQELBQAD -ggEBANBzL9fFJhyJNIoARNiGHSFaKGoqEJPCP793cMdSlWoTApfQk8qNHXVGeC9J -R9l3U+I7QiJLjy3rtoDHrXwyCusnaqvReUA+hGAVQm5PZu9OETFzzFu4dTZJd3E0 -M8vwt4yRdDtl5LVjYRo7yEjJyb7jssaV3bSz7VZnwHACT9hBxPu+3VAgFxrRBy9c -uqWzxlx+cBagHLTA7YurHG41AFFH1Z10vU2MisTLf5k6k4uMeEAgE/tUDB+gZNkT -0+hUjAhZR0uikDoeqSXDoh9NvLrpjt1raQzvksBVRNcuoGWQMjF3USkBJE5jQuLc -+Q7J/UKfb8YZIw69kidmDLq/5Gk= ------END CERTIFICATE----- diff --git a/felix/fv/certs/kube-controller-manager.kubeconfig b/felix/fv/certs/kube-controller-manager.kubeconfig deleted file mode 100644 index b06f1b69a84..00000000000 --- a/felix/fv/certs/kube-controller-manager.kubeconfig +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - insecure-skip-tls-verify: true - name: test-apiserver -contexts: -- context: - cluster: test-apiserver - user: system:kube-controller-manager - name: default -current-context: default -kind: Config -preferences: {} -users: -- name: system:kube-controller-manager - user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQ4VENDQXRtZ0F3SUJBZ0lVU2pPU2g4bWN3UG4vUlBzRlZuWi9WZTV1SlFBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2FERUxNQWtHQTFVRUJoTUNWVk14RHpBTkJnTlZCQWdUQms5eVpXZHZiakVSTUE4R0ExVUVCeE1JVUc5eQpkR3hoYm1ReEV6QVJCZ05WQkFvVENrdDFZbVZ5Ym1WMFpYTXhDekFKQmdOVkJBc1RBa05CTVJNd0VRWURWUVFECkV3cExkV0psY201bGRHVnpNQjRYRFRJeE1Ea3lPVEl5TWpBd01Gb1hEVEl5TURreU9USXlNakF3TUZvd2ZERUwKTUFrR0ExVUVCaE1DVlZNeER6QU5CZ05WQkFnVEJrOXlaV2R2YmpFUk1BOEdBMVVFQnhNSVVHOXlkR3hoYm1ReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1TQXdIZ1lEVlFRTEV4ZExkV0psY201bGRHVnpJRlJvClpTQklZWEprSUZkaGVURU9NQXdHQTFVRUF4TUZZV1J0YVc0d2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUIKRHdBd2dnRUtBb0lCQVFER0FXbkVwRFBVeXFvUlJ2b2VjSEdsWjI3N2NabFBLM3MwTEt4Nmo0NnVOdGIxVTVNcwpWOXZBRnRvV0tEWWRZOEdRRUlvdjNIQ2tXVmhyUDNpTGpwMWhXbWg2VldaaXg1Zkd3dGZiUkNuZ3B6UlJUUlVECkJNZllxazVzTlF3UENZNzRwaHl0QXdZNWFEVmNobGNram8rbEtQZkFEb2VVRFVIRVBpalNTeWNMRmVFMGdDdXkKUmduVVRadlZ0d0M4c2FTOFNBRUNRMm9qZG0rOVo4SXBmNjh5c2JHOVVpb2kxMnZKQ3JPZk5hVkhNV1lMY3pRZQpxMU1zNnlyRFR6QnFTamdMNExEYnV3MlUwQzFneEs1WlNacStCVnp3bjBxYmlVSUE5aW9MdEdZaVVHVVJ3NStpCks3U2F2S2Y0Tk1nR2ZRemhNbjAyU2J1cEdnZGNJYXBnenNlTkFnTUJBQUdqZnpCOU1BNEdBMVVkRHdFQi93UUUKQXdJRm9EQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0RBUVlJS3dZQkJRVUhBd0l3REFZRFZSMFRBUUgvQkFJdwpBREFkQmdOVkhRNEVGZ1FVbXhINEVpSTZub1hBOHRUSCtkVnEwdnBNVkZ3d0h3WURWUjBqQkJnd0ZvQVVZalV4CmxyVzlnc1l4N0dTd293eFFqY1BiVXhRd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNV0I5c0VBRjY1U2MycDUKTFREYzA0dmQzN3d0RW9sSEx6OUxhS2wvWTF5d1hrSnJJOXY4VEpLMzJLQXNHVnFOVStwdWFEZHNqaXh6dUxOYQpJd3g1SWxsVkt6Z3lTeGF1aGxlU2lFaXZuaVA3Qjl1SG1pQS9xMkx1MFFnQUQ1czdKRjAzemdBOUJaL0NRQmEzCklpMU84akdIMGlxdy9RV0x2UktvSVFsTGFoSWJ1MUVrZng1OTVBY3hENTNmZG1EbDllN2hjQnpPYUhGWDl4dTUKbjYyM21jeWxWUGNSVllDbHU2Y21pcFBQamM4dDB5amR0aiswb21GREMvNS82S2ljQTRMd01BdVRwZ1VLbDZlYQpIVFFtdzExbDIvRllEYm9yOGJFMlhSanlmVG1iWDY0bW84ZVJJY1lMN0NKV3J0d2thSURaZzZXbmdzV2tIQ25FClcxNEJaaVE9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBeGdGcHhLUXoxTXFxRVViNkhuQnhwV2R1KzNHWlR5dDdOQ3lzZW8rT3JqYlc5Vk9UCkxGZmJ3QmJhRmlnMkhXUEJrQkNLTDl4d3BGbFlhejk0aTQ2ZFlWcG9lbFZtWXNlWHhzTFgyMFFwNEtjMFVVMFYKQXdUSDJLcE9iRFVNRHdtTytLWWNyUU1HT1dnMVhJWlhKSTZQcFNqM3dBNkhsQTFCeEQ0bzBrc25DeFhoTklBcgpza1lKMUUyYjFiY0F2TEdrdkVnQkFrTnFJM1p2dldmQ0tYK3ZNckd4dlZJcUl0ZHJ5UXF6bnpXbFJ6Rm1DM00wCkhxdFRMT3NxdzA4d2FrbzRDK0N3MjdzTmxOQXRZTVN1V1VtYXZnVmM4SjlLbTRsQ0FQWXFDN1JtSWxCbEVjT2YKb2l1MG1yeW4rRFRJQm4wTTRUSjlOa203cVJvSFhDR3FZTTdIalFJREFRQUJBb0lCQUFZSzVQOXJRMm1yQmFXaApWT0M0N2I3dWVTU1RRdXAzbVRydVloVWJiRzlFblNxL2NpNVlRQXlNcGZzbkh2K21tN0daejUzR1RHbTNrRXMxCmxLZ3RvZi9ta21tcFVZYVNNTCtRRXFaT1hqak00WHZacmxwNU91QVIwbkxhNjVOSjUyTVBMckRZOXNlcHRuY3MKWWx4clBWYjgrUktUWHUvVnQ3d1ZhWW1CWVorazdZR084RDN1b2hSZnd4ZHl5R2Q0NDFBY0ZISDhvb3NjYlZCNQp4dGRGd3IrTzR2OEpUMGdvQ3lFOVhxajJXK2g3SDdrbUhOcU41UVQ1QnNEYXNUVnJXa3F0Q042RCs5QmN4OTJsClp0cGpUa3g1SW9CekQ0QUx6QWRzNWxIREEvWEhjSWhjOEhGU3Y2NFdEYmNQeHJDbDVWTzhwUDFKb3BvNVBZcjIKTGJzWFZBRUNnWUVBei9wbWlaRWpEWmUvd2t5eC95Wm9Qc1YyVmFVZitscXMzSlZwT2l1U0pVVVErb0hydjYyTApqL0hzb0tGUDZ5WHlZQ2pqdDBmb3FQWlVTZW9ObnpoTTFaTTlpUkFOb21va0F3THFja3d2ZEdyNHA5U0RLdE41CnhiTXp2MVhhalhGVG51Y0s2b25CYWo3QlhBdmNjR3JzT29zY3pUNFAyb0ZYRVpuRUlUOFpRbDBDZ1lFQTg3bUgKL3JDa0FmN2czTFZTMlZ6Ry9tbVZzY0ZhSnh6akh0RVNFeDhoZ1E0dnY3Q2I0UTMxYkE5Zm4zNUhhRnU4OHVmMQpIb3VvR0hBdStqVTdLTHVsVzQ0NlFQRHh1bnQrRG1oeE5lOGhPdFVyandUZXNNcTE0RDVIMDFSbWJSSFZEZDlFCjVHdjVoYVQ1eVRoeE5MekZUZ2dDSTI4dnAxRkE4U0FZMXNzTHB2RUNnWUJHVjdUU2xvbzZrTGJFNnRmUktwWmIKbE1IZldjZ2xEd0lrWVV5RDVqUzU4bEE1eWpPSVV4US9EVjR4UGg0ZnRHZno2aUNLM3dGc0ZGU1I0MTNVR21DeQpZK2lPTVNYTFp3YmpGZHRoNlM2cnUzcDZtVC83L2liVG5UYkZZaTVYWkpzWnhaOUZrRzRnbHpVakFzZitKY3ZjClNTem1walVLZkhDTWZXdCtxeTdKNlFLQmdBdmxqNFRZSEhsWWRxTnZXbWJ2eDJyZHZvZlp0MHZYZGlLbjgranAKQ1JxaWxhUVd1OVVsZUVoWkM4TGVTQ0FJOGxVdEMyTDlVQ3c1TmFIUy9WdEVwWkt0ZzV4dDVtN0MzbWxYb2NjUApNQ0VPREwxRGNKZFNuY1FmWmlRanA0aEZhWS91eVE4WlVpbTYzdEo2cGRQOEx1bGJMTGVNRXRobzkvR05Mb2sxCmloRVJBb0dCQUpHNkhLV3JlczlNOTViYjBzb2g3by9xd1YvSVZnTTZBSXlQYzMxb2tmc3ltOGJJWldxQzNjWFMKbDZGODdjTFQvS1QyWWNLYVFSYVpRMEhsOThNTG0va2lTeXhVTXNxcktCR21MZVZSOWJyS1c3RWUvb0c2QWJlKwpPRE1oQmNhSlZERGRGNW5JTnNzT0p0UUx4Z25TalFZQXdhTTF4TGcveDJVbXdLUVNyR0hSCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== diff --git a/felix/fv/certs/kubeconfig b/felix/fv/certs/kubeconfig deleted file mode 100644 index b9a24ba8a10..00000000000 --- a/felix/fv/certs/kubeconfig +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - insecure-skip-tls-verify: true - server: https://127.0.0.1:6443 - name: test-apiserver -contexts: -- context: - cluster: test-apiserver - user: admin - name: admin -current-context: admin -kind: Config -users: -- name: admin - user: - client-certificate: /home/user/certs/admin.pem - client-key: /home/user/certs/admin-key.pem diff --git a/felix/fv/certs/kubernetes-csr.json b/felix/fv/certs/kubernetes-csr.json deleted file mode 100644 index 778db6322c2..00000000000 --- a/felix/fv/certs/kubernetes-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "kubernetes", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/felix/fv/certs/kubernetes-key.pem b/felix/fv/certs/kubernetes-key.pem deleted file mode 100644 index 98b8676abcc..00000000000 --- a/felix/fv/certs/kubernetes-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpgIBAAKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeIQcuiW8CV2JwNk4KI80kO -n76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLjarXppB0uPduIERTNc4Xv3 -/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6u+B1LqIlktMTOD+93UFi -lsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D40KYRo/7WGQDz9YLWNKqh -vGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2NlwupzpqoXwxd9e1IEMhzmGRHcC -+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQABAoIBAQC6uU4whPi09vRO -htTooxZshPRRamEMafjYJQmbbnsqp016AQjUaIz2nNWd2536AAlKOc/FTFx3xaEX -QX5xZZ2S7IYGLkdTAkFhsQYI49FxAA5CBz02nAsccjsDQ/AoyXXSEJzBKAk8XBiG -ZeiA/StY+cVvK4D0G7FFSsUnZlzz9uMrMHyQKKrRR8KkU+QnAjZnxqPkckc10K1H -1ZNumS3Jx4hRVSi5KXjCjNbqf79nBWJ96iSczev97CT+WZ1GnAPQtuWwHD2rjZmy -0DKsLnRujD8u+lJjBEhbSrdLYMDNJsO1SAtpYN9W94+8f9ZQDxNBRJ1C4f5XTLii -ymnkPD9xAoGBAPsMOPeNRgS7Z2Bwgs4gr4x53AJrYc0nIanm01d89aVWA5c+V4NJ -6+KtLjZepRcjKV6MGt+y3MR/52lUj3cgeYwVERwkIyvIVyDuSaqcc7RYlPDwAsuN -h3G/Wg8blQxDmvbRZDLTwjOsfvCG7s8VQEeJHoyJYT81F/oD/d1z4oXtAoGBAPeQ -bDJa0x7ciZcf97SY0DnnIfT1kiDIk5q1UEi4DNtVFQX/BQxsvkwyhdttVLuFe8gw -2hkiG6QavSHhxtgwGtnGMVZgDpSdrk7zLVIVERCN2EB5Lo1+a/JYkVhYedmTGqu1 -HnM2rrFPjPD04EriNKewJAx/dC8q2dBS9/N/T8xvAoGBAOX4vVqwdJqzHbDvgDPZ -J1cU7mDdA3uORD1CsQls9A3gLGvo9PvUxJwirrmpm6wFTslIqPmQ/MGYtWD80Gt9 -OTsEtWbFB978qCwHfT4oEan8l3vbMYRMAu5FLve1+aSBbbx59kLFTxpNAv/Na4gR -3I9rYau10Xq4ZV1nOLAbjz/FAoGBAIxrgcNqGvgVVYG/4yuvxeQiAvPD2tf3jSmi -kGA+7SP3dY5KIV3zzFjCC4Tz1azrwNNDSmIZI56IgCDYxIXZe1FtBo0cvQh1C+rC -KkG1q1E9c5zWX55oR+hVblOzE6Jiuy0L9bKaIKp4GdSOwS4Yco9u7HOeU5Nxdcyh -UvztiKDHAoGBAO4i6SArmLYc/e2m/npAW/jTts3Q7pNlywAlVFo8ZDdYADY+1wtO -5GL1VqoWPND8LMPVLJzfnyMeeo+g1xjezY/QciS3NSR9kgM9quqi1jl+fgLwQVbf -Snx348RF4B8r8vtfH5q1pS9NM4G3zQWYhlJv8TVgGON8yJNfoh80N1Qy ------END RSA PRIVATE KEY----- diff --git a/felix/fv/certs/kubernetes.csr b/felix/fv/certs/kubernetes.csr deleted file mode 100644 index 9b32900a447..00000000000 --- a/felix/fv/certs/kubernetes.csr +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIDXzCCAkcCAQAwfTELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxIDAeBgNVBAsTF0t1 -YmVybmV0ZXMgVGhlIEhhcmQgV2F5MRMwEQYDVQQDEwprdWJlcm5ldGVzMIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeI -QcuiW8CV2JwNk4KI80kOn76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLja -rXppB0uPduIERTNc4Xv3/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6 -u+B1LqIlktMTOD+93UFilsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D4 -0KYRo/7WGQDz9YLWNKqhvGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2Nlwupzp -qoXwxd9e1IEMhzmGRHcC+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQAB -oIGcMIGZBgkqhkiG9w0BCQ4xgYswgYgwgYUGA1UdEQR+MHyCCmt1YmVybmV0ZXOC -Emt1YmVybmV0ZXMuZGVmYXVsdIIWa3ViZXJuZXRlcy5kZWZhdWx0LnN2Y4Iea3Vi -ZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyghxrdWJlcm5ldGVzLnN2Yy5jbHVz -dGVyLmxvY2FshwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQARwbt/QbJlGgdV5v9K -40JvhD4GPqQDdU15gZlht7/Cz1YPlIjqZy0TUaEwVYNFw8W8UW2LYhCXzBsTsHw3 -pfQw6DRjvPcceCn/UH3S2F9FjLZ9rrvu79TX7uUBAl5PDkN8MuciijlFDoHN2hX5 -1ApEWZi1V6G2akzocbywkh5bpf+WBZszWsvoC6nYB4ghK85Z0yqIAwbCKORXwSNn -DtQ9VmMtg/vyWj6gg9K/bYh0Bh3l4FONsqO4VbX7+meiEy8Ony7f04m05IkJDcO8 -mKF3OTuUMkBMEMVkZKXJJ9iI+TIrtQ6xbPc3Ctm199OXK4i65WMaO9llQ9q9iByX -py8d ------END CERTIFICATE REQUEST----- diff --git a/felix/fv/certs/kubernetes.pem b/felix/fv/certs/kubernetes.pem deleted file mode 100644 index 96505e7f255..00000000000 --- a/felix/fv/certs/kubernetes.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEfjCCA2agAwIBAgIUepjO3FMlyIcWiO0N4/GJgV6Uj/QwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMzEwMFoXDTIyMDkyOTIyMzEwMFowfTEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -EzARBgNVBAoTCkt1YmVybmV0ZXMxIDAeBgNVBAsTF0t1YmVybmV0ZXMgVGhlIEhh -cmQgV2F5MRMwEQYDVQQDEwprdWJlcm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeIQcuiW8CV2JwNk4KI80kO -n76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLjarXppB0uPduIERTNc4Xv3 -/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6u+B1LqIlktMTOD+93UFi -lsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D40KYRo/7WGQDz9YLWNKqh -vGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2NlwupzpqoXwxd9e1IEMhzmGRHcC -+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQABo4IBCTCCAQUwDgYDVR0P -AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB -Af8EAjAAMB0GA1UdDgQWBBQNhPCXoXrtgP0M8NPQipbRggdk9DAfBgNVHSMEGDAW -gBRiNTGWtb2CxjHsZLCjDFCNw9tTFDCBhQYDVR0RBH4wfIIKa3ViZXJuZXRlc4IS -a3ViZXJuZXRlcy5kZWZhdWx0ghZrdWJlcm5ldGVzLmRlZmF1bHQuc3Zjgh5rdWJl -cm5ldGVzLmRlZmF1bHQuc3ZjLmNsdXN0ZXKCHGt1YmVybmV0ZXMuc3ZjLmNsdXN0 -ZXIubG9jYWyHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBALKCw/I9j3e5Q2NUGaSg -cUnVuzTwgJ46oTxoOm1mN6whPHe2ACPHWBKsCFhCtgMDEUy4hObrmzlEbzXhHeMr -Ri7+a0DnheYk8QDcR5nk0oxdG8XbFf6dBJdHLRMfTmYKPhFj1nM8Eh2xKZszdkIG -FWGL7Php/F3+HzwQj4rbZYDQMITiRR3ib+HU9m3aBu4VTLdAL/I4EizOXUc7LxDz -dyliu7xVzGweoYI5BE1PzaN0ClhOpvV4y9g2vUxuuqdWSo70pld712+hZ8qwAJgp -F+vvtmEfroJGckI6llbvhXmmV8Qek9ekpol2QeZDHgCX6wHw+sGVfT3oPMzI82jq -WcM= ------END CERTIFICATE----- diff --git a/felix/fv/certs/service-account-csr.json b/felix/fv/certs/service-account-csr.json deleted file mode 100644 index be3c0ca4b6a..00000000000 --- a/felix/fv/certs/service-account-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "service-accounts", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/felix/fv/certs/service-account-key.pem b/felix/fv/certs/service-account-key.pem deleted file mode 100644 index 8213a751f69..00000000000 --- a/felix/fv/certs/service-account-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEA7F9N9m7yq96IetGBTJK4CIG1SB11NdeGXCZD943BHXTYdUvv -WTEkbwoWhMonyicghHmDzmJTf376Bk49yClC7tBx/5TQX4J95Y2mX3EThAdPyVvh -sjYJoYGY8nd7WvXlo33yEdTCnQUqSEZ8HXgu/iWB29Yu/4Rh2ZnxLnGQbLE4dJ5f -iu64sZtExeN/BF84DOaujqiv38jkL8ah9zxDutDMk2qTMneRi8e5ArukIM/GVKBx -mJMdafeL/emObBuaAIGJCM6yPUNB8Ry8RhugiRjyrDsDMKggMQOQkWr3QO9n7Twx -nIn6BoCxd2ea6VUi7Ib/ELgC8Ie2DNWIpzRUDwIDAQABAoIBAQDAGZx04Spbv9lP -Z6EbqEnkr/WyjC5L+cL6dSbbs9r0o5efjH0TEbs4ewxeEyVPR4lH4LHcM1EE1x8/ -rKrNV6tMBx/+xOSsGpNS0lIaUv23WXHghcnhWcVt+rNgqvYXsKxWuO7Yyv73OdFp -N89668fVSIpHLcS4aNBVVqUKR8VGbxkpPADTA8mJoJ3jwS/5GQMyd3L6kd3FvvTI -YeWOCXLY6QHNZ1OrnntNZt0J8ikZW/ntmB1tNrY/rblaTBtxGihmbHWgCWSEEZfZ -iWOgcljTCgug6bxALIGJF0mTheHkiY7RXjrmx1QMeq3yS07wPl3hlDCcCYKPTEvq -i193bV3hAoGBAPxGZet1YrIfilLJ70v+QrpywQaIey8WkfOUO8Adv3PmwFA33NrZ -PkEQjYsQm/IWkSfs9IZbIEXeOkZl5ozCdT4vj6xXT4FsnL79H39sSoqlhKVq5flW -UnZhAPUWq/U2B1RyC1HSwtZEHiK977nrxpNXRoNX2yiVj7hnmALql/hnAoGBAO/c -y0U0/NlfrMMq9KIZXHGM1IbIZFBeLnpfZD+apLrSkzoQvaxqF/3l2i7xD4WI6HZP -0mTuswyAT04wBb9WeMH1qWjk/O8OWtbqfFo/bL2KSALMjHN1zLrFhMMg7Rq8a5LP -BQTep+nEEFFGQI0LJKfJ1+7VwiVDs5Ryq6WyFx4ZAoGAGL9bLi70wJ6Bdj+i/uRx -bVLmhpqK4wKmzKtE9UK1zkvbn8LrInjfN4jFKdg2RBhcovsGvctgrhnvw4ophLNq -xu/pezGRdhPOiJnSJjDcWx+DlKqY5s3GByDa9DAGLGbhbzJE1AEF5fkGr8fMJYPw -lfGg1C+hKykI0UEwU1DqGY8CgYEA5qdufM2Ye7uqGT98YUh8AeFIGZgoBrSagyip -8RPXZqPJ2eNxUZPwIEJgzhUXNPTTfboCevajDNlx6aD6VeVkWDfQwcK5i3RFXDe+ -ftZQze9kkfR69yiHR+9aXH2UI8qes10J2YX2+C+G9XDV8AuQIx1Q3SWG/WieDpk6 -gCrCWjkCgYEAmX5u+Ka4Rx0cZcci/lDrjRWlhugH87rg+ZYQyCT8Pxq5Is3DUqQQ -9bArNFagKllb1DHjZjY5Lhts3S4Yn8exFpn2Qhg5j8SH8v03SQjAeKDFtsEnGPuQ -cygzKjNNTOh2NImfrrV41Fsid6qkCzzmBZ5WKjy0RXtAVTMBtlEfOM8= ------END RSA PRIVATE KEY----- diff --git a/felix/fv/certs/service-account.csr b/felix/fv/certs/service-account.csr deleted file mode 100644 index 5b7c710e31a..00000000000 --- a/felix/fv/certs/service-account.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICyTCCAbECAQAwgYMxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAP -BgNVBAcTCFBvcnRsYW5kMRMwEQYDVQQKEwpLdWJlcm5ldGVzMSAwHgYDVQQLExdL -dWJlcm5ldGVzIFRoZSBIYXJkIFdheTEZMBcGA1UEAxMQc2VydmljZS1hY2NvdW50 -czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOxfTfZu8qveiHrRgUyS -uAiBtUgddTXXhlwmQ/eNwR102HVL71kxJG8KFoTKJ8onIIR5g85iU39++gZOPcgp -Qu7Qcf+U0F+CfeWNpl9xE4QHT8lb4bI2CaGBmPJ3e1r15aN98hHUwp0FKkhGfB14 -Lv4lgdvWLv+EYdmZ8S5xkGyxOHSeX4ruuLGbRMXjfwRfOAzmro6or9/I5C/Gofc8 -Q7rQzJNqkzJ3kYvHuQK7pCDPxlSgcZiTHWn3i/3pjmwbmgCBiQjOsj1DQfEcvEYb -oIkY8qw7AzCoIDEDkJFq90DvZ+08MZyJ+gaAsXdnmulVIuyG/xC4AvCHtgzViKc0 -VA8CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQDS6T5JkfHATn6+47v4znVVvKfW -YiUbC0fRi7kMtnJMdhp8Oe8p2XXDmzBwaFVYneBhwSddKJG41snmYE8yv746guYh -ndnh/ZtXtP39E6q+dknMGfJ/LZyB6fPM3m7X2VMtww5uFfeXZyY4aE4GOIqRSkGO -KHP+0h6+MqE9AFYtjOuIpCSfmZ5XLf2PfxY9LxePMmhKCUV1qmf6ZftJ+LP/97H3 -RP7k+7zK8q+xq8ETE2Ub2Ux8s36EVykVzh06kElhsHK7nqkafyJE/8lkiaExTKvd -Kk5ii3CnQi6/RaZQ8TeNzjqcUMDfxigeh6JkC60xrhQThR10oUajxxd1Sg/N ------END CERTIFICATE REQUEST----- diff --git a/felix/fv/certs/service-account.pem b/felix/fv/certs/service-account.pem deleted file mode 100644 index 5abe649c2b8..00000000000 --- a/felix/fv/certs/service-account.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID+TCCAuGgAwIBAgIUHOMlm843n+Z1yg1UdqdWicQppzswDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMzYwMFoXDTIyMDkyOTIyMzYwMFowgYMx -CzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRsYW5k -MRMwEQYDVQQKEwpLdWJlcm5ldGVzMSAwHgYDVQQLExdLdWJlcm5ldGVzIFRoZSBI -YXJkIFdheTEZMBcGA1UEAxMQc2VydmljZS1hY2NvdW50czCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAOxfTfZu8qveiHrRgUySuAiBtUgddTXXhlwmQ/eN -wR102HVL71kxJG8KFoTKJ8onIIR5g85iU39++gZOPcgpQu7Qcf+U0F+CfeWNpl9x -E4QHT8lb4bI2CaGBmPJ3e1r15aN98hHUwp0FKkhGfB14Lv4lgdvWLv+EYdmZ8S5x -kGyxOHSeX4ruuLGbRMXjfwRfOAzmro6or9/I5C/Gofc8Q7rQzJNqkzJ3kYvHuQK7 -pCDPxlSgcZiTHWn3i/3pjmwbmgCBiQjOsj1DQfEcvEYboIkY8qw7AzCoIDEDkJFq -90DvZ+08MZyJ+gaAsXdnmulVIuyG/xC4AvCHtgzViKc0VA8CAwEAAaN/MH0wDgYD -VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV -HRMBAf8EAjAAMB0GA1UdDgQWBBR9pAvzY/VK7MAcOUPSk9iZ3FkwzjAfBgNVHSME -GDAWgBRiNTGWtb2CxjHsZLCjDFCNw9tTFDANBgkqhkiG9w0BAQsFAAOCAQEAd40A -HoVSjcjctv4Xg3H/E80AKAV41hwLZtXTI6ed/ERdgQQMotbW9pgXQix1qzvT6z9e -x+gIdpKE8h89u9wS+bYkthIKJRYRLc7ZJ9Aq+izlfLO/GjxfgBgbOBLMpNKNpmdf -NlOEfoKkLriE31f1oW9Xx3SYdqdaFQJDaDaRg5guQw0YT7PBIlHemmoYGujKNc8+ -iMWYa9aeGMM8yrpH5GRwUI7BAk0+fX4DhyokOuH3mpHXWWkKdVoIfpt3q+jznKYe -l7VaABvoHr3fx9oGhusuwDgLFssraMeIJigHi5ajOTWYw7u6yN2cjh+Ng7TZ+hf/ -+nhPbMGFM/GDpGVXmg== ------END CERTIFICATE----- diff --git a/felix/fv/infrastructure/infra_k8s.go b/felix/fv/infrastructure/infra_k8s.go index 26d5c03964e..d7a0248b56f 100644 --- a/felix/fv/infrastructure/infra_k8s.go +++ b/felix/fv/infrastructure/infra_k8s.go @@ -176,7 +176,7 @@ func runK8sApiserver(etcdIp string) *containers.Container { AutoRemove: true, StopSignal: "SIGKILL", }, - "-v", os.Getenv("PWD")+"/certs:/home/user/certs", // Mount in location of certificates. + "-v", os.Getenv("CERTS_PATH")+":/home/user/certs", // Mount in location of certificates. utils.Config.K8sImage, "kube-apiserver", "--v=0", @@ -202,7 +202,7 @@ func runK8sControllerManager(apiserverIp string) *containers.Container { AutoRemove: true, StopSignal: "SIGKILL", }, - "-v", os.Getenv("PWD")+"/certs:/home/user/certs", // Mount in location of certificates. + "-v", os.Getenv("CERTS_PATH")+"/:/home/user/certs", // Mount in location of certificates. utils.Config.K8sImage, "kube-controller-manager", fmt.Sprintf("--master=https://%v:6443", apiserverIp), diff --git a/felix/k8sfv/run-test b/felix/k8sfv/run-test index a203d007cb3..c6d67c13d43 100755 --- a/felix/k8sfv/run-test +++ b/felix/k8sfv/run-test @@ -137,7 +137,7 @@ etcd_ip=$(get_container_ip ${prefix}-etcd) # "cluster-admin" role). # Enable insecure connection from controller manager to API server port 8080. docker run --detach --name ${prefix}-apiserver \ - -v ${PWD}/fv/certs:/home/user/certs \ + -v ${CERTS_PATH}:/home/user/certs \ $FV_K8SIMAGE \ kube-apiserver \ --etcd-servers=http://${etcd_ip}:2379 \ @@ -162,7 +162,7 @@ while ! docker exec ${prefix}-apiserver kubectl --kubeconfig=/home/user/certs/ku done docker run --detach --name ${prefix}-controller-manager \ - -v ${PWD}/fv/certs:/home/user/certs \ + -v ${CERTS_PATH}:/home/user/certs \ $FV_K8SIMAGE \ kube-controller-manager \ --master=https://${k8s_ip}:6443 \ diff --git a/apiserver/test/certs/README.md b/hack/test/certs/README.md similarity index 100% rename from apiserver/test/certs/README.md rename to hack/test/certs/README.md diff --git a/apiserver/test/certs/admin-csr.json b/hack/test/certs/admin-csr.json similarity index 100% rename from apiserver/test/certs/admin-csr.json rename to hack/test/certs/admin-csr.json diff --git a/apiserver/test/certs/admin-key.pem b/hack/test/certs/admin-key.pem similarity index 100% rename from apiserver/test/certs/admin-key.pem rename to hack/test/certs/admin-key.pem diff --git a/apiserver/test/certs/admin.csr b/hack/test/certs/admin.csr similarity index 100% rename from apiserver/test/certs/admin.csr rename to hack/test/certs/admin.csr diff --git a/apiserver/test/certs/admin.pem b/hack/test/certs/admin.pem similarity index 100% rename from apiserver/test/certs/admin.pem rename to hack/test/certs/admin.pem diff --git a/apiserver/test/certs/ca-config.json b/hack/test/certs/ca-config.json similarity index 100% rename from apiserver/test/certs/ca-config.json rename to hack/test/certs/ca-config.json diff --git a/apiserver/test/certs/ca-csr.json b/hack/test/certs/ca-csr.json similarity index 100% rename from apiserver/test/certs/ca-csr.json rename to hack/test/certs/ca-csr.json diff --git a/apiserver/test/certs/ca-key.pem b/hack/test/certs/ca-key.pem similarity index 100% rename from apiserver/test/certs/ca-key.pem rename to hack/test/certs/ca-key.pem diff --git a/apiserver/test/certs/ca.csr b/hack/test/certs/ca.csr similarity index 100% rename from apiserver/test/certs/ca.csr rename to hack/test/certs/ca.csr diff --git a/apiserver/test/certs/ca.pem b/hack/test/certs/ca.pem similarity index 100% rename from apiserver/test/certs/ca.pem rename to hack/test/certs/ca.pem diff --git a/apiserver/test/certs/kube-controller-manager.kubeconfig b/hack/test/certs/kube-controller-manager.kubeconfig similarity index 100% rename from apiserver/test/certs/kube-controller-manager.kubeconfig rename to hack/test/certs/kube-controller-manager.kubeconfig diff --git a/apiserver/test/certs/kubeconfig b/hack/test/certs/kubeconfig similarity index 74% rename from apiserver/test/certs/kubeconfig rename to hack/test/certs/kubeconfig index b9a24ba8a10..b02a3af1733 100644 --- a/apiserver/test/certs/kubeconfig +++ b/hack/test/certs/kubeconfig @@ -14,5 +14,7 @@ kind: Config users: - name: admin user: + # The tests which use this kubeconfig are run in a container + # and expect these files to be mounted at this location. client-certificate: /home/user/certs/admin.pem client-key: /home/user/certs/admin-key.pem diff --git a/apiserver/test/certs/kubernetes-csr.json b/hack/test/certs/kubernetes-csr.json similarity index 100% rename from apiserver/test/certs/kubernetes-csr.json rename to hack/test/certs/kubernetes-csr.json diff --git a/apiserver/test/certs/kubernetes-key.pem b/hack/test/certs/kubernetes-key.pem similarity index 100% rename from apiserver/test/certs/kubernetes-key.pem rename to hack/test/certs/kubernetes-key.pem diff --git a/apiserver/test/certs/kubernetes.csr b/hack/test/certs/kubernetes.csr similarity index 100% rename from apiserver/test/certs/kubernetes.csr rename to hack/test/certs/kubernetes.csr diff --git a/apiserver/test/certs/kubernetes.pem b/hack/test/certs/kubernetes.pem similarity index 100% rename from apiserver/test/certs/kubernetes.pem rename to hack/test/certs/kubernetes.pem diff --git a/apiserver/test/certs/service-account-csr.json b/hack/test/certs/service-account-csr.json similarity index 100% rename from apiserver/test/certs/service-account-csr.json rename to hack/test/certs/service-account-csr.json diff --git a/apiserver/test/certs/service-account-key.pem b/hack/test/certs/service-account-key.pem similarity index 100% rename from apiserver/test/certs/service-account-key.pem rename to hack/test/certs/service-account-key.pem diff --git a/apiserver/test/certs/service-account.csr b/hack/test/certs/service-account.csr similarity index 100% rename from apiserver/test/certs/service-account.csr rename to hack/test/certs/service-account.csr diff --git a/apiserver/test/certs/service-account.pem b/hack/test/certs/service-account.pem similarity index 100% rename from apiserver/test/certs/service-account.pem rename to hack/test/certs/service-account.pem diff --git a/kube-controllers/Makefile b/kube-controllers/Makefile index 21c57113af5..ab84d6c389d 100644 --- a/kube-controllers/Makefile +++ b/kube-controllers/Makefile @@ -114,8 +114,7 @@ fv: tests/fv/fv.test image MIGRATION_CONTAINER_NAME=$(FLANNEL_MIGRATION_IMAGE):latest-$(ARCH) \ PRIVATE_KEY=`pwd`/private.key \ CRDS=$(CURDIR)/../libcalico-go/config/crd \ - CERTS=$(CURDIR)/tests/certs \ - GO111MODULE=on \ + CERTS_PATH=$(CERTS_PATH) \ ./fv.test $(GINKGO_ARGS) -ginkgo.slowSpecThreshold 30 tests/fv/fv.test: $(shell find ./tests -type f -name '*.go' -print) diff --git a/kube-controllers/tests/certs/README.md b/kube-controllers/tests/certs/README.md deleted file mode 100644 index 7ce867a88e1..00000000000 --- a/kube-controllers/tests/certs/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# FV certificates - -The files in this directory are used only in the FV tests in this repository, and were generated according to the steps in [Kubernetes the hard -way](https://github.com/kelseyhightower/kubernetes-the-hard-way). diff --git a/kube-controllers/tests/certs/admin-csr.json b/kube-controllers/tests/certs/admin-csr.json deleted file mode 100644 index 960ce1d9a8c..00000000000 --- a/kube-controllers/tests/certs/admin-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "admin", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "system:masters", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/kube-controllers/tests/certs/admin-key.pem b/kube-controllers/tests/certs/admin-key.pem deleted file mode 100644 index c29c9f95ef7..00000000000 --- a/kube-controllers/tests/certs/admin-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAxgFpxKQz1MqqEUb6HnBxpWdu+3GZTyt7NCyseo+OrjbW9VOT -LFfbwBbaFig2HWPBkBCKL9xwpFlYaz94i46dYVpoelVmYseXxsLX20Qp4Kc0UU0V -AwTH2KpObDUMDwmO+KYcrQMGOWg1XIZXJI6PpSj3wA6HlA1BxD4o0ksnCxXhNIAr -skYJ1E2b1bcAvLGkvEgBAkNqI3ZvvWfCKX+vMrGxvVIqItdryQqznzWlRzFmC3M0 -HqtTLOsqw08wako4C+Cw27sNlNAtYMSuWUmavgVc8J9Km4lCAPYqC7RmIlBlEcOf -oiu0mryn+DTIBn0M4TJ9Nkm7qRoHXCGqYM7HjQIDAQABAoIBAAYK5P9rQ2mrBaWh -VOC47b7ueSSTQup3mTruYhUbbG9EnSq/ci5YQAyMpfsnHv+mm7GZz53GTGm3kEs1 -lKgtof/mkmmpUYaSML+QEqZOXjjM4XvZrlp5OuAR0nLa65NJ52MPLrDY9septncs -YlxrPVb8+RKTXu/Vt7wVaYmBYZ+k7YGO8D3uohRfwxdyyGd441AcFHH8ooscbVB5 -xtdFwr+O4v8JT0goCyE9Xqj2W+h7H7kmHNqN5QT5BsDasTVrWkqtCN6D+9Bcx92l -ZtpjTkx5IoBzD4ALzAds5lHDA/XHcIhc8HFSv64WDbcPxrCl5VO8pP1Jopo5PYr2 -LbsXVAECgYEAz/pmiZEjDZe/wkyx/yZoPsV2VaUf+lqs3JVpOiuSJUUQ+oHrv62L -j/HsoKFP6yXyYCjjt0foqPZUSeoNnzhM1ZM9iRANomokAwLqckwvdGr4p9SDKtN5 -xbMzv1XajXFTnucK6onBaj7BXAvccGrsOosczT4P2oFXEZnEIT8ZQl0CgYEA87mH -/rCkAf7g3LVS2VzG/mmVscFaJxzjHtESEx8hgQ4vv7Cb4Q31bA9fn35HaFu88uf1 -HouoGHAu+jU7KLulW446QPDxunt+DmhxNe8hOtUrjwTesMq14D5H01RmbRHVDd9E -5Gv5haT5yThxNLzFTggCI28vp1FA8SAY1ssLpvECgYBGV7TSloo6kLbE6tfRKpZb -lMHfWcglDwIkYUyD5jS58lA5yjOIUxQ/DV4xPh4ftGfz6iCK3wFsFFSR413UGmCy -Y+iOMSXLZwbjFdth6S6ru3p6mT/7/ibTnTbFYi5XZJsZxZ9FkG4glzUjAsf+Jcvc -SSzmpjUKfHCMfWt+qy7J6QKBgAvlj4TYHHlYdqNvWmbvx2rdvofZt0vXdiKn8+jp -CRqilaQWu9UleEhZC8LeSCAI8lUtC2L9UCw5NaHS/VtEpZKtg5xt5m7C3mlXoccP -MCEODL1DcJdSncQfZiQjp4hFaY/uyQ8ZUim63tJ6pdP8LulbLLeMEtho9/GNLok1 -ihERAoGBAJG6HKWres9M95bb0soh7o/qwV/IVgM6AIyPc31okfsym8bIZWqC3cXS -l6F87cLT/KT2YcKaQRaZQ0Hl98MLm/kiSyxUMsqrKBGmLeVR9brKW7Ee/oG6Abe+ -ODMhBcaJVDDdF5nINssOJtQLxgnSjQYAwaM1xLg/x2UmwKQSrGHR ------END RSA PRIVATE KEY----- diff --git a/kube-controllers/tests/certs/admin.csr b/kube-controllers/tests/certs/admin.csr deleted file mode 100644 index f8326afd804..00000000000 --- a/kube-controllers/tests/certs/admin.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICwTCCAakCAQAwfDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMSAwHgYDVQQL -ExdLdWJlcm5ldGVzIFRoZSBIYXJkIFdheTEOMAwGA1UEAxMFYWRtaW4wggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGAWnEpDPUyqoRRvoecHGlZ277cZlP -K3s0LKx6j46uNtb1U5MsV9vAFtoWKDYdY8GQEIov3HCkWVhrP3iLjp1hWmh6VWZi -x5fGwtfbRCngpzRRTRUDBMfYqk5sNQwPCY74phytAwY5aDVchlckjo+lKPfADoeU -DUHEPijSSycLFeE0gCuyRgnUTZvVtwC8saS8SAECQ2ojdm+9Z8Ipf68ysbG9Uioi -12vJCrOfNaVHMWYLczQeq1Ms6yrDTzBqSjgL4LDbuw2U0C1gxK5ZSZq+BVzwn0qb -iUIA9ioLtGYiUGURw5+iK7SavKf4NMgGfQzhMn02SbupGgdcIapgzseNAgMBAAGg -ADANBgkqhkiG9w0BAQsFAAOCAQEAZprfwdXYJkVVQSBNHXUi2ePxKiU24EjqC1Yq -a4Z9NxzUrCPtaR8hVfo75t2c4vJLJcKdIkB0eGDJwcIOC5I1JIsgzLzQeXDElcKW -xGFF3L+W4R4iCQ5XxnfE2dpKt9xuaamxKflflPjbZFpX1w0Sj+DP8YjcuoXSJT78 -fdR2iVpUBy2CHa06Hz1rEBynqTziRtpS3lDaWZsAKtb/oP5zfJGlhzShV5DY6YMx -G7M9854qMSsdjmCWolQ3Bz/Wg77V98Mg5jeF5iua1OUpsomgIq9mKPb+Du/rxWqS -4ElAOicSc4zSHaADc/nm5GN+k0wRihkaS9yD/VHahSulfErKLg== ------END CERTIFICATE REQUEST----- diff --git a/kube-controllers/tests/certs/admin.pem b/kube-controllers/tests/certs/admin.pem deleted file mode 100644 index c51fffe8804..00000000000 --- a/kube-controllers/tests/certs/admin.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUSjOSh8mcwPn/RPsFVnZ/Ve5uJQAwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMjAwMFoXDTIyMDkyOTIyMjAwMFowfDEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -FzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMSAwHgYDVQQLExdLdWJlcm5ldGVzIFRo -ZSBIYXJkIFdheTEOMAwGA1UEAxMFYWRtaW4wggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQDGAWnEpDPUyqoRRvoecHGlZ277cZlPK3s0LKx6j46uNtb1U5Ms -V9vAFtoWKDYdY8GQEIov3HCkWVhrP3iLjp1hWmh6VWZix5fGwtfbRCngpzRRTRUD -BMfYqk5sNQwPCY74phytAwY5aDVchlckjo+lKPfADoeUDUHEPijSSycLFeE0gCuy -RgnUTZvVtwC8saS8SAECQ2ojdm+9Z8Ipf68ysbG9Uioi12vJCrOfNaVHMWYLczQe -q1Ms6yrDTzBqSjgL4LDbuw2U0C1gxK5ZSZq+BVzwn0qbiUIA9ioLtGYiUGURw5+i -K7SavKf4NMgGfQzhMn02SbupGgdcIapgzseNAgMBAAGjfzB9MA4GA1UdDwEB/wQE -AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw -ADAdBgNVHQ4EFgQUmxH4EiI6noXA8tTH+dVq0vpMVFwwHwYDVR0jBBgwFoAUYjUx -lrW9gsYx7GSwowxQjcPbUxQwDQYJKoZIhvcNAQELBQADggEBAMWB9sEAF65Sc2p5 -LTDc04vd37wtEolHLz9LaKl/Y1ywXkJrI9v8TJK32KAsGVqNU+puaDdsjixzuLNa -Iwx5IllVKzgySxauhleSiEivniP7B9uHmiA/q2Lu0QgAD5s7JF03zgA9BZ/CQBa3 -Ii1O8jGH0iqw/QWLvRKoIQlLahIbu1Ekfx595AcxD53fdmDl9e7hcBzOaHFX9xu5 -n623mcylVPcRVYClu6cmipPPjc8t0yjdtj+0omFDC/5/6KicA4LwMAuTpgUKl6ea -HTQmw11l2/FYDbor8bE2XRjyfTmbX64mo8eRIcYL7CJWrtwkaIDZg6WngsWkHCnE -W14BZiQ= ------END CERTIFICATE----- diff --git a/kube-controllers/tests/certs/ca-config.json b/kube-controllers/tests/certs/ca-config.json deleted file mode 100644 index a63e0dd23e5..00000000000 --- a/kube-controllers/tests/certs/ca-config.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "expiry": "8760h" - }, - "profiles": { - "kubernetes": { - "usages": ["signing", "key encipherment", "server auth", "client auth"], - "expiry": "8760h" - } - } - } -} diff --git a/kube-controllers/tests/certs/ca-csr.json b/kube-controllers/tests/certs/ca-csr.json deleted file mode 100644 index 8145e5036c5..00000000000 --- a/kube-controllers/tests/certs/ca-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "Kubernetes", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "CA", - "ST": "Oregon" - } - ] -} diff --git a/kube-controllers/tests/certs/ca-key.pem b/kube-controllers/tests/certs/ca-key.pem deleted file mode 100644 index b9f3a63b2df..00000000000 --- a/kube-controllers/tests/certs/ca-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA5LlDBZ6hH9U5t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka -0Mmq98pDwdGC5hgsERXOUfOVnX3/TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSTh -xIuz1vRcb1tl0maKNs1AYDHbm2SVlxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFih -ztaFhPCCC6w6ZPYnqAQgMU0QHphWEZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9 -cWY2huRmwId7K516CYwBOm0PYZue3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+a -kDIByoJV8oMaagtoQ7BSaZ9bBy3GhBpjdz2jrwIDAQABAoIBAAk8CZ6yduLoIvpu -RLYHktvHFD/dD220S0jJDi/J0He4NgulUpXXbpWujunGYbiUhULzVG8unH3NVn9u -/a+dzCpC9ch8q+8tr8SdLeDAzKxHYUSErrDWyx4Eo67DS+sgxLfNtamsmac+emOt -L7Q273Ga94eea9THUIfU1b8IjOkZj2LUnVWW/0DTBFi5Vq/4HY4+x8ErWBzXFeAv -2xil5fRwBoLqSsapaUmsmxsNAIyiqcf6gtIZoNUSw3nTDBQiO6KC4aVuZ42pimrJ -CHplTvqXW+f9kohZZUwGa7BT8wSo40aasaLBAffmcgE68Hin+zSeRoDE0bVs868M -wP/jXJECgYEA9nZqVCFcqkuiXSuSfLYrfvjXftq2JnNNLkrB9Uq/gAgz8TVMT/qD -bIJ2seNXA3wzFsZERRjx2BgtocwjpweOyKNf3uOEQiZgh5e618ATr6uuNmF3u/fy -EXG3CBqK9Lh52NWEB4C0T7OD42ru6MN7aYRY30ZuvZaXPbC1T7o04fsCgYEA7ZMd -seQCxcM+jQDVGwQ9pMeF1WT+5Du4zOb4vsNEf3oDusnwztbfYCnbVET4vKfFKwAM -C/mYqBaEaASX47M3izUqw7AbmMlY4dWahzBoLHfHbE1gjadVtHqULEhJTKXZqfZz -w0ubbLqnk0MuorGMVP2BVKgwkZzV5R/6dDuMSt0CgYBP9Y79iG1V2n/slkxKJZfq -87SGNVLPGq05jYtrlzqVwROI9++wKugkdhcoE0eRm+O/ScewWy1rHD0BtwcCE5Oh -SE+8Mjggde7vTqyRfoFkhuBYSDreQszIGAp3mJToXEk7rdnNzVWyXd02FOU5ouIR -E5z5oxIedBLRMtk/6ntprQKBgQCJUvJlM0EPAy6S3ppQBYGET/hiQwC6+HJ3rkK2 -MbTUYrjpLXVOehGgSlGHQl7s3aUwl9Rez6WX83wRjCYn7h37D35qos8w36HK2Gd8 -IVT17z6MsaVP/BukOP6RIi+MaImKnvSHPJrYnIPksX6xeCN/tREe2CFK6fcRfAyP -RyRu2QKBgQDMGJ35UVhn62fqSFIzAARsGdnhg2PzmSza2abF69E1CiHBT/gOEpsK -dGmDSDHqcNl151roBeUYxZ8Vclr2rYuZEoIXuV50GUC9+jJEUsA1E0fR/73klfJT -3KzomlRJJx6F5dppYU8DztB8jgfNfhcdFVDQXNZyv8ZbC0+oEvs+2Q== ------END RSA PRIVATE KEY----- diff --git a/kube-controllers/tests/certs/ca.csr b/kube-controllers/tests/certs/ca.csr deleted file mode 100644 index 326059f79c6..00000000000 --- a/kube-controllers/tests/certs/ca.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICrTCCAZUCAQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNB -MRMwEQYDVQQDEwpLdWJlcm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEA5LlDBZ6hH9U5t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka0Mmq98pD -wdGC5hgsERXOUfOVnX3/TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSThxIuz1vRc -b1tl0maKNs1AYDHbm2SVlxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFihztaFhPCC -C6w6ZPYnqAQgMU0QHphWEZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9cWY2huRm -wId7K516CYwBOm0PYZue3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+akDIByoJV -8oMaagtoQ7BSaZ9bBy3GhBpjdz2jrwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEB -AKSs0yd6LXfAr5SOPycDXCAj/vszZaL1XedpFYiq9YXhyhx7SLpJ7QpRCrShMXcI -MgPXSmHfbf/Yc72HySRsbJ1j8XCVOnRsGheS17twJpI7Sekaphgq/zsNJH46GtIl -MfyPPFiB+zuVEkHhwUK8448KwfDsOTuXdVkDJAX/2o0VY1MK0OD1dy5or+6BUulj -mtXhw62vl75HX4rh9mEvveoUd/pPfJ0Hx4IpjHAz137zUX3Yb9xTo1Vw69d0qg73 -ofPPp3lcn0uD6YHmb+zNhPpsG7jruHJ/mKOunEo2G+5CGZkUMwujiwomEuQ7V/9v -iBWJ7sALM81UbGH5nQHq7/Q= ------END CERTIFICATE REQUEST----- diff --git a/kube-controllers/tests/certs/ca.pem b/kube-controllers/tests/certs/ca.pem deleted file mode 100644 index 1456904abbb..00000000000 --- a/kube-controllers/tests/certs/ca.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDoDCCAoigAwIBAgIUYJhXyAkmYfFbFc1aKKd4wfqk2jYwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMjAwMFoXDTI2MDkyODIyMjAwMFowaDEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -EzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQDEwpLdWJl -cm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5LlDBZ6hH9U5 -t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka0Mmq98pDwdGC5hgsERXOUfOVnX3/ -TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSThxIuz1vRcb1tl0maKNs1AYDHbm2SV -lxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFihztaFhPCCC6w6ZPYnqAQgMU0QHphW -EZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9cWY2huRmwId7K516CYwBOm0PYZue -3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+akDIByoJV8oMaagtoQ7BSaZ9bBy3G -hBpjdz2jrwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB -/zAdBgNVHQ4EFgQUYjUxlrW9gsYx7GSwowxQjcPbUxQwDQYJKoZIhvcNAQELBQAD -ggEBANBzL9fFJhyJNIoARNiGHSFaKGoqEJPCP793cMdSlWoTApfQk8qNHXVGeC9J -R9l3U+I7QiJLjy3rtoDHrXwyCusnaqvReUA+hGAVQm5PZu9OETFzzFu4dTZJd3E0 -M8vwt4yRdDtl5LVjYRo7yEjJyb7jssaV3bSz7VZnwHACT9hBxPu+3VAgFxrRBy9c -uqWzxlx+cBagHLTA7YurHG41AFFH1Z10vU2MisTLf5k6k4uMeEAgE/tUDB+gZNkT -0+hUjAhZR0uikDoeqSXDoh9NvLrpjt1raQzvksBVRNcuoGWQMjF3USkBJE5jQuLc -+Q7J/UKfb8YZIw69kidmDLq/5Gk= ------END CERTIFICATE----- diff --git a/kube-controllers/tests/certs/kube-controller-manager.kubeconfig b/kube-controllers/tests/certs/kube-controller-manager.kubeconfig deleted file mode 100644 index b06f1b69a84..00000000000 --- a/kube-controllers/tests/certs/kube-controller-manager.kubeconfig +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - insecure-skip-tls-verify: true - name: test-apiserver -contexts: -- context: - cluster: test-apiserver - user: system:kube-controller-manager - name: default -current-context: default -kind: Config -preferences: {} -users: -- name: system:kube-controller-manager - user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQ4VENDQXRtZ0F3SUJBZ0lVU2pPU2g4bWN3UG4vUlBzRlZuWi9WZTV1SlFBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2FERUxNQWtHQTFVRUJoTUNWVk14RHpBTkJnTlZCQWdUQms5eVpXZHZiakVSTUE4R0ExVUVCeE1JVUc5eQpkR3hoYm1ReEV6QVJCZ05WQkFvVENrdDFZbVZ5Ym1WMFpYTXhDekFKQmdOVkJBc1RBa05CTVJNd0VRWURWUVFECkV3cExkV0psY201bGRHVnpNQjRYRFRJeE1Ea3lPVEl5TWpBd01Gb1hEVEl5TURreU9USXlNakF3TUZvd2ZERUwKTUFrR0ExVUVCaE1DVlZNeER6QU5CZ05WQkFnVEJrOXlaV2R2YmpFUk1BOEdBMVVFQnhNSVVHOXlkR3hoYm1ReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1TQXdIZ1lEVlFRTEV4ZExkV0psY201bGRHVnpJRlJvClpTQklZWEprSUZkaGVURU9NQXdHQTFVRUF4TUZZV1J0YVc0d2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUIKRHdBd2dnRUtBb0lCQVFER0FXbkVwRFBVeXFvUlJ2b2VjSEdsWjI3N2NabFBLM3MwTEt4Nmo0NnVOdGIxVTVNcwpWOXZBRnRvV0tEWWRZOEdRRUlvdjNIQ2tXVmhyUDNpTGpwMWhXbWg2VldaaXg1Zkd3dGZiUkNuZ3B6UlJUUlVECkJNZllxazVzTlF3UENZNzRwaHl0QXdZNWFEVmNobGNram8rbEtQZkFEb2VVRFVIRVBpalNTeWNMRmVFMGdDdXkKUmduVVRadlZ0d0M4c2FTOFNBRUNRMm9qZG0rOVo4SXBmNjh5c2JHOVVpb2kxMnZKQ3JPZk5hVkhNV1lMY3pRZQpxMU1zNnlyRFR6QnFTamdMNExEYnV3MlUwQzFneEs1WlNacStCVnp3bjBxYmlVSUE5aW9MdEdZaVVHVVJ3NStpCks3U2F2S2Y0Tk1nR2ZRemhNbjAyU2J1cEdnZGNJYXBnenNlTkFnTUJBQUdqZnpCOU1BNEdBMVVkRHdFQi93UUUKQXdJRm9EQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0RBUVlJS3dZQkJRVUhBd0l3REFZRFZSMFRBUUgvQkFJdwpBREFkQmdOVkhRNEVGZ1FVbXhINEVpSTZub1hBOHRUSCtkVnEwdnBNVkZ3d0h3WURWUjBqQkJnd0ZvQVVZalV4CmxyVzlnc1l4N0dTd293eFFqY1BiVXhRd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNV0I5c0VBRjY1U2MycDUKTFREYzA0dmQzN3d0RW9sSEx6OUxhS2wvWTF5d1hrSnJJOXY4VEpLMzJLQXNHVnFOVStwdWFEZHNqaXh6dUxOYQpJd3g1SWxsVkt6Z3lTeGF1aGxlU2lFaXZuaVA3Qjl1SG1pQS9xMkx1MFFnQUQ1czdKRjAzemdBOUJaL0NRQmEzCklpMU84akdIMGlxdy9RV0x2UktvSVFsTGFoSWJ1MUVrZng1OTVBY3hENTNmZG1EbDllN2hjQnpPYUhGWDl4dTUKbjYyM21jeWxWUGNSVllDbHU2Y21pcFBQamM4dDB5amR0aiswb21GREMvNS82S2ljQTRMd01BdVRwZ1VLbDZlYQpIVFFtdzExbDIvRllEYm9yOGJFMlhSanlmVG1iWDY0bW84ZVJJY1lMN0NKV3J0d2thSURaZzZXbmdzV2tIQ25FClcxNEJaaVE9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBeGdGcHhLUXoxTXFxRVViNkhuQnhwV2R1KzNHWlR5dDdOQ3lzZW8rT3JqYlc5Vk9UCkxGZmJ3QmJhRmlnMkhXUEJrQkNLTDl4d3BGbFlhejk0aTQ2ZFlWcG9lbFZtWXNlWHhzTFgyMFFwNEtjMFVVMFYKQXdUSDJLcE9iRFVNRHdtTytLWWNyUU1HT1dnMVhJWlhKSTZQcFNqM3dBNkhsQTFCeEQ0bzBrc25DeFhoTklBcgpza1lKMUUyYjFiY0F2TEdrdkVnQkFrTnFJM1p2dldmQ0tYK3ZNckd4dlZJcUl0ZHJ5UXF6bnpXbFJ6Rm1DM00wCkhxdFRMT3NxdzA4d2FrbzRDK0N3MjdzTmxOQXRZTVN1V1VtYXZnVmM4SjlLbTRsQ0FQWXFDN1JtSWxCbEVjT2YKb2l1MG1yeW4rRFRJQm4wTTRUSjlOa203cVJvSFhDR3FZTTdIalFJREFRQUJBb0lCQUFZSzVQOXJRMm1yQmFXaApWT0M0N2I3dWVTU1RRdXAzbVRydVloVWJiRzlFblNxL2NpNVlRQXlNcGZzbkh2K21tN0daejUzR1RHbTNrRXMxCmxLZ3RvZi9ta21tcFVZYVNNTCtRRXFaT1hqak00WHZacmxwNU91QVIwbkxhNjVOSjUyTVBMckRZOXNlcHRuY3MKWWx4clBWYjgrUktUWHUvVnQ3d1ZhWW1CWVorazdZR084RDN1b2hSZnd4ZHl5R2Q0NDFBY0ZISDhvb3NjYlZCNQp4dGRGd3IrTzR2OEpUMGdvQ3lFOVhxajJXK2g3SDdrbUhOcU41UVQ1QnNEYXNUVnJXa3F0Q042RCs5QmN4OTJsClp0cGpUa3g1SW9CekQ0QUx6QWRzNWxIREEvWEhjSWhjOEhGU3Y2NFdEYmNQeHJDbDVWTzhwUDFKb3BvNVBZcjIKTGJzWFZBRUNnWUVBei9wbWlaRWpEWmUvd2t5eC95Wm9Qc1YyVmFVZitscXMzSlZwT2l1U0pVVVErb0hydjYyTApqL0hzb0tGUDZ5WHlZQ2pqdDBmb3FQWlVTZW9ObnpoTTFaTTlpUkFOb21va0F3THFja3d2ZEdyNHA5U0RLdE41CnhiTXp2MVhhalhGVG51Y0s2b25CYWo3QlhBdmNjR3JzT29zY3pUNFAyb0ZYRVpuRUlUOFpRbDBDZ1lFQTg3bUgKL3JDa0FmN2czTFZTMlZ6Ry9tbVZzY0ZhSnh6akh0RVNFeDhoZ1E0dnY3Q2I0UTMxYkE5Zm4zNUhhRnU4OHVmMQpIb3VvR0hBdStqVTdLTHVsVzQ0NlFQRHh1bnQrRG1oeE5lOGhPdFVyandUZXNNcTE0RDVIMDFSbWJSSFZEZDlFCjVHdjVoYVQ1eVRoeE5MekZUZ2dDSTI4dnAxRkE4U0FZMXNzTHB2RUNnWUJHVjdUU2xvbzZrTGJFNnRmUktwWmIKbE1IZldjZ2xEd0lrWVV5RDVqUzU4bEE1eWpPSVV4US9EVjR4UGg0ZnRHZno2aUNLM3dGc0ZGU1I0MTNVR21DeQpZK2lPTVNYTFp3YmpGZHRoNlM2cnUzcDZtVC83L2liVG5UYkZZaTVYWkpzWnhaOUZrRzRnbHpVakFzZitKY3ZjClNTem1walVLZkhDTWZXdCtxeTdKNlFLQmdBdmxqNFRZSEhsWWRxTnZXbWJ2eDJyZHZvZlp0MHZYZGlLbjgranAKQ1JxaWxhUVd1OVVsZUVoWkM4TGVTQ0FJOGxVdEMyTDlVQ3c1TmFIUy9WdEVwWkt0ZzV4dDVtN0MzbWxYb2NjUApNQ0VPREwxRGNKZFNuY1FmWmlRanA0aEZhWS91eVE4WlVpbTYzdEo2cGRQOEx1bGJMTGVNRXRobzkvR05Mb2sxCmloRVJBb0dCQUpHNkhLV3JlczlNOTViYjBzb2g3by9xd1YvSVZnTTZBSXlQYzMxb2tmc3ltOGJJWldxQzNjWFMKbDZGODdjTFQvS1QyWWNLYVFSYVpRMEhsOThNTG0va2lTeXhVTXNxcktCR21MZVZSOWJyS1c3RWUvb0c2QWJlKwpPRE1oQmNhSlZERGRGNW5JTnNzT0p0UUx4Z25TalFZQXdhTTF4TGcveDJVbXdLUVNyR0hSCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== diff --git a/kube-controllers/tests/certs/kubeconfig b/kube-controllers/tests/certs/kubeconfig deleted file mode 100644 index b9a24ba8a10..00000000000 --- a/kube-controllers/tests/certs/kubeconfig +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - insecure-skip-tls-verify: true - server: https://127.0.0.1:6443 - name: test-apiserver -contexts: -- context: - cluster: test-apiserver - user: admin - name: admin -current-context: admin -kind: Config -users: -- name: admin - user: - client-certificate: /home/user/certs/admin.pem - client-key: /home/user/certs/admin-key.pem diff --git a/kube-controllers/tests/certs/kubernetes-csr.json b/kube-controllers/tests/certs/kubernetes-csr.json deleted file mode 100644 index 778db6322c2..00000000000 --- a/kube-controllers/tests/certs/kubernetes-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "kubernetes", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/kube-controllers/tests/certs/kubernetes-key.pem b/kube-controllers/tests/certs/kubernetes-key.pem deleted file mode 100644 index 98b8676abcc..00000000000 --- a/kube-controllers/tests/certs/kubernetes-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpgIBAAKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeIQcuiW8CV2JwNk4KI80kO -n76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLjarXppB0uPduIERTNc4Xv3 -/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6u+B1LqIlktMTOD+93UFi -lsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D40KYRo/7WGQDz9YLWNKqh -vGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2NlwupzpqoXwxd9e1IEMhzmGRHcC -+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQABAoIBAQC6uU4whPi09vRO -htTooxZshPRRamEMafjYJQmbbnsqp016AQjUaIz2nNWd2536AAlKOc/FTFx3xaEX -QX5xZZ2S7IYGLkdTAkFhsQYI49FxAA5CBz02nAsccjsDQ/AoyXXSEJzBKAk8XBiG -ZeiA/StY+cVvK4D0G7FFSsUnZlzz9uMrMHyQKKrRR8KkU+QnAjZnxqPkckc10K1H -1ZNumS3Jx4hRVSi5KXjCjNbqf79nBWJ96iSczev97CT+WZ1GnAPQtuWwHD2rjZmy -0DKsLnRujD8u+lJjBEhbSrdLYMDNJsO1SAtpYN9W94+8f9ZQDxNBRJ1C4f5XTLii -ymnkPD9xAoGBAPsMOPeNRgS7Z2Bwgs4gr4x53AJrYc0nIanm01d89aVWA5c+V4NJ -6+KtLjZepRcjKV6MGt+y3MR/52lUj3cgeYwVERwkIyvIVyDuSaqcc7RYlPDwAsuN -h3G/Wg8blQxDmvbRZDLTwjOsfvCG7s8VQEeJHoyJYT81F/oD/d1z4oXtAoGBAPeQ -bDJa0x7ciZcf97SY0DnnIfT1kiDIk5q1UEi4DNtVFQX/BQxsvkwyhdttVLuFe8gw -2hkiG6QavSHhxtgwGtnGMVZgDpSdrk7zLVIVERCN2EB5Lo1+a/JYkVhYedmTGqu1 -HnM2rrFPjPD04EriNKewJAx/dC8q2dBS9/N/T8xvAoGBAOX4vVqwdJqzHbDvgDPZ -J1cU7mDdA3uORD1CsQls9A3gLGvo9PvUxJwirrmpm6wFTslIqPmQ/MGYtWD80Gt9 -OTsEtWbFB978qCwHfT4oEan8l3vbMYRMAu5FLve1+aSBbbx59kLFTxpNAv/Na4gR -3I9rYau10Xq4ZV1nOLAbjz/FAoGBAIxrgcNqGvgVVYG/4yuvxeQiAvPD2tf3jSmi -kGA+7SP3dY5KIV3zzFjCC4Tz1azrwNNDSmIZI56IgCDYxIXZe1FtBo0cvQh1C+rC -KkG1q1E9c5zWX55oR+hVblOzE6Jiuy0L9bKaIKp4GdSOwS4Yco9u7HOeU5Nxdcyh -UvztiKDHAoGBAO4i6SArmLYc/e2m/npAW/jTts3Q7pNlywAlVFo8ZDdYADY+1wtO -5GL1VqoWPND8LMPVLJzfnyMeeo+g1xjezY/QciS3NSR9kgM9quqi1jl+fgLwQVbf -Snx348RF4B8r8vtfH5q1pS9NM4G3zQWYhlJv8TVgGON8yJNfoh80N1Qy ------END RSA PRIVATE KEY----- diff --git a/kube-controllers/tests/certs/kubernetes.csr b/kube-controllers/tests/certs/kubernetes.csr deleted file mode 100644 index 9b32900a447..00000000000 --- a/kube-controllers/tests/certs/kubernetes.csr +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIDXzCCAkcCAQAwfTELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxIDAeBgNVBAsTF0t1 -YmVybmV0ZXMgVGhlIEhhcmQgV2F5MRMwEQYDVQQDEwprdWJlcm5ldGVzMIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeI -QcuiW8CV2JwNk4KI80kOn76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLja -rXppB0uPduIERTNc4Xv3/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6 -u+B1LqIlktMTOD+93UFilsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D4 -0KYRo/7WGQDz9YLWNKqhvGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2Nlwupzp -qoXwxd9e1IEMhzmGRHcC+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQAB -oIGcMIGZBgkqhkiG9w0BCQ4xgYswgYgwgYUGA1UdEQR+MHyCCmt1YmVybmV0ZXOC -Emt1YmVybmV0ZXMuZGVmYXVsdIIWa3ViZXJuZXRlcy5kZWZhdWx0LnN2Y4Iea3Vi -ZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyghxrdWJlcm5ldGVzLnN2Yy5jbHVz -dGVyLmxvY2FshwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQARwbt/QbJlGgdV5v9K -40JvhD4GPqQDdU15gZlht7/Cz1YPlIjqZy0TUaEwVYNFw8W8UW2LYhCXzBsTsHw3 -pfQw6DRjvPcceCn/UH3S2F9FjLZ9rrvu79TX7uUBAl5PDkN8MuciijlFDoHN2hX5 -1ApEWZi1V6G2akzocbywkh5bpf+WBZszWsvoC6nYB4ghK85Z0yqIAwbCKORXwSNn -DtQ9VmMtg/vyWj6gg9K/bYh0Bh3l4FONsqO4VbX7+meiEy8Ony7f04m05IkJDcO8 -mKF3OTuUMkBMEMVkZKXJJ9iI+TIrtQ6xbPc3Ctm199OXK4i65WMaO9llQ9q9iByX -py8d ------END CERTIFICATE REQUEST----- diff --git a/kube-controllers/tests/certs/kubernetes.pem b/kube-controllers/tests/certs/kubernetes.pem deleted file mode 100644 index 96505e7f255..00000000000 --- a/kube-controllers/tests/certs/kubernetes.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEfjCCA2agAwIBAgIUepjO3FMlyIcWiO0N4/GJgV6Uj/QwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMzEwMFoXDTIyMDkyOTIyMzEwMFowfTEL -MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx -EzARBgNVBAoTCkt1YmVybmV0ZXMxIDAeBgNVBAsTF0t1YmVybmV0ZXMgVGhlIEhh -cmQgV2F5MRMwEQYDVQQDEwprdWJlcm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeIQcuiW8CV2JwNk4KI80kO -n76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLjarXppB0uPduIERTNc4Xv3 -/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6u+B1LqIlktMTOD+93UFi -lsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D40KYRo/7WGQDz9YLWNKqh -vGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2NlwupzpqoXwxd9e1IEMhzmGRHcC -+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQABo4IBCTCCAQUwDgYDVR0P -AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB -Af8EAjAAMB0GA1UdDgQWBBQNhPCXoXrtgP0M8NPQipbRggdk9DAfBgNVHSMEGDAW -gBRiNTGWtb2CxjHsZLCjDFCNw9tTFDCBhQYDVR0RBH4wfIIKa3ViZXJuZXRlc4IS -a3ViZXJuZXRlcy5kZWZhdWx0ghZrdWJlcm5ldGVzLmRlZmF1bHQuc3Zjgh5rdWJl -cm5ldGVzLmRlZmF1bHQuc3ZjLmNsdXN0ZXKCHGt1YmVybmV0ZXMuc3ZjLmNsdXN0 -ZXIubG9jYWyHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBALKCw/I9j3e5Q2NUGaSg -cUnVuzTwgJ46oTxoOm1mN6whPHe2ACPHWBKsCFhCtgMDEUy4hObrmzlEbzXhHeMr -Ri7+a0DnheYk8QDcR5nk0oxdG8XbFf6dBJdHLRMfTmYKPhFj1nM8Eh2xKZszdkIG -FWGL7Php/F3+HzwQj4rbZYDQMITiRR3ib+HU9m3aBu4VTLdAL/I4EizOXUc7LxDz -dyliu7xVzGweoYI5BE1PzaN0ClhOpvV4y9g2vUxuuqdWSo70pld712+hZ8qwAJgp -F+vvtmEfroJGckI6llbvhXmmV8Qek9ekpol2QeZDHgCX6wHw+sGVfT3oPMzI82jq -WcM= ------END CERTIFICATE----- diff --git a/kube-controllers/tests/certs/service-account-csr.json b/kube-controllers/tests/certs/service-account-csr.json deleted file mode 100644 index be3c0ca4b6a..00000000000 --- a/kube-controllers/tests/certs/service-account-csr.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "CN": "service-accounts", - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "C": "US", - "L": "Portland", - "O": "Kubernetes", - "OU": "Kubernetes The Hard Way", - "ST": "Oregon" - } - ] -} diff --git a/kube-controllers/tests/certs/service-account-key.pem b/kube-controllers/tests/certs/service-account-key.pem deleted file mode 100644 index 8213a751f69..00000000000 --- a/kube-controllers/tests/certs/service-account-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEA7F9N9m7yq96IetGBTJK4CIG1SB11NdeGXCZD943BHXTYdUvv -WTEkbwoWhMonyicghHmDzmJTf376Bk49yClC7tBx/5TQX4J95Y2mX3EThAdPyVvh -sjYJoYGY8nd7WvXlo33yEdTCnQUqSEZ8HXgu/iWB29Yu/4Rh2ZnxLnGQbLE4dJ5f -iu64sZtExeN/BF84DOaujqiv38jkL8ah9zxDutDMk2qTMneRi8e5ArukIM/GVKBx -mJMdafeL/emObBuaAIGJCM6yPUNB8Ry8RhugiRjyrDsDMKggMQOQkWr3QO9n7Twx -nIn6BoCxd2ea6VUi7Ib/ELgC8Ie2DNWIpzRUDwIDAQABAoIBAQDAGZx04Spbv9lP -Z6EbqEnkr/WyjC5L+cL6dSbbs9r0o5efjH0TEbs4ewxeEyVPR4lH4LHcM1EE1x8/ -rKrNV6tMBx/+xOSsGpNS0lIaUv23WXHghcnhWcVt+rNgqvYXsKxWuO7Yyv73OdFp -N89668fVSIpHLcS4aNBVVqUKR8VGbxkpPADTA8mJoJ3jwS/5GQMyd3L6kd3FvvTI -YeWOCXLY6QHNZ1OrnntNZt0J8ikZW/ntmB1tNrY/rblaTBtxGihmbHWgCWSEEZfZ -iWOgcljTCgug6bxALIGJF0mTheHkiY7RXjrmx1QMeq3yS07wPl3hlDCcCYKPTEvq -i193bV3hAoGBAPxGZet1YrIfilLJ70v+QrpywQaIey8WkfOUO8Adv3PmwFA33NrZ -PkEQjYsQm/IWkSfs9IZbIEXeOkZl5ozCdT4vj6xXT4FsnL79H39sSoqlhKVq5flW -UnZhAPUWq/U2B1RyC1HSwtZEHiK977nrxpNXRoNX2yiVj7hnmALql/hnAoGBAO/c -y0U0/NlfrMMq9KIZXHGM1IbIZFBeLnpfZD+apLrSkzoQvaxqF/3l2i7xD4WI6HZP -0mTuswyAT04wBb9WeMH1qWjk/O8OWtbqfFo/bL2KSALMjHN1zLrFhMMg7Rq8a5LP -BQTep+nEEFFGQI0LJKfJ1+7VwiVDs5Ryq6WyFx4ZAoGAGL9bLi70wJ6Bdj+i/uRx -bVLmhpqK4wKmzKtE9UK1zkvbn8LrInjfN4jFKdg2RBhcovsGvctgrhnvw4ophLNq -xu/pezGRdhPOiJnSJjDcWx+DlKqY5s3GByDa9DAGLGbhbzJE1AEF5fkGr8fMJYPw -lfGg1C+hKykI0UEwU1DqGY8CgYEA5qdufM2Ye7uqGT98YUh8AeFIGZgoBrSagyip -8RPXZqPJ2eNxUZPwIEJgzhUXNPTTfboCevajDNlx6aD6VeVkWDfQwcK5i3RFXDe+ -ftZQze9kkfR69yiHR+9aXH2UI8qes10J2YX2+C+G9XDV8AuQIx1Q3SWG/WieDpk6 -gCrCWjkCgYEAmX5u+Ka4Rx0cZcci/lDrjRWlhugH87rg+ZYQyCT8Pxq5Is3DUqQQ -9bArNFagKllb1DHjZjY5Lhts3S4Yn8exFpn2Qhg5j8SH8v03SQjAeKDFtsEnGPuQ -cygzKjNNTOh2NImfrrV41Fsid6qkCzzmBZ5WKjy0RXtAVTMBtlEfOM8= ------END RSA PRIVATE KEY----- diff --git a/kube-controllers/tests/certs/service-account.csr b/kube-controllers/tests/certs/service-account.csr deleted file mode 100644 index 5b7c710e31a..00000000000 --- a/kube-controllers/tests/certs/service-account.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICyTCCAbECAQAwgYMxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAP -BgNVBAcTCFBvcnRsYW5kMRMwEQYDVQQKEwpLdWJlcm5ldGVzMSAwHgYDVQQLExdL -dWJlcm5ldGVzIFRoZSBIYXJkIFdheTEZMBcGA1UEAxMQc2VydmljZS1hY2NvdW50 -czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOxfTfZu8qveiHrRgUyS -uAiBtUgddTXXhlwmQ/eNwR102HVL71kxJG8KFoTKJ8onIIR5g85iU39++gZOPcgp -Qu7Qcf+U0F+CfeWNpl9xE4QHT8lb4bI2CaGBmPJ3e1r15aN98hHUwp0FKkhGfB14 -Lv4lgdvWLv+EYdmZ8S5xkGyxOHSeX4ruuLGbRMXjfwRfOAzmro6or9/I5C/Gofc8 -Q7rQzJNqkzJ3kYvHuQK7pCDPxlSgcZiTHWn3i/3pjmwbmgCBiQjOsj1DQfEcvEYb -oIkY8qw7AzCoIDEDkJFq90DvZ+08MZyJ+gaAsXdnmulVIuyG/xC4AvCHtgzViKc0 -VA8CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQDS6T5JkfHATn6+47v4znVVvKfW -YiUbC0fRi7kMtnJMdhp8Oe8p2XXDmzBwaFVYneBhwSddKJG41snmYE8yv746guYh -ndnh/ZtXtP39E6q+dknMGfJ/LZyB6fPM3m7X2VMtww5uFfeXZyY4aE4GOIqRSkGO -KHP+0h6+MqE9AFYtjOuIpCSfmZ5XLf2PfxY9LxePMmhKCUV1qmf6ZftJ+LP/97H3 -RP7k+7zK8q+xq8ETE2Ub2Ux8s36EVykVzh06kElhsHK7nqkafyJE/8lkiaExTKvd -Kk5ii3CnQi6/RaZQ8TeNzjqcUMDfxigeh6JkC60xrhQThR10oUajxxd1Sg/N ------END CERTIFICATE REQUEST----- diff --git a/kube-controllers/tests/certs/service-account.pem b/kube-controllers/tests/certs/service-account.pem deleted file mode 100644 index 5abe649c2b8..00000000000 --- a/kube-controllers/tests/certs/service-account.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID+TCCAuGgAwIBAgIUHOMlm843n+Z1yg1UdqdWicQppzswDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y -dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMzYwMFoXDTIyMDkyOTIyMzYwMFowgYMx -CzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRsYW5k -MRMwEQYDVQQKEwpLdWJlcm5ldGVzMSAwHgYDVQQLExdLdWJlcm5ldGVzIFRoZSBI -YXJkIFdheTEZMBcGA1UEAxMQc2VydmljZS1hY2NvdW50czCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAOxfTfZu8qveiHrRgUySuAiBtUgddTXXhlwmQ/eN -wR102HVL71kxJG8KFoTKJ8onIIR5g85iU39++gZOPcgpQu7Qcf+U0F+CfeWNpl9x -E4QHT8lb4bI2CaGBmPJ3e1r15aN98hHUwp0FKkhGfB14Lv4lgdvWLv+EYdmZ8S5x -kGyxOHSeX4ruuLGbRMXjfwRfOAzmro6or9/I5C/Gofc8Q7rQzJNqkzJ3kYvHuQK7 -pCDPxlSgcZiTHWn3i/3pjmwbmgCBiQjOsj1DQfEcvEYboIkY8qw7AzCoIDEDkJFq -90DvZ+08MZyJ+gaAsXdnmulVIuyG/xC4AvCHtgzViKc0VA8CAwEAAaN/MH0wDgYD -VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV -HRMBAf8EAjAAMB0GA1UdDgQWBBR9pAvzY/VK7MAcOUPSk9iZ3FkwzjAfBgNVHSME -GDAWgBRiNTGWtb2CxjHsZLCjDFCNw9tTFDANBgkqhkiG9w0BAQsFAAOCAQEAd40A -HoVSjcjctv4Xg3H/E80AKAV41hwLZtXTI6ed/ERdgQQMotbW9pgXQix1qzvT6z9e -x+gIdpKE8h89u9wS+bYkthIKJRYRLc7ZJ9Aq+izlfLO/GjxfgBgbOBLMpNKNpmdf -NlOEfoKkLriE31f1oW9Xx3SYdqdaFQJDaDaRg5guQw0YT7PBIlHemmoYGujKNc8+ -iMWYa9aeGMM8yrpH5GRwUI7BAk0+fX4DhyokOuH3mpHXWWkKdVoIfpt3q+jznKYe -l7VaABvoHr3fx9oGhusuwDgLFssraMeIJigHi5ajOTWYw7u6yN2cjh+Ng7TZ+hf/ -+nhPbMGFM/GDpGVXmg== ------END CERTIFICATE----- diff --git a/kube-controllers/tests/testutils/utils.go b/kube-controllers/tests/testutils/utils.go index 6284f7fc2dd..3f4abf3354c 100644 --- a/kube-controllers/tests/testutils/utils.go +++ b/kube-controllers/tests/testutils/utils.go @@ -61,11 +61,11 @@ current-context: test-context` func BuildKubeconfig(apiserverIP string) string { // Load contents of test cert / key and fill them into the kubeconfig. - adminCertBytes, err := os.ReadFile(os.Getenv("CERTS") + "/admin.pem") + adminCertBytes, err := os.ReadFile(os.Getenv("CERTS_PATH") + "/admin.pem") Expect(err).NotTo(HaveOccurred()) encodedAdminCert := base64.StdEncoding.EncodeToString(adminCertBytes) - adminKeyBytes, err := os.ReadFile(os.Getenv("CERTS") + "/admin-key.pem") + adminKeyBytes, err := os.ReadFile(os.Getenv("CERTS_PATH") + "/admin-key.pem") Expect(err).NotTo(HaveOccurred()) encodedAdminKey := base64.StdEncoding.EncodeToString(adminKeyBytes) @@ -76,7 +76,7 @@ func BuildKubeconfig(apiserverIP string) string { func RunK8sApiserver(etcdIp string) *containers.Container { return containers.Run("st-apiserver", containers.RunOpts{AutoRemove: true}, - "-v", os.Getenv("CERTS")+":/home/user/certs", // Mount in location of certificates. + "-v", os.Getenv("CERTS_PATH")+":/home/user/certs", // Mount in location of certificates. "-v", os.Getenv("CRDS")+":/crds", "-e", "KUBECONFIG=/home/user/certs/kubeconfig", // We run kubectl from within this container. os.Getenv("KUBE_IMAGE"), @@ -101,7 +101,7 @@ func RunK8sApiserver(etcdIp string) *containers.Container { func RunK8sControllerManager(apiserverIp string) *containers.Container { c := containers.Run("st-controller-manager", containers.RunOpts{AutoRemove: true}, - "-v", os.Getenv("CERTS")+":/home/user/certs", // Mount in location of certificates. + "-v", os.Getenv("CERTS_PATH")+":/home/user/certs", // Mount in location of certificates. os.Getenv("KUBE_IMAGE"), "kube-controller-manager", fmt.Sprintf("--master=https://%v:6443", apiserverIp), diff --git a/lib.Makefile b/lib.Makefile index 57554685caa..2c949df2ccf 100644 --- a/lib.Makefile +++ b/lib.Makefile @@ -217,6 +217,10 @@ ifdef ARM_VERSION GOARCH_FLAGS :=-e GOARCH=arm -e GOARM=$(ARM_VERSION) endif +# Location of certificates used in UTs. +REPO_ROOT := $(shell git rev-parse --show-toplevel) +CERTS_PATH := $(REPO_ROOT)/hack/test/certs + # Set the platform correctly for building docker images so that # cross-builds get the correct architecture set in the produced images. ifeq ($(ARCH),arm64) diff --git a/node/Makefile b/node/Makefile index 4cc6df3c8b5..88ca0bfd52e 100644 --- a/node/Makefile +++ b/node/Makefile @@ -286,9 +286,9 @@ K8ST_IMAGE_TARS=calico-node.tar calico-apiserver.tar calico-cni.tar pod2daemon.t ## Run the ginkgo FVs fv: run-k8s-apiserver - docker run --rm \ - -v $(CURDIR)/../:/go/src/github.com/projectcalico/calico:rw \ - -e LOCAL_USER_ID=$(LOCAL_USER_ID) \ + $(DOCKER_RUN) \ + -v $(CERTS_PATH):/home/user/certs \ + -e KUBECONFIG=/go/src/github.com/projectcalico/calico/hack/tests/certs/kubeconfig \ -e ETCD_ENDPOINTS=http://$(LOCAL_IP_ENV):2379 \ -e GO111MODULE=on \ --net=host \ From 5552adf145c8cb347946aa03a9bae56e62209ac4 Mon Sep 17 00:00:00 2001 From: Shaun Crampton Date: Fri, 30 Sep 2022 15:18:10 +0100 Subject: [PATCH 2/3] Regenerate FV test keys and certificates; extend certs to 10 years. --- hack/test/certs/README.md | 2 + hack/test/certs/admin-key.pem | 50 +++++++++---------- hack/test/certs/admin.csr | 17 ------- hack/test/certs/admin.pem | 32 ++++++------ hack/test/certs/ca-config.json | 4 +- hack/test/certs/ca-key.pem | 50 +++++++++---------- hack/test/certs/ca.csr | 17 ------- hack/test/certs/ca.pem | 32 ++++++------ .../certs/kube-controller-manager.kubeconfig | 5 +- hack/test/certs/kubernetes-key.pem | 50 +++++++++---------- hack/test/certs/kubernetes.csr | 21 -------- hack/test/certs/kubernetes.pem | 38 +++++++------- hack/test/certs/regenerate.sh | 36 +++++++++++++ hack/test/certs/service-account-key.pem | 50 +++++++++---------- hack/test/certs/service-account.csr | 17 ------- hack/test/certs/service-account.pem | 32 ++++++------ 16 files changed, 210 insertions(+), 243 deletions(-) delete mode 100644 hack/test/certs/admin.csr delete mode 100644 hack/test/certs/ca.csr delete mode 100644 hack/test/certs/kubernetes.csr create mode 100755 hack/test/certs/regenerate.sh delete mode 100644 hack/test/certs/service-account.csr diff --git a/hack/test/certs/README.md b/hack/test/certs/README.md index 7ce867a88e1..48e1d5b49f4 100644 --- a/hack/test/certs/README.md +++ b/hack/test/certs/README.md @@ -2,3 +2,5 @@ The files in this directory are used only in the FV tests in this repository, and were generated according to the steps in [Kubernetes the hard way](https://github.com/kelseyhightower/kubernetes-the-hard-way). + +To regenerate them, run ./regenerate.sh. This completely deletes and recreates all the keys and certificates, including the root CA. diff --git a/hack/test/certs/admin-key.pem b/hack/test/certs/admin-key.pem index c29c9f95ef7..c0a3859622d 100644 --- a/hack/test/certs/admin-key.pem +++ b/hack/test/certs/admin-key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/hack/test/certs/admin.csr b/hack/test/certs/admin.csr deleted file mode 100644 index f8326afd804..00000000000 --- a/hack/test/certs/admin.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICwTCCAakCAQAwfDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMSAwHgYDVQQL -ExdLdWJlcm5ldGVzIFRoZSBIYXJkIFdheTEOMAwGA1UEAxMFYWRtaW4wggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGAWnEpDPUyqoRRvoecHGlZ277cZlP -K3s0LKx6j46uNtb1U5MsV9vAFtoWKDYdY8GQEIov3HCkWVhrP3iLjp1hWmh6VWZi -x5fGwtfbRCngpzRRTRUDBMfYqk5sNQwPCY74phytAwY5aDVchlckjo+lKPfADoeU -DUHEPijSSycLFeE0gCuyRgnUTZvVtwC8saS8SAECQ2ojdm+9Z8Ipf68ysbG9Uioi -12vJCrOfNaVHMWYLczQeq1Ms6yrDTzBqSjgL4LDbuw2U0C1gxK5ZSZq+BVzwn0qb -iUIA9ioLtGYiUGURw5+iK7SavKf4NMgGfQzhMn02SbupGgdcIapgzseNAgMBAAGg -ADANBgkqhkiG9w0BAQsFAAOCAQEAZprfwdXYJkVVQSBNHXUi2ePxKiU24EjqC1Yq -a4Z9NxzUrCPtaR8hVfo75t2c4vJLJcKdIkB0eGDJwcIOC5I1JIsgzLzQeXDElcKW -xGFF3L+W4R4iCQ5XxnfE2dpKt9xuaamxKflflPjbZFpX1w0Sj+DP8YjcuoXSJT78 -fdR2iVpUBy2CHa06Hz1rEBynqTziRtpS3lDaWZsAKtb/oP5zfJGlhzShV5DY6YMx -G7M9854qMSsdjmCWolQ3Bz/Wg77V98Mg5jeF5iua1OUpsomgIq9mKPb+Du/rxWqS -4ElAOicSc4zSHaADc/nm5GN+k0wRihkaS9yD/VHahSulfErKLg== ------END CERTIFICATE REQUEST----- diff --git a/hack/test/certs/admin.pem b/hack/test/certs/admin.pem index c51fffe8804..f1e5c871a73 100644 --- a/hack/test/certs/admin.pem +++ b/hack/test/certs/admin.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIUSjOSh8mcwPn/RPsFVnZ/Ve5uJQAwDQYJKoZIhvcNAQEL +MIID8TCCAtmgAwIBAgIUHai/CVF2nvg9Pk+BjpJ/ecfdTxYwDQYJKoZIhvcNAQEL BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMjAwMFoXDTIyMDkyOTIyMjAwMFowfDEL +EwpLdWJlcm5ldGVzMB4XDTIyMDkzMDE0MTIwMFoXDTMyMDkyNzE0MTIwMFowfDEL MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx FzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMSAwHgYDVQQLExdLdWJlcm5ldGVzIFRo ZSBIYXJkIFdheTEOMAwGA1UEAxMFYWRtaW4wggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQDGAWnEpDPUyqoRRvoecHGlZ277cZlPK3s0LKx6j46uNtb1U5Ms -V9vAFtoWKDYdY8GQEIov3HCkWVhrP3iLjp1hWmh6VWZix5fGwtfbRCngpzRRTRUD -BMfYqk5sNQwPCY74phytAwY5aDVchlckjo+lKPfADoeUDUHEPijSSycLFeE0gCuy -RgnUTZvVtwC8saS8SAECQ2ojdm+9Z8Ipf68ysbG9Uioi12vJCrOfNaVHMWYLczQe -q1Ms6yrDTzBqSjgL4LDbuw2U0C1gxK5ZSZq+BVzwn0qbiUIA9ioLtGYiUGURw5+i -K7SavKf4NMgGfQzhMn02SbupGgdcIapgzseNAgMBAAGjfzB9MA4GA1UdDwEB/wQE +DwAwggEKAoIBAQDpmtssZhSTLhKF59YnKR3+Gidj6Iot9E+huZG/2POCbfYDObXN +aDsX4DhsIVpKiwhDvG/F3mlBbPrE9gCtMCpWnzE4yIP/nMngNgRLrkC/c1WdpVjL +8Tn+s5DbhcWG/32G3Il/zlwsEUUfY6hfcM23xoYsMeAJeSpKZ/Go2V706hjzb0kt +zF+mbtNU0RF1FMJOCkv5wE0WRN8qt4SD91Amu9YN6pkndJO1GLMCZFxz6Opxft18 +hC1WKVwaAh7EgxM5bk3T5RnaJiyc+zuYvuK3TiP8TG0A+tR9LPxNzcjqRuxecaaX +aHi/T/voSr/kmCxF67/bnfQxCL6G904t6CkvAgMBAAGjfzB9MA4GA1UdDwEB/wQE AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw -ADAdBgNVHQ4EFgQUmxH4EiI6noXA8tTH+dVq0vpMVFwwHwYDVR0jBBgwFoAUYjUx -lrW9gsYx7GSwowxQjcPbUxQwDQYJKoZIhvcNAQELBQADggEBAMWB9sEAF65Sc2p5 -LTDc04vd37wtEolHLz9LaKl/Y1ywXkJrI9v8TJK32KAsGVqNU+puaDdsjixzuLNa -Iwx5IllVKzgySxauhleSiEivniP7B9uHmiA/q2Lu0QgAD5s7JF03zgA9BZ/CQBa3 -Ii1O8jGH0iqw/QWLvRKoIQlLahIbu1Ekfx595AcxD53fdmDl9e7hcBzOaHFX9xu5 -n623mcylVPcRVYClu6cmipPPjc8t0yjdtj+0omFDC/5/6KicA4LwMAuTpgUKl6ea -HTQmw11l2/FYDbor8bE2XRjyfTmbX64mo8eRIcYL7CJWrtwkaIDZg6WngsWkHCnE -W14BZiQ= +ADAdBgNVHQ4EFgQUymhMiUWfoHaS5ttoKMStFkE1+dkwHwYDVR0jBBgwFoAUst36 +o0Zrw9gzbRpG25nXzbbYeJowDQYJKoZIhvcNAQELBQADggEBALjUL4GcK0Fd+O21 +rj9ruHNZSyepoy7xrwlTr5C2/bQGqy7xbTOB83ingF/iDxEwMl3sKPcObn7hdhub +KjXd7g8lWbmyAtlP39Xj7To7YBMaygCQP6wdEhY9kHrFtow00ZWRZfBLkYYCHtwY +eeABGgH93dXGi8GJJwk1Mpt7DXvUk4/zyqdmb5yseFbQyMunh3hfuQWe0WRUuWQy +VTUibihrzhwO2ybrvFKFQrW/Vwn5BJoOLkZdLjr2qYhB2SvIDXMzdPJJ48Ytk5dw +R75IMpYclNFcHha5eY+hUTOdfCqI/dRLhG8oMdRRjclUQAWSdEgpGNIrpsNBNePb +XF0O6bo= -----END CERTIFICATE----- diff --git a/hack/test/certs/ca-config.json b/hack/test/certs/ca-config.json index a63e0dd23e5..b89b0e5ee99 100644 --- a/hack/test/certs/ca-config.json +++ b/hack/test/certs/ca-config.json @@ -1,12 +1,12 @@ { "signing": { "default": { - "expiry": "8760h" + "expiry": "87600h" }, "profiles": { "kubernetes": { "usages": ["signing", "key encipherment", "server auth", "client auth"], - "expiry": "8760h" + "expiry": "87600h" } } } diff --git a/hack/test/certs/ca-key.pem b/hack/test/certs/ca-key.pem index b9f3a63b2df..61e4dce9e8e 100644 --- a/hack/test/certs/ca-key.pem +++ b/hack/test/certs/ca-key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/hack/test/certs/ca.csr b/hack/test/certs/ca.csr deleted file mode 100644 index 326059f79c6..00000000000 --- a/hack/test/certs/ca.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICrTCCAZUCAQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNB -MRMwEQYDVQQDEwpLdWJlcm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEA5LlDBZ6hH9U5t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka0Mmq98pD -wdGC5hgsERXOUfOVnX3/TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSThxIuz1vRc -b1tl0maKNs1AYDHbm2SVlxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFihztaFhPCC -C6w6ZPYnqAQgMU0QHphWEZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9cWY2huRm -wId7K516CYwBOm0PYZue3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+akDIByoJV -8oMaagtoQ7BSaZ9bBy3GhBpjdz2jrwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEB -AKSs0yd6LXfAr5SOPycDXCAj/vszZaL1XedpFYiq9YXhyhx7SLpJ7QpRCrShMXcI -MgPXSmHfbf/Yc72HySRsbJ1j8XCVOnRsGheS17twJpI7Sekaphgq/zsNJH46GtIl -MfyPPFiB+zuVEkHhwUK8448KwfDsOTuXdVkDJAX/2o0VY1MK0OD1dy5or+6BUulj -mtXhw62vl75HX4rh9mEvveoUd/pPfJ0Hx4IpjHAz137zUX3Yb9xTo1Vw69d0qg73 -ofPPp3lcn0uD6YHmb+zNhPpsG7jruHJ/mKOunEo2G+5CGZkUMwujiwomEuQ7V/9v -iBWJ7sALM81UbGH5nQHq7/Q= ------END CERTIFICATE REQUEST----- diff --git a/hack/test/certs/ca.pem b/hack/test/certs/ca.pem index 1456904abbb..f3df39d269d 100644 --- a/hack/test/certs/ca.pem +++ b/hack/test/certs/ca.pem @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDoDCCAoigAwIBAgIUYJhXyAkmYfFbFc1aKKd4wfqk2jYwDQYJKoZIhvcNAQEL +MIIDoDCCAoigAwIBAgIUZ9G4++mqbQmeY41Wr/R25+VOcogwDQYJKoZIhvcNAQEL BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMjAwMFoXDTI2MDkyODIyMjAwMFowaDEL +EwpLdWJlcm5ldGVzMB4XDTIyMDkzMDE0MTIwMFoXDTI3MDkyOTE0MTIwMFowaDEL MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx EzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQDEwpLdWJl -cm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5LlDBZ6hH9U5 -t8By97UCENQUBYtx2gwXth2zEZvKvhURmDka0Mmq98pDwdGC5hgsERXOUfOVnX3/ -TPageE6KKhkoxmGQh5tHPKgy4kQ/9Y5fMSThxIuz1vRcb1tl0maKNs1AYDHbm2SV -lxUIEauZ4m8tuPsb+uLogQC7rpC7d6K8aFihztaFhPCCC6w6ZPYnqAQgMU0QHphW -EZUYVhf8o39bySL30sIwn7uOip6o4q8nhVN9cWY2huRmwId7K516CYwBOm0PYZue -3VEK58F1kvKvMpFS5w/RSJDWOWKbmSQY5z+akDIByoJV8oMaagtoQ7BSaZ9bBy3G -hBpjdz2jrwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB -/zAdBgNVHQ4EFgQUYjUxlrW9gsYx7GSwowxQjcPbUxQwDQYJKoZIhvcNAQELBQAD -ggEBANBzL9fFJhyJNIoARNiGHSFaKGoqEJPCP793cMdSlWoTApfQk8qNHXVGeC9J -R9l3U+I7QiJLjy3rtoDHrXwyCusnaqvReUA+hGAVQm5PZu9OETFzzFu4dTZJd3E0 -M8vwt4yRdDtl5LVjYRo7yEjJyb7jssaV3bSz7VZnwHACT9hBxPu+3VAgFxrRBy9c -uqWzxlx+cBagHLTA7YurHG41AFFH1Z10vU2MisTLf5k6k4uMeEAgE/tUDB+gZNkT -0+hUjAhZR0uikDoeqSXDoh9NvLrpjt1raQzvksBVRNcuoGWQMjF3USkBJE5jQuLc -+Q7J/UKfb8YZIw69kidmDLq/5Gk= +cm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwBXxhSA70k2M +G2vUwFGkRayzmYIQ1PhMl6gAcslB0wRHM7g3iYxHbL00ClNQLv+igei1UNKavFpi +SZ9XI/G0+p+Vc2zszbahZAG0pQDxOf4QreiiIVGJ1HgJ7NIqNJ3v2L9zRvwo5E0Q +osOLrl0QD9EhAPwu63N6bvoGi8isNu3Gl7pBwdxjSTmiUYT/mnW5cNETEKaTrAyU +J/8FqMjEj8X0B+jF354NVA+6XIPtVOmPgYjkbU9Z2aR0lmkd5nEDRf1+Rego2kOS +WdSXh19QlQ3eoXTJmLitriuKa9o0xXGxojV/33k9yDD70mKPgB6gEx0GMMA4dZ/5 +QpwLKLeGDQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQUst36o0Zrw9gzbRpG25nXzbbYeJowDQYJKoZIhvcNAQELBQAD +ggEBAK0QhITIJ4IEXU8XJaX3S/Ym3uZkxIY9go2/iCYd+q/KH0HDx4Nhsq5TyD5P +ZsTTS0R+rZ2d+mo6ESHcpxJYQAblAv4crIQFa/WkaUtOppE2hxUlBYTOkY4osmot +e9xtLc52/MfdvLjhWZ+0NznWHndfwXJSS7N8GiG33RqYj24w1R9Wh+MF9KMqmWnV +VEDINaykkWuPwalhRM4S9ZUs4dgyI4puXtShbed6EaaXFIUNEX9A7JHKiA0kKJmf +BbgLTG9BmBocUaUBzhyRDHAPEcJIze96wSgBcup78R9uDw9bDdTWtvBCLhr5AKWV +6UHxeJOsneRPdOwsH3CMN1GA0Xs= -----END CERTIFICATE----- diff --git a/hack/test/certs/kube-controller-manager.kubeconfig b/hack/test/certs/kube-controller-manager.kubeconfig index b06f1b69a84..87be48373a2 100644 --- a/hack/test/certs/kube-controller-manager.kubeconfig +++ b/hack/test/certs/kube-controller-manager.kubeconfig @@ -2,6 +2,7 @@ apiVersion: v1 clusters: - cluster: insecure-skip-tls-verify: true + server: "" name: test-apiserver contexts: - context: @@ -14,5 +15,5 @@ preferences: {} users: - name: system:kube-controller-manager user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQ4VENDQXRtZ0F3SUJBZ0lVU2pPU2g4bWN3UG4vUlBzRlZuWi9WZTV1SlFBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2FERUxNQWtHQTFVRUJoTUNWVk14RHpBTkJnTlZCQWdUQms5eVpXZHZiakVSTUE4R0ExVUVCeE1JVUc5eQpkR3hoYm1ReEV6QVJCZ05WQkFvVENrdDFZbVZ5Ym1WMFpYTXhDekFKQmdOVkJBc1RBa05CTVJNd0VRWURWUVFECkV3cExkV0psY201bGRHVnpNQjRYRFRJeE1Ea3lPVEl5TWpBd01Gb1hEVEl5TURreU9USXlNakF3TUZvd2ZERUwKTUFrR0ExVUVCaE1DVlZNeER6QU5CZ05WQkFnVEJrOXlaV2R2YmpFUk1BOEdBMVVFQnhNSVVHOXlkR3hoYm1ReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1TQXdIZ1lEVlFRTEV4ZExkV0psY201bGRHVnpJRlJvClpTQklZWEprSUZkaGVURU9NQXdHQTFVRUF4TUZZV1J0YVc0d2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUIKRHdBd2dnRUtBb0lCQVFER0FXbkVwRFBVeXFvUlJ2b2VjSEdsWjI3N2NabFBLM3MwTEt4Nmo0NnVOdGIxVTVNcwpWOXZBRnRvV0tEWWRZOEdRRUlvdjNIQ2tXVmhyUDNpTGpwMWhXbWg2VldaaXg1Zkd3dGZiUkNuZ3B6UlJUUlVECkJNZllxazVzTlF3UENZNzRwaHl0QXdZNWFEVmNobGNram8rbEtQZkFEb2VVRFVIRVBpalNTeWNMRmVFMGdDdXkKUmduVVRadlZ0d0M4c2FTOFNBRUNRMm9qZG0rOVo4SXBmNjh5c2JHOVVpb2kxMnZKQ3JPZk5hVkhNV1lMY3pRZQpxMU1zNnlyRFR6QnFTamdMNExEYnV3MlUwQzFneEs1WlNacStCVnp3bjBxYmlVSUE5aW9MdEdZaVVHVVJ3NStpCks3U2F2S2Y0Tk1nR2ZRemhNbjAyU2J1cEdnZGNJYXBnenNlTkFnTUJBQUdqZnpCOU1BNEdBMVVkRHdFQi93UUUKQXdJRm9EQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0RBUVlJS3dZQkJRVUhBd0l3REFZRFZSMFRBUUgvQkFJdwpBREFkQmdOVkhRNEVGZ1FVbXhINEVpSTZub1hBOHRUSCtkVnEwdnBNVkZ3d0h3WURWUjBqQkJnd0ZvQVVZalV4CmxyVzlnc1l4N0dTd293eFFqY1BiVXhRd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNV0I5c0VBRjY1U2MycDUKTFREYzA0dmQzN3d0RW9sSEx6OUxhS2wvWTF5d1hrSnJJOXY4VEpLMzJLQXNHVnFOVStwdWFEZHNqaXh6dUxOYQpJd3g1SWxsVkt6Z3lTeGF1aGxlU2lFaXZuaVA3Qjl1SG1pQS9xMkx1MFFnQUQ1czdKRjAzemdBOUJaL0NRQmEzCklpMU84akdIMGlxdy9RV0x2UktvSVFsTGFoSWJ1MUVrZng1OTVBY3hENTNmZG1EbDllN2hjQnpPYUhGWDl4dTUKbjYyM21jeWxWUGNSVllDbHU2Y21pcFBQamM4dDB5amR0aiswb21GREMvNS82S2ljQTRMd01BdVRwZ1VLbDZlYQpIVFFtdzExbDIvRllEYm9yOGJFMlhSanlmVG1iWDY0bW84ZVJJY1lMN0NKV3J0d2thSURaZzZXbmdzV2tIQ25FClcxNEJaaVE9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBeGdGcHhLUXoxTXFxRVViNkhuQnhwV2R1KzNHWlR5dDdOQ3lzZW8rT3JqYlc5Vk9UCkxGZmJ3QmJhRmlnMkhXUEJrQkNLTDl4d3BGbFlhejk0aTQ2ZFlWcG9lbFZtWXNlWHhzTFgyMFFwNEtjMFVVMFYKQXdUSDJLcE9iRFVNRHdtTytLWWNyUU1HT1dnMVhJWlhKSTZQcFNqM3dBNkhsQTFCeEQ0bzBrc25DeFhoTklBcgpza1lKMUUyYjFiY0F2TEdrdkVnQkFrTnFJM1p2dldmQ0tYK3ZNckd4dlZJcUl0ZHJ5UXF6bnpXbFJ6Rm1DM00wCkhxdFRMT3NxdzA4d2FrbzRDK0N3MjdzTmxOQXRZTVN1V1VtYXZnVmM4SjlLbTRsQ0FQWXFDN1JtSWxCbEVjT2YKb2l1MG1yeW4rRFRJQm4wTTRUSjlOa203cVJvSFhDR3FZTTdIalFJREFRQUJBb0lCQUFZSzVQOXJRMm1yQmFXaApWT0M0N2I3dWVTU1RRdXAzbVRydVloVWJiRzlFblNxL2NpNVlRQXlNcGZzbkh2K21tN0daejUzR1RHbTNrRXMxCmxLZ3RvZi9ta21tcFVZYVNNTCtRRXFaT1hqak00WHZacmxwNU91QVIwbkxhNjVOSjUyTVBMckRZOXNlcHRuY3MKWWx4clBWYjgrUktUWHUvVnQ3d1ZhWW1CWVorazdZR084RDN1b2hSZnd4ZHl5R2Q0NDFBY0ZISDhvb3NjYlZCNQp4dGRGd3IrTzR2OEpUMGdvQ3lFOVhxajJXK2g3SDdrbUhOcU41UVQ1QnNEYXNUVnJXa3F0Q042RCs5QmN4OTJsClp0cGpUa3g1SW9CekQ0QUx6QWRzNWxIREEvWEhjSWhjOEhGU3Y2NFdEYmNQeHJDbDVWTzhwUDFKb3BvNVBZcjIKTGJzWFZBRUNnWUVBei9wbWlaRWpEWmUvd2t5eC95Wm9Qc1YyVmFVZitscXMzSlZwT2l1U0pVVVErb0hydjYyTApqL0hzb0tGUDZ5WHlZQ2pqdDBmb3FQWlVTZW9ObnpoTTFaTTlpUkFOb21va0F3THFja3d2ZEdyNHA5U0RLdE41CnhiTXp2MVhhalhGVG51Y0s2b25CYWo3QlhBdmNjR3JzT29zY3pUNFAyb0ZYRVpuRUlUOFpRbDBDZ1lFQTg3bUgKL3JDa0FmN2czTFZTMlZ6Ry9tbVZzY0ZhSnh6akh0RVNFeDhoZ1E0dnY3Q2I0UTMxYkE5Zm4zNUhhRnU4OHVmMQpIb3VvR0hBdStqVTdLTHVsVzQ0NlFQRHh1bnQrRG1oeE5lOGhPdFVyandUZXNNcTE0RDVIMDFSbWJSSFZEZDlFCjVHdjVoYVQ1eVRoeE5MekZUZ2dDSTI4dnAxRkE4U0FZMXNzTHB2RUNnWUJHVjdUU2xvbzZrTGJFNnRmUktwWmIKbE1IZldjZ2xEd0lrWVV5RDVqUzU4bEE1eWpPSVV4US9EVjR4UGg0ZnRHZno2aUNLM3dGc0ZGU1I0MTNVR21DeQpZK2lPTVNYTFp3YmpGZHRoNlM2cnUzcDZtVC83L2liVG5UYkZZaTVYWkpzWnhaOUZrRzRnbHpVakFzZitKY3ZjClNTem1walVLZkhDTWZXdCtxeTdKNlFLQmdBdmxqNFRZSEhsWWRxTnZXbWJ2eDJyZHZvZlp0MHZYZGlLbjgranAKQ1JxaWxhUVd1OVVsZUVoWkM4TGVTQ0FJOGxVdEMyTDlVQ3c1TmFIUy9WdEVwWkt0ZzV4dDVtN0MzbWxYb2NjUApNQ0VPREwxRGNKZFNuY1FmWmlRanA0aEZhWS91eVE4WlVpbTYzdEo2cGRQOEx1bGJMTGVNRXRobzkvR05Mb2sxCmloRVJBb0dCQUpHNkhLV3JlczlNOTViYjBzb2g3by9xd1YvSVZnTTZBSXlQYzMxb2tmc3ltOGJJWldxQzNjWFMKbDZGODdjTFQvS1QyWWNLYVFSYVpRMEhsOThNTG0va2lTeXhVTXNxcktCR21MZVZSOWJyS1c3RWUvb0c2QWJlKwpPRE1oQmNhSlZERGRGNW5JTnNzT0p0UUx4Z25TalFZQXdhTTF4TGcveDJVbXdLUVNyR0hSCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== + client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQ4VENDQXRtZ0F3SUJBZ0lVSGFpL0NWRjJudmc5UGsrQmpwSi9lY2ZkVHhZd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2FERUxNQWtHQTFVRUJoTUNWVk14RHpBTkJnTlZCQWdUQms5eVpXZHZiakVSTUE4R0ExVUVCeE1JVUc5eQpkR3hoYm1ReEV6QVJCZ05WQkFvVENrdDFZbVZ5Ym1WMFpYTXhDekFKQmdOVkJBc1RBa05CTVJNd0VRWURWUVFECkV3cExkV0psY201bGRHVnpNQjRYRFRJeU1Ea3pNREUwTVRJd01Gb1hEVE15TURreU56RTBNVEl3TUZvd2ZERUwKTUFrR0ExVUVCaE1DVlZNeER6QU5CZ05WQkFnVEJrOXlaV2R2YmpFUk1BOEdBMVVFQnhNSVVHOXlkR3hoYm1ReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1TQXdIZ1lEVlFRTEV4ZExkV0psY201bGRHVnpJRlJvClpTQklZWEprSUZkaGVURU9NQXdHQTFVRUF4TUZZV1J0YVc0d2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUIKRHdBd2dnRUtBb0lCQVFEcG10c3NaaFNUTGhLRjU5WW5LUjMrR2lkajZJb3Q5RStodVpHLzJQT0NiZllET2JYTgphRHNYNERoc0lWcEtpd2hEdkcvRjNtbEJiUHJFOWdDdE1DcFduekU0eUlQL25NbmdOZ1JMcmtDL2MxV2RwVmpMCjhUbitzNURiaGNXRy8zMkczSWwvemx3c0VVVWZZNmhmY00yM3hvWXNNZUFKZVNwS1ovR28yVjcwNmhqemIwa3QKekYrbWJ0TlUwUkYxRk1KT0NrdjV3RTBXUk44cXQ0U0Q5MUFtdTlZTjZwa25kSk8xR0xNQ1pGeHo2T3B4ZnQxOApoQzFXS1Z3YUFoN0VneE01YmszVDVSbmFKaXljK3p1WXZ1SzNUaVA4VEcwQSt0UjlMUHhOemNqcVJ1eGVjYWFYCmFIaS9UL3ZvU3Iva21DeEY2Ny9ibmZReENMNkc5MDR0NkNrdkFnTUJBQUdqZnpCOU1BNEdBMVVkRHdFQi93UUUKQXdJRm9EQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0RBUVlJS3dZQkJRVUhBd0l3REFZRFZSMFRBUUgvQkFJdwpBREFkQmdOVkhRNEVGZ1FVeW1oTWlVV2ZvSGFTNXR0b0tNU3RGa0UxK2Rrd0h3WURWUjBqQkJnd0ZvQVVzdDM2Cm8wWnJ3OWd6YlJwRzI1blh6YmJZZUpvd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFMalVMNEdjSzBGZCtPMjEKcmo5cnVITlpTeWVwb3k3eHJ3bFRyNUMyL2JRR3F5N3hiVE9CODNpbmdGL2lEeEV3TWwzc0tQY09ibjdoZGh1YgpLalhkN2c4bFdibXlBdGxQMzlYajdUbzdZQk1heWdDUVA2d2RFaFk5a0hyRnRvdzAwWldSWmZCTGtZWUNIdHdZCmVlQUJHZ0g5M2RYR2k4R0pKd2sxTXB0N0RYdlVrNC96eXFkbWI1eXNlRmJReU11bmgzaGZ1UVdlMFdSVXVXUXkKVlRVaWJpaHJ6aHdPMnlicnZGS0ZRclcvVnduNUJKb09Ma1pkTGpyMnFZaEIyU3ZJRFhNemRQSko0OFl0azVkdwpSNzVJTXBZY2xORmNIaGE1ZVkraFVUT2RmQ3FJL2RSTGhHOG9NZFJSamNsVVFBV1NkRWdwR05JcnBzTkJOZVBiClhGME82Ym89Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBNlpyYkxHWVVreTRTaGVmV0p5a2QvaG9uWStpS0xmUlBvYm1SdjlqemdtMzJBem0xCnpXZzdGK0E0YkNGYVNvc0lRN3h2eGQ1cFFXejZ4UFlBclRBcVZwOHhPTWlELzV6SjREWUVTNjVBdjNOVm5hVlkKeS9FNS9yT1EyNFhGaHY5OWh0eUpmODVjTEJGRkgyT29YM0ROdDhhR0xESGdDWGtxU21meHFObGU5T29ZODI5SgpMY3hmcG03VFZORVJkUlRDVGdwTCtjQk5Ga1RmS3JlRWcvZFFKcnZXRGVxWkozU1R0Uml6QW1SY2MranFjWDdkCmZJUXRWaWxjR2dJZXhJTVRPVzVOMCtVWjJpWXNuUHM3bUw3aXQwNGovRXh0QVByVWZTejhUYzNJNmtic1huR20KbDJoNHYwLzc2RXEvNUpnc1JldS8yNTMwTVFpK2h2ZE9MZWdwTHdJREFRQUJBb0lCQUdBZmgyWXFqdmJNODNSRQpKRnV5MEpPWmdYSGI0dGZyK3NScVRtM3B3TEYvdThZeC9md0trcDVOZGdvUVkwM2ZEY1NKaWxpYUh5ZDd4Mmc2CmJhYlY5ZVgwMVZVdk5SbCtFNWQ5d3FDOWtBajNWVmhzRERESER2MGVPRklNSm01WlBQYThVcHZUZHh2dTgwbHEKUVlNY01Kb1pSMlp5RTJUeWhaTmVXQk1KZHNoQnJqTjFUMnhmdVpxQ1VMOXVRVU5RVjRPSGRvMUFwTDd4K2kvUwoyeThXbER6eUpULzB5azAvYTRaZ1V1QmFWK2phTDE3NGJ3R2s2Mlk4ZXllaUhxZkJZWC9pd3pPMzZtWENGTFdyCnVBY2lEK2xKMm1KMzc4Vmt0NlV3ZFp1alpkODlNb2ZnQTkrTDE1aWNYakovY2FCN05xUHRGQzdCMnRZR1hQaWcKOEd2ajQ0RUNnWUVBKzRDQ0VBY3gwSlJRVTZJbHdXci81NXZNa0YwVTVkVzRoeGFpdWVscHhoS2FtNjhpUUV5Vwo2amlCdzRkazZTN1ljbEZaT1U3QmdCUFl3ZEROZmlkTFplaS8xbVpuci9MRjBDSjNWc09vMmUvdEd6aFN0eWRsCkRaWTdLc21oeHVyUWhaSlg5ZkFCNmxTRFZPRFpGMDVnSVN5S1FITXVqSFc3clhrYUhScGRzdThDZ1lFQTdjaG8KTXFITnQ2SHIwQlFLSzZNeS9LbnFlazFocHMyQkVLVVdjWEg0NGxKRWxCSEdPa2x2T0wrdHZFY2dKRmVwRHhlMQpwR01KVGcrWUxVUXI4RUMzYnJtSHR3UnR4d2k0bUZOSkpOL0dRUVdqRFdCSkZ0amVVcDlLTVFRTEwzUklvemhWCjF6TXl6dVBSVGs3WVNYN0tuL3BVNWpxbVVTcndGUGNqY0tjejdjRUNnWUFMM3B2RXorSWMrdkx6ajRLQ3AxOGUKZWk3a1hWQkFMSjhCMlNLaTdZNHRaL0ZlQ1p6dk5lNGxiYmRLR0JpK0hKVGdpRkJTc1JIV3pwajdSTFIrRUxLeApRNVBTTlpFTkw4TUFPTEF6S3hiTCtsUFJaZzRaVU1Xbko0RHhXd1RFazQ1MXoxdFJZeHRrQ01zTjlYS3BjK3g3CmhGT2VDUkdZVlhJZkZNa1R1SXZWaHdLQmdRQzR0S0FjRkl3VVJQZEVud3gzY1VJOStrOWx5WTQ5WUEwTnZPOSsKR0NaWXg4YjFyZ2pwWmZtN2YwbVpvelpZaEsrU1JieVhnVWJOR0ZnQmNaOGY5V1dINFI2SEVDMm1HaVFxVHlmVwpPTzFydk5FM3ByK2Z1NzZYTjUwT0RqSVNIcVgrQTlqS1hiN3Q3eEc3WG91c0s0MkNUNVo3Y0x1WStWMmRLNHlnCkNZSFJBUUtCZ1FDcEl4OGwrbTJMbFMxQmhVcUprY2ZOeStMT1NkZUFnQ3FNVE5VWXpjekpzQ1pUWEFZSlNZVGcKamtaSVhVOVNpdUZjVzJmOTFMY0QvL1grM3FaU0ZqQUc5V21RSThsdzZyNk9LY3ZoWmh2NTdYbGxKRDl6STBPUApOdFloTXQ3eW5WZjc5S3E0eEFpWTFJeU5EbTB2bVpFWSt5Z3VQYXJ3anRjeGNrRWJ0eTB0dlE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo= diff --git a/hack/test/certs/kubernetes-key.pem b/hack/test/certs/kubernetes-key.pem index 98b8676abcc..a760dd31207 100644 --- a/hack/test/certs/kubernetes-key.pem +++ b/hack/test/certs/kubernetes-key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/hack/test/certs/kubernetes.csr b/hack/test/certs/kubernetes.csr deleted file mode 100644 index 9b32900a447..00000000000 --- a/hack/test/certs/kubernetes.csr +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIDXzCCAkcCAQAwfTELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G -A1UEBxMIUG9ydGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxIDAeBgNVBAsTF0t1 -YmVybmV0ZXMgVGhlIEhhcmQgV2F5MRMwEQYDVQQDEwprdWJlcm5ldGVzMIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeI -QcuiW8CV2JwNk4KI80kOn76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLja -rXppB0uPduIERTNc4Xv3/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6 -u+B1LqIlktMTOD+93UFilsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D4 -0KYRo/7WGQDz9YLWNKqhvGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2Nlwupzp -qoXwxd9e1IEMhzmGRHcC+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQAB -oIGcMIGZBgkqhkiG9w0BCQ4xgYswgYgwgYUGA1UdEQR+MHyCCmt1YmVybmV0ZXOC -Emt1YmVybmV0ZXMuZGVmYXVsdIIWa3ViZXJuZXRlcy5kZWZhdWx0LnN2Y4Iea3Vi -ZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyghxrdWJlcm5ldGVzLnN2Yy5jbHVz -dGVyLmxvY2FshwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQARwbt/QbJlGgdV5v9K -40JvhD4GPqQDdU15gZlht7/Cz1YPlIjqZy0TUaEwVYNFw8W8UW2LYhCXzBsTsHw3 -pfQw6DRjvPcceCn/UH3S2F9FjLZ9rrvu79TX7uUBAl5PDkN8MuciijlFDoHN2hX5 -1ApEWZi1V6G2akzocbywkh5bpf+WBZszWsvoC6nYB4ghK85Z0yqIAwbCKORXwSNn -DtQ9VmMtg/vyWj6gg9K/bYh0Bh3l4FONsqO4VbX7+meiEy8Ony7f04m05IkJDcO8 -mKF3OTuUMkBMEMVkZKXJJ9iI+TIrtQ6xbPc3Ctm199OXK4i65WMaO9llQ9q9iByX -py8d ------END CERTIFICATE REQUEST----- diff --git a/hack/test/certs/kubernetes.pem b/hack/test/certs/kubernetes.pem index 96505e7f255..86e210c1123 100644 --- a/hack/test/certs/kubernetes.pem +++ b/hack/test/certs/kubernetes.pem @@ -1,27 +1,27 @@ -----BEGIN CERTIFICATE----- -MIIEfjCCA2agAwIBAgIUepjO3FMlyIcWiO0N4/GJgV6Uj/QwDQYJKoZIhvcNAQEL +MIIEhjCCA26gAwIBAgIUL6LjTRs2t4SjsARUWJ5soBSIysgwDQYJKoZIhvcNAQEL BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMzEwMFoXDTIyMDkyOTIyMzEwMFowfTEL +EwpLdWJlcm5ldGVzMB4XDTIyMDkzMDE0MTIwMFoXDTMyMDkyNzE0MTIwMFowfTEL MAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9ydGxhbmQx EzARBgNVBAoTCkt1YmVybmV0ZXMxIDAeBgNVBAsTF0t1YmVybmV0ZXMgVGhlIEhh cmQgV2F5MRMwEQYDVQQDEwprdWJlcm5ldGVzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEA8sZr8W4K60RLo/K7PbT4xqha4ZeIQcuiW8CV2JwNk4KI80kO -n76C4rRmE5HUp+n+xbOQjBKofl7GKExAQDdVPAgMsLjarXppB0uPduIERTNc4Xv3 -/CWCo2vHWVR/W9JyVKUS8+gKV6VWpWrcmG6oYcgvvsC6u+B1LqIlktMTOD+93UFi -lsC7oYsGmRMUPFRwoQfG3JyDFwHHr2b0z1ij7hJGw1D40KYRo/7WGQDz9YLWNKqh -vGmEQyBRXiCTG3EsevhKEGiM3k2Kng8X5a7n2NlwupzpqoXwxd9e1IEMhzmGRHcC -+BFGdI9QAgc/BU77hBmgApp2ehXPAnmsqRPtwwIDAQABo4IBCTCCAQUwDgYDVR0P +AQ8AMIIBCgKCAQEAr4QS63TW7aSn2Y8uKt3Wsw41Ox9OI3KlL+UIK31wFqYPqVtY +b74pwPPM+qhPxgapLpxWiQYxEig5HSvHrZB9zOqVAi/9fkru5FHAsCnfMTXKpjgs +yJ8JkIt/u5IQm7K4KLU3Fq1YWLrrK4zhci7NJLSgnlyZJTIrOl4ReoT0KdrIMlKT +ElExLlce6sCOGg0LBn1icEDxTK03osb8RsI48R7uSDyRrfpgk2z39xd5skkM42+2 +oDXkOaHi3y2TahW1kOxz0V9Ebvbo0q/tQkAYK7YB4EYNXtwjqoE9UlJOhrrwAv5T +JPwWIXg0oUxAtZ/SBzrETAOGk+4HwPP37/EIkwIDAQABo4IBETCCAQ0wDgYDVR0P AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB -Af8EAjAAMB0GA1UdDgQWBBQNhPCXoXrtgP0M8NPQipbRggdk9DAfBgNVHSMEGDAW -gBRiNTGWtb2CxjHsZLCjDFCNw9tTFDCBhQYDVR0RBH4wfIIKa3ViZXJuZXRlc4IS -a3ViZXJuZXRlcy5kZWZhdWx0ghZrdWJlcm5ldGVzLmRlZmF1bHQuc3Zjgh5rdWJl -cm5ldGVzLmRlZmF1bHQuc3ZjLmNsdXN0ZXKCHGt1YmVybmV0ZXMuc3ZjLmNsdXN0 -ZXIubG9jYWyHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBALKCw/I9j3e5Q2NUGaSg -cUnVuzTwgJ46oTxoOm1mN6whPHe2ACPHWBKsCFhCtgMDEUy4hObrmzlEbzXhHeMr -Ri7+a0DnheYk8QDcR5nk0oxdG8XbFf6dBJdHLRMfTmYKPhFj1nM8Eh2xKZszdkIG -FWGL7Php/F3+HzwQj4rbZYDQMITiRR3ib+HU9m3aBu4VTLdAL/I4EizOXUc7LxDz -dyliu7xVzGweoYI5BE1PzaN0ClhOpvV4y9g2vUxuuqdWSo70pld712+hZ8qwAJgp -F+vvtmEfroJGckI6llbvhXmmV8Qek9ekpol2QeZDHgCX6wHw+sGVfT3oPMzI82jq -WcM= +Af8EAjAAMB0GA1UdDgQWBBSbvoBQf1q7BEM877oCb97ylxnCLjAfBgNVHSMEGDAW +gBSy3fqjRmvD2DNtGkbbmdfNtth4mjCBjQYDVR0RBIGFMIGCggprdWJlcm5ldGVz +ghJrdWJlcm5ldGVzLmRlZmF1bHSCFmt1YmVybmV0ZXMuZGVmYXVsdC5zdmOCHmt1 +YmVybmV0ZXMuZGVmYXVsdC5zdmMuY2x1c3RlcoIca3ViZXJuZXRlcy5zdmMuY2x1 +c3Rlci5sb2NhbIcECmAAAYcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAKQfyjbv7 +KXC1EIJLmYvZ6mLjv80sA6FEv88KjcmkFg614eq6QGtlxAwKC1ytgJrQeo1DjaqG +lWKecuUwobp41QI8XYVwC4T07RPOEAYwGKY4qWyqP9YQ++UU4iNjja3FDeU+SFso +l28KrXL8bRhKxv2phONppOl2gLAHA6H1nSFDHYT9zMgL6qLtfIKkmgN8Z+rQDc7M +R9d2HWe8rr+EvqVNen7caoWSeIqB52DqvmZohQWX8Gkh0wuSQ73DhcVFsa6bTYvF +63aG8eXIwU+UkJncDkhaqall3d4liDk83ozOnNs03L0axT+OPYehD6ExGp9jqfoa +KetWZiJ5SasKWw== -----END CERTIFICATE----- diff --git a/hack/test/certs/regenerate.sh b/hack/test/certs/regenerate.sh new file mode 100755 index 00000000000..865aaba1876 --- /dev/null +++ b/hack/test/certs/regenerate.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +set -xe +rm -f *.pem *.key *.csr + +cfssl gencert -initca ca-csr.json | cfssljson -bare ca +cfssl gencert \ + -ca=ca.pem \ + -ca-key=ca-key.pem \ + -config=ca-config.json \ + -profile=kubernetes \ + admin-csr.json | cfssljson -bare admin + +KUBERNETES_HOSTNAMES=kubernetes,kubernetes.default,kubernetes.default.svc,kubernetes.default.svc.cluster,kubernetes.svc.cluster.local +cfssl gencert \ + -ca=ca.pem \ + -ca-key=ca-key.pem \ + -config=ca-config.json \ + -hostname=10.96.0.1,127.0.0.1,${KUBERNETES_HOSTNAMES} \ + -profile=kubernetes \ + kubernetes-csr.json | cfssljson -bare kubernetes + +cfssl gencert \ + -ca=ca.pem \ + -ca-key=ca-key.pem \ + -config=ca-config.json \ + -profile=kubernetes \ + service-account-csr.json | cfssljson -bare service-account + +kubectl config set-credentials system:kube-controller-manager \ + --client-certificate=admin.pem \ + --client-key=admin-key.pem \ + --embed-certs=true \ + --kubeconfig=kube-controller-manager.kubeconfig + +rm *.csr diff --git a/hack/test/certs/service-account-key.pem b/hack/test/certs/service-account-key.pem index 8213a751f69..b2734824ff1 100644 --- a/hack/test/certs/service-account-key.pem +++ b/hack/test/certs/service-account-key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/hack/test/certs/service-account.csr b/hack/test/certs/service-account.csr deleted file mode 100644 index 5b7c710e31a..00000000000 --- a/hack/test/certs/service-account.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICyTCCAbECAQAwgYMxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAP -BgNVBAcTCFBvcnRsYW5kMRMwEQYDVQQKEwpLdWJlcm5ldGVzMSAwHgYDVQQLExdL -dWJlcm5ldGVzIFRoZSBIYXJkIFdheTEZMBcGA1UEAxMQc2VydmljZS1hY2NvdW50 -czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOxfTfZu8qveiHrRgUyS -uAiBtUgddTXXhlwmQ/eNwR102HVL71kxJG8KFoTKJ8onIIR5g85iU39++gZOPcgp -Qu7Qcf+U0F+CfeWNpl9xE4QHT8lb4bI2CaGBmPJ3e1r15aN98hHUwp0FKkhGfB14 -Lv4lgdvWLv+EYdmZ8S5xkGyxOHSeX4ruuLGbRMXjfwRfOAzmro6or9/I5C/Gofc8 -Q7rQzJNqkzJ3kYvHuQK7pCDPxlSgcZiTHWn3i/3pjmwbmgCBiQjOsj1DQfEcvEYb -oIkY8qw7AzCoIDEDkJFq90DvZ+08MZyJ+gaAsXdnmulVIuyG/xC4AvCHtgzViKc0 -VA8CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQDS6T5JkfHATn6+47v4znVVvKfW -YiUbC0fRi7kMtnJMdhp8Oe8p2XXDmzBwaFVYneBhwSddKJG41snmYE8yv746guYh -ndnh/ZtXtP39E6q+dknMGfJ/LZyB6fPM3m7X2VMtww5uFfeXZyY4aE4GOIqRSkGO -KHP+0h6+MqE9AFYtjOuIpCSfmZ5XLf2PfxY9LxePMmhKCUV1qmf6ZftJ+LP/97H3 -RP7k+7zK8q+xq8ETE2Ub2Ux8s36EVykVzh06kElhsHK7nqkafyJE/8lkiaExTKvd -Kk5ii3CnQi6/RaZQ8TeNzjqcUMDfxigeh6JkC60xrhQThR10oUajxxd1Sg/N ------END CERTIFICATE REQUEST----- diff --git a/hack/test/certs/service-account.pem b/hack/test/certs/service-account.pem index 5abe649c2b8..02956be00d0 100644 --- a/hack/test/certs/service-account.pem +++ b/hack/test/certs/service-account.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIID+TCCAuGgAwIBAgIUHOMlm843n+Z1yg1UdqdWicQppzswDQYJKoZIhvcNAQEL +MIID+TCCAuGgAwIBAgIUDD9Vgc8pr28gZXRl9giDhKg/jEowDQYJKoZIhvcNAQEL BQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8GA1UEBxMIUG9y dGxhbmQxEzARBgNVBAoTCkt1YmVybmV0ZXMxCzAJBgNVBAsTAkNBMRMwEQYDVQQD -EwpLdWJlcm5ldGVzMB4XDTIxMDkyOTIyMzYwMFoXDTIyMDkyOTIyMzYwMFowgYMx +EwpLdWJlcm5ldGVzMB4XDTIyMDkzMDE0MTIwMFoXDTMyMDkyNzE0MTIwMFowgYMx CzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRsYW5k MRMwEQYDVQQKEwpLdWJlcm5ldGVzMSAwHgYDVQQLExdLdWJlcm5ldGVzIFRoZSBI YXJkIFdheTEZMBcGA1UEAxMQc2VydmljZS1hY2NvdW50czCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAOxfTfZu8qveiHrRgUySuAiBtUgddTXXhlwmQ/eN -wR102HVL71kxJG8KFoTKJ8onIIR5g85iU39++gZOPcgpQu7Qcf+U0F+CfeWNpl9x -E4QHT8lb4bI2CaGBmPJ3e1r15aN98hHUwp0FKkhGfB14Lv4lgdvWLv+EYdmZ8S5x -kGyxOHSeX4ruuLGbRMXjfwRfOAzmro6or9/I5C/Gofc8Q7rQzJNqkzJ3kYvHuQK7 -pCDPxlSgcZiTHWn3i/3pjmwbmgCBiQjOsj1DQfEcvEYboIkY8qw7AzCoIDEDkJFq -90DvZ+08MZyJ+gaAsXdnmulVIuyG/xC4AvCHtgzViKc0VA8CAwEAAaN/MH0wDgYD +AQEBBQADggEPADCCAQoCggEBAMb588xTuHFRIXEhS/J6ytokVUW3PYrTmRXkBpH/ +ITMchdyi02mCYRHLXFJeFqaqqLb5YNLy96+8L174DvNyK6dHuoJb9Mv4zijHVHu7 +/Hp0chULaS1VOOKlbETKSMtYlUpOKjrVnZYXM2+6uMdWx9del2AEgAxbHeAD8bHz +HlX4QtAm++rUJ14hujmGfVCIt7g6LiDXoz4G3VOjYDlgXrbGH6uNGKS7/yt8+hdw +4cdb+khBNK57UKCz6N82xRwIE11nZrryB2/N3yesyPxKrs8zztD9XabNCyM9jT46 +DB27h5xpKPFMrr3GyudYhVTWxy7uFPMhwIypUBgm/KA7eMECAwEAAaN/MH0wDgYD VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV -HRMBAf8EAjAAMB0GA1UdDgQWBBR9pAvzY/VK7MAcOUPSk9iZ3FkwzjAfBgNVHSME -GDAWgBRiNTGWtb2CxjHsZLCjDFCNw9tTFDANBgkqhkiG9w0BAQsFAAOCAQEAd40A -HoVSjcjctv4Xg3H/E80AKAV41hwLZtXTI6ed/ERdgQQMotbW9pgXQix1qzvT6z9e -x+gIdpKE8h89u9wS+bYkthIKJRYRLc7ZJ9Aq+izlfLO/GjxfgBgbOBLMpNKNpmdf -NlOEfoKkLriE31f1oW9Xx3SYdqdaFQJDaDaRg5guQw0YT7PBIlHemmoYGujKNc8+ -iMWYa9aeGMM8yrpH5GRwUI7BAk0+fX4DhyokOuH3mpHXWWkKdVoIfpt3q+jznKYe -l7VaABvoHr3fx9oGhusuwDgLFssraMeIJigHi5ajOTWYw7u6yN2cjh+Ng7TZ+hf/ -+nhPbMGFM/GDpGVXmg== +HRMBAf8EAjAAMB0GA1UdDgQWBBSW5WD6InN/6du9QJ4dLLduxvzC1DAfBgNVHSME +GDAWgBSy3fqjRmvD2DNtGkbbmdfNtth4mjANBgkqhkiG9w0BAQsFAAOCAQEAQpLd +LQ6qfiejPvb23N16cogn/tyrXk+sxN8V3rBBjrFRfFnBDNuj5eefCFdEr4S/Espa +m6N1UYCbBrbkYEuhEfGZVRbPycsxKETEja7BenVZZVQ6vf7+cLEJDJugwaWS06LN +FEP+vFXomfMqntzv5gytjlfuNyStQMq8ykkhqFR8rBQ9D6Lvs1KyLUYJLU7n6XI+ +eXM5SaaKuaUl8ccPjD+ThT2Wnj7hAsso1bJlrvp3QV9z62k0BuLbuac6TMdNs7Lw +6Yh8CsDc3q7uqMBJYjLvfmmW1D7bq0SkZu7GqXKewYNrHsALl4H3beYKJrqC6E8Z +MHOO+33Yc4bTpJJcuw== -----END CERTIFICATE----- From 7f57f0df70a25fc526ce1b438115275d3f84863e Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Fri, 30 Sep 2022 12:03:11 -0700 Subject: [PATCH 3/3] Fix a couple of test issues --- apiserver/test/integration/framework.go | 2 +- node/Makefile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apiserver/test/integration/framework.go b/apiserver/test/integration/framework.go index bc74a47e6d5..5878149b31d 100644 --- a/apiserver/test/integration/framework.go +++ b/apiserver/test/integration/framework.go @@ -80,7 +80,7 @@ func withConfigGetFreshApiserverServerAndClient( StopCh: stopCh, } options.RecommendedOptions.SecureServing.BindPort = securePort - options.RecommendedOptions.CoreAPI.CoreAPIKubeconfigPath = "../certs/kubeconfig" + options.RecommendedOptions.CoreAPI.CoreAPIKubeconfigPath = "/home/user/certs/kubeconfig" var err error pcs, err := server.PrepareServer(options) diff --git a/node/Makefile b/node/Makefile index 88ca0bfd52e..35612c51891 100644 --- a/node/Makefile +++ b/node/Makefile @@ -291,7 +291,6 @@ fv: run-k8s-apiserver -e KUBECONFIG=/go/src/github.com/projectcalico/calico/hack/tests/certs/kubeconfig \ -e ETCD_ENDPOINTS=http://$(LOCAL_IP_ENV):2379 \ -e GO111MODULE=on \ - --net=host \ -w /go/src/$(PACKAGE_NAME) \ $(CALICO_BUILD) ginkgo -cover -r -skipPackage vendor pkg/lifecycle/startup pkg/allocateip $(GINKGO_ARGS)