Merge pull request #40922 from berrange/hack-client-cert

Automatic merge from submit-queue local-up-cluster: fix instructions for set-credentials After launching the services, local-up-cluster.sh tells the user how to configure kubectl to access it. The instructions for 'set-credentials' enable plain password auth, but the services are configured to mandate client certificate auth. As a result it is not possible to access the cluster with the instructions printed. The use of client certs by default was added in commit a1b17db4 Author: Dr. Stefan Schimanski <sttts@redhat.com> Date: Sat Nov 12 23:09:04 2016 +0100 Configure client certs in local-cluster-up.sh and the instructions were correctly updated to refer to client certificates. The changed instructions were (mistakenly) reverted though when the following commit was merged: commit 72e0e91b Author: xilabao <chenr.fnst@cn.fujitsu.com> Date: Fri Dec 2 11:04:25 2016 +0800 change prompt for enabling RBAC on local-up-cluster Fixes: #40192 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

Merge pull request #40922 from berrange/hack-client-cert
1250278b · Kubernetes Submit Queue · GitHub · 88673271 · 4ed13ec4 · 1250278b
Commit 1250278b authored Feb 06, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

local-up-cluster.sh hack/local-up-cluster.sh +2 -2

No files found.
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -458,8 +458,8 @@ function start_apiserver {
                AUTH_ARGS="--token=system:admin/system:masters"
            fi
        else
-            # default to use basic authentication
-            AUTH_ARGS="--username=admin --password=admin"
+            # default to use certificate authentication
+            AUTH_ARGS="--client-key=${CERT_DIR}/client-admin.key --client-certificate=${CERT_DIR}/client-admin.crt"
        fi
    fi
 }