1. 26 Apr, 2018 4 commits
    • Kubernetes Submit Queue's avatar
      Merge pull request #63059 from ceshihao/upgrade_json_package_fix_base64_newline · 3dbcd1dd
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue (batch tested with PRs 59965, 59115, 63076, 63059). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
      
      Upgrade dep json-iterator/go to fix base64 decode bug
      
      **What this PR does / why we need it**:
      upgrade dep `json-iterator/go` to fix base64 decode bug #62742
      
      **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
      Fixes #62742
      
      **Special notes for your reviewer**:
      Just upgrade `json-iterator/go` to latest which includes base64 decode fix https://github.com/json-iterator/go/pull/266
      No other code changes
      
      **Release note**:
      
      ```release-note
      None
      ```
      3dbcd1dd
    • Kubernetes Submit Queue's avatar
      Merge pull request #63076 from chuckha/etcdprepull · 2a10c309
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue (batch tested with PRs 59965, 59115, 63076, 63059). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
      
      Prepull etcd before an upgrade
      
      If kubeadm ever has to upgrade etcd it should prepull the image so
      there is less downtime during the upgrade when etcd versions change.
      
      Fixes kubernetes/kubeadm#669
      Signed-off-by: 's avatarChuck Ha <ha.chuck@gmail.com>
      
      **What this PR does / why we need it**:
      
      This PR Prepulls the etcd image during a `kubeadm upgrade apply`.
      
      **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
      
      Fixes kubernetes/kubeadm#669
      
      **Special notes for your reviewer**:
      
      constants.MasterComponents was not changed because it is used in many places where etcd does not need to be nor should it be a part of this slice.
      
      **Release note**:
      ```release-note
      NONE
      ```
      
      /cc @kubernetes/sig-cluster-lifecycle-pr-reviews
      2a10c309
    • Kubernetes Submit Queue's avatar
      Merge pull request #59115 from alexbrand/kubeadm-confirm-reset-2 · 163b848a
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue (batch tested with PRs 59965, 59115, 63076, 63059). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
      
      kubeadm: prompt for confirmation when resetting a master
      Signed-off-by: 's avatarAlexander Brand <alexbrand09@gmail.com>
      
      
      
      **What this PR does / why we need it**:
      This PR implements a confirmation prompt when running `kubeadm reset` on a master node. This is to prevent users from mistakenly resetting a master node.
      
      **Which issue(s) this PR fixes**:
      Fixes https://github.com/kubernetes/kubeadm/issues/673
      
      **Special notes for your reviewer**:
      I am somewhat torn on the approach on how to detect that kubeadm is running on a master node. I went with checking for the apiserver manfiest file on the local filesystem, as it seems like a simpler approach when compared to getting a k8s client, getting a list of nodes, finding the current node, and checking if it has the master taint. I am happy to rework if the latter is more desirable.
      
      Sample runs:
      ```
      # ./kubeadm reset
      [Warning] Are you sure you want to reset this master node? Type the word "confirm" to continue: no
      Aborted reset operation on master node
      
      # ./kubeadm reset
      [Warning] Are you sure you want to reset this master node? Type the word "confirm" to continue: confirm
      [preflight] Running pre-flight checks.
      [reset] Stopping the kubelet service.
      [reset] WARNING: The kubelet service could not be stopped by kubeadm: [exit status 1]
      [reset] WARNING: Please ensure kubelet is stopped manually.
      [reset] Unmounting mounted directories in "/var/lib/kubelet"
      ........
      
      # ./kubeadm reset
      [Warning] Are you sure you want to reset this master node? Type the word "confirm" to continue:
      Aborted reset operation on master node
      # ./kubeadm reset --confirm
      [preflight] Running pre-flight checks.
      [reset] Stopping the kubelet service.
      [reset] WARNING: The kubelet service could not be stopped by kubeadm: [exit status 1]
      [reset] WARNING: Please ensure kubelet is stopped manually.
      [reset] Unmounting mounted directories in "/var/lib/kubelet"
      ........
      ```
      
      **Release note**:
      
      ```release-note
      kubeadm: prompt the user for confirmation when resetting a master node
      ```
      163b848a
    • Kubernetes Submit Queue's avatar
      Merge pull request #59965 from shun-miyoshi-com/fix-wrong-msg · 37a798de
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue (batch tested with PRs 59965, 59115, 63076, 63059). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
      
      fix help message of kubeconfig-dir option(kubeadm alpha phase kubeconfig all)
      
      **What this PR does / why we need it**:
      This patch will fix wrong help message.
      
      The command is kubeadm alpha phase kubeconfig [command]
      The help message is for --kubeconfig-dir option.
      
      kubeconfig-dir is not port.(It is directory)
      So, I fixed the message.
      
      **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
      
      **Special notes for your reviewer**:
      
      **Release note**:
      
       `NONE`
      
      /sig cluster-lifecycle
      37a798de
  2. 25 Apr, 2018 36 commits