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

Automatic merge from submit-queue Underscore is not a valid secret data key, so use hyphen instead. cc @kubernetes/sig-cluster-federation

Merge pull request #31413 from madhusudancs/fed-bash-basic-auth-secret-name-fix
99f77f42 · Kubernetes Submit Queue · GitHub · d12b3429 · 8868459d · 99f77f42
Commit 99f77f42 authored Aug 25, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 25, 2016
Showing with 2 additions and 2 deletions

federation-apiserver-deployment.yaml federation/manifests/federation-apiserver-deployment.yaml +1 -1

federation-apiserver-secrets.yaml federation/manifests/federation-apiserver-secrets.yaml +1 -1

No files found.
--- a/federation/manifests/federation-apiserver-deployment.yaml
+++ b/federation/manifests/federation-apiserver-deployment.yaml
@@ -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}}

--- a/federation/manifests/federation-apiserver-secrets.yaml
+++ b/federation/manifests/federation-apiserver-secrets.yaml
@@ -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}}