github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-04 10:47:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63930 from liztio/kubeadm-init-diff

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 63865, 57849, 63932, 63930, 63936). 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>.

Implement `kubeadm init diff`

**What this PR does / why we need it**:

Some users want to see the changes `kubeadm` woulda apply before actually running `kubeadm upgrade apply`. This shows the changes that will be made to the static pod manifests before applying them. This is a narrower case than `kubeadm upgrade apply --dry-run`, which specifically focuses on the static pod manifests.

**Which issue(s) this PR fixes**:
Part of [kubeadm/489](https://github.com/kubernetes/kubeadm/issues/489#issuecomment-388974795)

**Special notes for your reviewer**:

**Release note**:

```release-note
adds the `kubeadm upgrade diff` command to show how static pod manifests will be changed by an upgrade.
```
This commit is contained in:
Kubernetes Submit Queue
2018-05-17 00:28:26 -07:00
committed by GitHub
parent 2c8dbf98d2 618a110cd1
commit 2fda6e5e7a
6 changed files with 151 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/.generated_docs
View File

@@ -75,6 +75,7 @@ docs/admin/kubeadm_token_generate.md
docs/admin/kubeadm_token_list.md
docs/admin/kubeadm_upgrade.md
docs/admin/kubeadm_upgrade_apply.md
docs/admin/kubeadm_upgrade_diff.md
docs/admin/kubeadm_upgrade_plan.md
docs/admin/kubeadm_version.md
docs/admin/kubelet.md
@@ -152,6 +153,7 @@ docs/man/man1/kubeadm-token-generate.1
docs/man/man1/kubeadm-token-list.1
docs/man/man1/kubeadm-token.1
docs/man/man1/kubeadm-upgrade-apply.1
docs/man/man1/kubeadm-upgrade-diff.1
docs/man/man1/kubeadm-upgrade-plan.1
docs/man/man1/kubeadm-upgrade.1
docs/man/man1/kubeadm-version.1

3
docs/admin/kubeadm_upgrade_diff.md Normal file
View File

@@ -0,0 +1,3 @@
This file is autogenerated, but we've stopped checking such files into the
repository to reduce the need for rebases. Please run hack/generate-docs.sh to
populate this file.

3
docs/man/man1/kubeadm-upgrade-diff.1 Normal file
View File

@@ -0,0 +1,3 @@
This file is autogenerated, but we've stopped checking such files into the
repository to reduce the need for rebases. Please run hack/generate-docs.sh to
populate this file.