1. 15 Oct, 2016 38 commits
  2. 14 Oct, 2016 2 commits
    • Kubernetes Submit Queue's avatar
      Merge pull request #32111 from MatMaul/openstack-trustid · 35abd47f
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue
      
      Support trust id as a scope in the OpenStack authentication logic
      
      This patch allows the use of Kubernetes with Keystone trust delegation to avoid passing the user credentials in clear inside the config file : a specific user with delegated rights can be created and used instead.
      35abd47f
    • Kubernetes Submit Queue's avatar
      Merge pull request #34834 from apprenda/kubeadm_fix_preflight · 8e6eb1a1
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue
      
      kubeadm: fix preflight checks
      
      This PR fixes a couple issues cause by some bad rebases:
      * When a pre-flight check returned errors, `kubeadm` would exit with error code `1` instead of `2` as the original pre-flight PR meant. This would also cause the output of `kubeadm` to include some stuff that was not supposed to be there.
      * Duplicated `k8s.io/kubernetes/cmd/kubeadm/app/util` import.
      
      I also took the freedom to do some output clean-up based on the input from the original pre-flight PR.
      
      /cc @dmmcquay @dgoodwin @luxas
      8e6eb1a1