Merge pull request #6799 from caseydavenport/casey-cp-certs

Cherry-pick cert changes
projectcalico · Sep 30, 2022 · 7febb5e · 7febb5e
2 parents 91b84e6 + 7f57f0d
commit 7febb5e
Show file tree

Hide file tree

Showing 121 changed files with 298 additions and 1,901 deletions.
diff --git 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,15 +266,15 @@ 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'
 
 .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/apiserver/test/certs/admin-key.pem b/apiserver/test/certs/admin-key.pem
diff --git a/apiserver/test/certs/admin.csr b/apiserver/test/certs/admin.csr
diff --git a/apiserver/test/certs/admin.pem b/apiserver/test/certs/admin.pem
diff --git a/apiserver/test/certs/ca-key.pem b/apiserver/test/certs/ca-key.pem
diff --git a/apiserver/test/certs/ca.csr b/apiserver/test/certs/ca.csr
diff --git a/apiserver/test/certs/ca.pem b/apiserver/test/certs/ca.pem
diff --git a/apiserver/test/certs/kube-controller-manager.kubeconfig b/apiserver/test/certs/kube-controller-manager.kubeconfig
diff --git a/apiserver/test/certs/kubernetes-key.pem b/apiserver/test/certs/kubernetes-key.pem
diff --git a/apiserver/test/certs/kubernetes.csr b/apiserver/test/certs/kubernetes.csr
diff --git a/apiserver/test/certs/kubernetes.pem b/apiserver/test/certs/kubernetes.pem