Merge pull request #14565 from caesarxuchao/https-nginx

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-01 01:52:46 -07:00
commit 90beafcc5e
2 changed files with 4 additions and 1 deletions

View File

@ -38,7 +38,7 @@ It uses an [nginx server block](http://wiki.nginx.org/ServerBlockExample) to ser
### Generate certificates
First generate a self signed rsa key and certificate that the server can use for TLS.
First generate a self signed rsa key and certificate that the server can use for TLS. This step invokes the make_secret.go script in the same directory, which uses the kubernetes api to generate a secret json config in /tmp/secret.json.
```sh
$ make keys secret KEY=/tmp/nginx.key CERT=/tmp/nginx.crt SECRET=/tmp/secret.json

View File

@ -29,6 +29,9 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/runtime"
// This installs the legacy v1 API
_ "k8s.io/kubernetes/pkg/api/install"
)
// TODO: