Merge pull request #20309 from sttts/sttts-cert-fixtures

UPSTREAM: 65899: use self-signed cert fixtures in integration test servers
openshift · Jul 13, 2018 · 986ea2f · 986ea2f
2 parents 70504c4 + 9bd012b
commit 986ea2f
Show file tree

Hide file tree

Showing 6 changed files with 146 additions and 10 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/testing/BUILD b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/testing/BUILD
diff --git a/...ata/127.0.0.1_10.0.0.1_kubernetes.default.svc-kubernetes.default-kubernetes-localhost.crt b/...ata/127.0.0.1_10.0.0.1_kubernetes.default.svc-kubernetes.default-kubernetes-localhost.crt
diff --git a/...ata/127.0.0.1_10.0.0.1_kubernetes.default.svc-kubernetes.default-kubernetes-localhost.key b/...ata/127.0.0.1_10.0.0.1_kubernetes.default.svc-kubernetes.default-kubernetes-localhost.key
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/testing/testserver.go b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/testing/testserver.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/options/serving.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/options/serving.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/util/cert/cert.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/util/cert/cert.go