github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 20:50:24 +00:00
Code Issues Projects Releases Wiki Activity

Check whether static cert is already configured in UpdateTransportConfig

Browse Source 
- Also update test-cmd.sh to pass a signing ca to the kube controller
  manager, so CSRs work properly in integration tests.

Signed-off-by: Margo Crawford <margaretc@vmware.com>
This commit is contained in:
Margo Crawford
2021-12-07 15:58:46 -08:00
parent 0153febd9f
commit f015fd66ce
10 changed files with 169 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hack/make-rules/test-cmd.sh
View File

@@ -80,7 +80,7 @@ function run_kube_apiserver() {
--storage-media-type="${KUBE_TEST_API_STORAGE_TYPE-}" \
--cert-dir="${TMPDIR:-/tmp/}" \
--service-cluster-ip-range="10.0.0.0/24" \
--client-ca-file=hack/testdata/ca.crt \
--client-ca-file=hack/testdata/ca/ca.crt \
--token-auth-file=hack/testdata/auth-tokens.csv 1>&2 &
export APISERVER_PID=$!
@@ -121,6 +121,8 @@ EOF
kube::log::status "Starting controller-manager"
"${KUBE_OUTPUT_HOSTBIN}/kube-controller-manager" \
--kube-api-content-type="${KUBE_TEST_API_TYPE-}" \
--cluster-signing-cert-file=hack/testdata/ca/ca.crt \
--cluster-signing-key-file=hack/testdata/ca/ca.key \
--kubeconfig="${config}" 1>&2 &
export CTLRMGR_PID=$!