github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31413 from madhusudancs/fed-bash-basic-auth-secret-name-fix

Browse Source 
Automatic merge from submit-queue

Underscore is not a valid secret data key, so use hyphen instead.

cc @kubernetes/sig-cluster-federation
This commit is contained in:
Kubernetes Submit Queue 2016-08-25 04:05:30 -07:00 committed by GitHub
commit 99f77f42e2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
federation/manifests/federation-apiserver-deployment.yaml
View File

@ -24,7 +24,7 @@ spec:
- --secure-port=443
- --advertise-address={{.FEDERATION_API_HOST}}
- --client-ca-file=/srv/kubernetes/ca.crt
- --basic-auth-file=/srv/kubernetes/basic_auth.csv
- --basic-auth-file=/srv/kubernetes/basic-auth.csv
- --tls-cert-file=/srv/kubernetes/server.cert
- --tls-private-key-file=/srv/kubernetes/server.key
- --admission-control={{.FEDERATION_ADMISSION_CONTROL}}

2
federation/manifests/federation-apiserver-secrets.yaml
View File

@ -7,7 +7,7 @@ metadata:
type: Opaque
data:
known-tokens.csv: {{.FEDERATION_API_KNOWN_TOKENS_BASE64}}
basic_auth.csv: {{.FEDERATION_API_BASIC_AUTH_BASE64}}
basic-auth.csv: {{.FEDERATION_API_BASIC_AUTH_BASE64}}
ca.crt: {{.FEDERATION_APISERVER_CA_CERT_BASE64}}
server.cert: {{.FEDERATION_APISERVER_CERT_BASE64}}
server.key: {{.FEDERATION_APISERVER_KEY_BASE64}}