Commit Graph

2514 Commits (06bc7e3e0026ea25065f59f4bd305c0b7dbbc145)

Author SHA1 Message Date
Yago Nobre cd605e7d14
Simplify kubeadm bump version on TestEtcdSupportedVersion 2019-04-03 01:28:07 -03:00
SataQiu 9e051bb327 code improve: use constants instead of hard coding 2019-04-03 05:58:01 +08:00
PingWang 38fe68658d Extract Method for kubeadm
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
2019-04-02 18:45:30 +08:00
Kubernetes Prow Robot c3cc31797a
Merge pull request #75969 from rajansandeep/translationcheck
Fix translation from kube-dns to CoreDNS Config to skip invalid values
2019-04-01 22:44:35 -07:00
Kubernetes Prow Robot dd96b15e5d
Merge pull request #75931 from xichengliudui/Simplify-two-if
Simplify two if (remove redundant code)
2019-04-01 15:49:21 -07:00
Sandeep Rajan deadefd385 Fix translation to skip invalid values 2019-04-01 15:15:39 -04:00
Kubernetes Prow Robot 255a73ffc6
Merge pull request #75939 from xichengliudui/conversion-constants
Define common sentences as constants
2019-04-01 10:03:25 -07:00
Kubernetes Prow Robot 13cde9e181
Merge pull request #75950 from qingsenLi/k8s190401-fix-Certifcate
spelling error 'Certifcate'
2019-04-01 06:38:58 -07:00
qingsenLi 703a397ee3 spelling error 'Certifcate' 2019-04-02 01:14:56 +08:00
SataQiu 694a5f1cdf use constant instead of hard coding 2019-04-01 13:29:47 +08:00
Kubernetes Prow Robot 8f304510c5
Merge pull request #75900 from neolit123/fix-upgrade-plan
kubeadm: fix "upgrade plan" not defaulting to a "stable" version
2019-03-30 12:47:08 -07:00
Kubernetes Prow Robot 214340256f
Merge pull request #75874 from SataQiu/refactor-kubeadm-20190329
Refactor code about setting KubernetesVersionFlag
2019-03-29 23:53:33 -07:00
Kubernetes Prow Robot c7a8596a39
Merge pull request #75867 from SataQiu/fix-kubeadm-golint-20190329
Fix golint failures in cmd/kubeadm/app/util/system
2019-03-29 17:33:57 -07:00
Lubomir I. Ivanov d6328f1dbe kubeadm: fix "upgrade plan" not working without k8s version
If the k8s version argument passed to "upgrade plan" is missing
the logic should perform the following actions:
- fetch a "stable" version from the internet.
- if that fails, fallback to the local client version.

Currentely the logic fails because the cfg.KubernetesVersion is
defaulted to the version of the existing cluster, which
then causes an early exit without any ugprade suggestions.

See app/cmd/upgrade/common.go::enforceRequirements():
  configutil.FetchInitConfigurationFromCluster(..)

Fix that by passing the explicit user value that can also be "".
This will then make the "offline getter" treat it as an explicit
desired upgrade target.

In the future it might be best to invert this logic:
- if no user k8s version argument is passed - default to the kubeadm
version.
- if labels are passed (e.g. "stable"), fetch a version from the
internet.
2019-03-29 21:34:58 +02:00
Kubernetes Prow Robot e6d274233c
Merge pull request #75646 from bart0sh/PR0066-kubeadm-token-delete-multiple
kubeadm: implement deletion of multiple tokens
2019-03-29 11:48:24 -07:00
SataQiu 4f6003b61f refactor code about setting KubernetesVersionFlag 2019-03-29 15:51:16 +08:00
SataQiu a41c85ea07 fix golint failures in cmd/kubeadm/app/util/system 2019-03-29 12:03:25 +08:00
Joshua M. Keyes 03725f78b4 Provide imageRepository override for 'kubeadm config images' commands. 2019-03-28 20:53:39 -07:00
Kubernetes Prow Robot 91f40aec8a
Merge pull request #75847 from fabriziopandini/fix-external-etcd
kubeadm: fix join control-plane with external-etcd
2019-03-28 16:54:16 -07:00
fabriziopandini f09d6388b2 fix-external-etcd 2019-03-28 23:25:18 +01:00
Kubernetes Prow Robot c5114ee6c3
Merge pull request #75762 from SataQiu/fix-kubeadm-gates-20190327
Fix none feature gates list
2019-03-28 10:30:43 -07:00
SataQiu c9cd3db627 fix none feature gates list 2019-03-28 20:11:47 +08:00
Kubernetes Prow Robot 6a277e0c4d
Merge pull request #75784 from bart0sh/PR0069-kubeadm-use-t.Run-in-app-phases
kubeadm: use t.Run in app/phases
2019-03-28 02:34:43 -07:00
Kubernetes Prow Robot 7131617d0c
Merge pull request #74399 from RA489/runpullimagescleanup
Rename RunPullImagesCheck to PullControlPlaneImages
2019-03-27 16:01:03 -07:00
Ed Bartosh 296df304a4 kubeadm: use t.Run in app/phases
Used T.Run API for kubeadm tests in app/phases/*

This should improve testing output and make it more visible
which test is doing what.

Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
2019-03-27 19:39:30 +01:00
Kubernetes Prow Robot 5a6c66a729
Merge pull request #72454 from rojkov/kubeadm-fallback-version
kubeadm: add final fallback to constants.CurrentKubernetesVersion
2019-03-27 11:02:50 -07:00
Ed Bartosh 405a9715f1 kubeadm: implement deletion of multiple tokens 2019-03-27 11:00:40 +01:00
Kubernetes Prow Robot 531dbd409f
Merge pull request #75445 from shinytang6/enhance/fmt
Replace all time.Now().Sub with time.Since
2019-03-26 13:55:17 -07:00
Kubernetes Prow Robot f3efd1d0b7
Merge pull request #75036 from bart0sh/PR0065-kubeadm-replace-RequiredIPVSKernelModulesAvailable-check
kubeadm: reimplement IPVS check
2019-03-25 13:24:38 -07:00
Kubernetes Prow Robot 3c9c7fca64
Merge pull request #75027 from ping035627/k8s-190306
Add some logs for kubeadm join
2019-03-25 03:23:07 -07:00
PingWang 5a8174bd45 Add some logs for kubeadm join
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
2019-03-25 10:07:47 +08:00
Kubernetes Prow Robot 9c53f24012
Merge pull request #75179 from rosti/kill-v1alpha3
kubeadm: remove v1alpha3
2019-03-22 17:02:21 -07:00
aaa 867ad233c6 Replace variables 10251 and 10252 with constants
update pull request

update pull request
2019-03-22 00:27:53 -04:00
aaa 112da093ed Define common sentences as constants
update pull request

update pull request

update pull request

update pull request

update pull request

update pull request
2019-03-21 18:56:42 -04:00
aaa 5c8e550a29 Simplify two if
update pull request

update pull request

update pull request

update pull request

update pull request

update pull request
2019-03-21 18:32:00 -04:00
Kubernetes Prow Robot 0c93929298
Merge pull request #75178 from rosti/kill-commonconfig
kubeadm: Cleanup CommonConfiguration
2019-03-21 13:35:36 -07:00
Kubernetes Prow Robot ad4727440c
Merge pull request #75185 from ereslibre/certs-integration
kubeadm: add integration tests for certs transfer
2019-03-21 05:17:36 -07:00
shinytang6 5c9f4d9dc6 replace time.Now().Sub with time.Since 2019-03-21 18:02:55 +08:00
Kubernetes Prow Robot b1e7c20a07
Merge pull request #75318 from ymlong/fix-20190313
Correcting a spelling error
2019-03-20 09:53:24 -07:00
Kubernetes Prow Robot 30071b31c7
Merge pull request #75261 from rosti/fix-fuzzer-cri
kubeadm: Fix fuzzer test for NodeRegistrationOptions
2019-03-20 05:25:05 -07:00
Kubernetes Prow Robot cad1b4dbac
Merge pull request #75252 from d-kuro/feature/fix-typo
Fixed typo
2019-03-20 05:24:49 -07:00
Kubernetes Prow Robot 5e90834abe
Merge pull request #75102 from qingsenLi/k8s190307-fix-typo
fix a typo
2019-03-20 00:54:23 -07:00
Kubernetes Prow Robot 16b5f7d3c5
Merge pull request #67487 from tianshapjq/validate-system-kube-reserved
validate systemReservedCgroup and kubeReservedCgroup
2019-03-19 21:26:22 -07:00
Kubernetes Prow Robot c7e56c7ea1
Merge pull request #74719 from vaamarnath/refactor-dir-create-for-dry-runs
kubeadm: refactored directory fetch code
2019-03-19 20:15:20 -07:00
Marques Johansson 10102cef3c Restore machine readability to the print-join-command output
The output of `kubeadm token create --print-join-command` should be
usable by batch scripts. This issue was pointed out in:

https://github.com/kubernetes/kubeadm/issues/1454
2019-03-19 17:50:04 -04:00
Kubernetes Prow Robot b61baea135
Merge pull request #75420 from fabriziopandini/fix-kubeadm-init-output
fix kubeadm init output
2019-03-18 06:07:11 -07:00
fabriziopandini fcadf143a5 fix-kubeadm-init-output 2019-03-18 12:52:41 +01:00
Kubernetes Prow Robot ebea037729
Merge pull request #75431 from fabriziopandini/fix-external-ca
fix kubeadm external CA Mode
2019-03-17 06:28:56 -07:00
fabriziopandini ff072aa639 fix-external-ca 2019-03-17 13:03:40 +01:00
Kubernetes Prow Robot fe8b1e24ee
Merge pull request #75425 from liggitt/kubeadm-insecure-port
Kubeadm insecure port
2019-03-16 17:24:55 -07:00
Jordan Liggitt d4591ea324 Revert "Stop using API server's `--insecure-port`"
This reverts commit 5b64a98689.
2019-03-16 16:24:49 -04:00
Kubernetes Prow Robot 1a24040447
Merge pull request #74781 from liggitt/http2-watch
kubelet watch-manager test, restore watch-based manager default
2019-03-16 12:52:56 -07:00
Rafael Fernández López bc26c69b61
kubeadm: Allow certain certs/keys to be missing on the secret.
Under certain circumstances, specially when using an insecure external
etcd cluster (no certificates), or when using external certificates (
no CA key), some keys inside the kubeadm-certs secret data can contain
the key with an empty value on the map.

When downloading certs just ignore those that are blank and inform the
user about it.
2019-03-15 23:34:17 +01:00
Ed Bartosh 2914171ed4 kubeadm: reimplement IPVS check
Used existing IPVS Proxier API CanUseIPVSProxier instead
of custom implementation.

Fixes kubernetes/kubeadm#975
2019-03-14 16:52:21 +02:00
RA489 8bcc82a9e4 Rename RunPullImagesCheck to PullControlPlaneImages 2019-03-14 15:37:38 +05:30
Jordan Liggitt f2a0c0342c Revert "Revert kubelet to default to ttl cache secret/configmap behavior"
This reverts commit cd1c9f9018.
2019-03-13 15:12:26 -07:00
Amarnath be8d1c24f1 kubeadm: refactored directory fetch code 2019-03-13 18:28:53 +05:30
ymlong 8be2a4c9f6 Correcting a spelling error 2019-03-13 11:15:50 +08:00
Kubernetes Prow Robot 50bf223a05
Merge pull request #75224 from neolit123/certs-print-key-on-phase
kubeadm: print key inside the upload-certs phase of init
2019-03-11 12:00:15 -07:00
Rafael Fernández López 8737720a7d
kubeadm: add integration tests for certs transfer
* Upload certificates: generate certificates and check that the kubeadm-certs
  secret is populated with the expected contents.

* Download certificates: given we have a kubeadm-certs secret, ensure that
  keys and certificates are copied on the expected target, and that depending
  on the secret nature they have the expected permissions.
2019-03-11 16:27:37 +01:00
Rostislav M. Georgiev 2c4a3ae24c kubeadm: Fix fuzzer test for NodeRegistrationOptions
The fuzzer test for NodeRegistrationOptions is defaulting the CRISocket member.
This is a left over from the times this member was statically defaulted in the
config. Now that the member is dynamically defaulted, setting CRISocket to foo
can cause issues to get undetected by the fuzzer test with this member.

The resolution is to stop setting CRISocket in the fuzzer test.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2019-03-11 14:09:53 +02:00
d-kuro 4f301cc97a
Fix typo 2019-03-11 13:12:46 +09:00
Lubomir I. Ivanov c5c4cd2580 kubeadm: print key inside the upload-certs phase of init
The standalone execution of upload-certs phase does not print
the key that that user should use for the newly uploaded encrypted
secret. Print this key in the upload-certs phase in both
standalone mode or if executed in the standard init workflow.

Make it possible to omit the printing if the user passes
--skip-certificate-key-print.

Also:
- Uppercase string in Printf call in copycerts.go
- Don't use V(1) for the "Skipping phase" message in uploadcerts.go
instead always print a message that the user case use
--experimental-upload-certs. This solves a problem if the user tried
the standalone phase but didn't pass --experimental-upload-certs.
2019-03-10 19:13:06 +02:00
Rafael Fernández López b57c8e2c45
kubeadm: fix join message if kubeadm-certs secret is not present
`kubeadm init phase upload-certs` requires --experimental-upload-certs
argument. Make this explicit in the error if the secret is missing.
2019-03-08 22:34:11 +01:00
Rostislav M. Georgiev 36783eb88b kubeadm: remove v1alpha3
Remove deprecated old v1alpha3 kubeadm config.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2019-03-08 14:54:51 +02:00
Rostislav M. Georgiev 4567e7e79e kubeadm: Cleanup CommonConfiguration
CommonConfiguration is an interface, that aims at abstracting common
configuration of InitConfiguration and JoinConfiguration. It was never widely
used and never got too much functionality attached to it. With recent
developments in the kubeadm config field, it got even more out of touch with
reality and where things are going.
Thus, the only viable solution is to remove it completely.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2019-03-08 14:45:30 +02:00
qingsenLi 55d34ac97e fix a typo 2019-03-08 04:05:49 +08:00
Kubernetes Prow Robot f0418ac3c2
Merge pull request #75082 from neolit123/reset-clean-status
kubeadm-reset: add means to clear the ClusterStatus
2019-03-07 05:15:02 -08:00
Marek Counts a9eea0a353 kubeadm-reset: add means to clear the ClusterStatus
Add ResetClusterStatusForNode() that clears a certain
control-plane node's APIEndpoint from the ClusterStatus
key in the kubeadm ConfigMap on "kubeadm reset".
2019-03-07 04:03:19 +02:00
Timothy St. Clair ef31616e45 Revert "Merge pull request #74628 from hpandeycodeit/alpha_kubeconf"
This reverts commit 7053e43b2e, reversing
changes made to d58ff3bfc0.
2019-03-06 14:07:15 -06:00
Kubernetes Prow Robot c360bac6e2
Merge pull request #75032 from rosti/win-test
kubeadm: Don't hardcode temp path in a test
2019-03-06 09:51:15 -08:00
Kubernetes Prow Robot 0e2c26829c
Merge pull request #75013 from neolit123/fix-join-flags
kubeadm: amend flags for join phases
2019-03-06 09:51:04 -08:00
Kubernetes Prow Robot 5ff303000a
Merge pull request #72685 from yagonobre/bump-minimum
Bump minimum kubeadm supported version to v1.13
2019-03-06 08:24:10 -08:00
Rostislav M. Georgiev 5a3b1a0c7c kubeadm: Don't hardcode temp path in a test
Hardcoding a temp path of /tmp/... is not portable and can potentially cause
other issues (such as flakyness) too.
Use TempFile instead.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2019-03-06 12:27:31 +02:00
Kubernetes Prow Robot e15ebcd632
Merge pull request #74952 from ping035627/k8s-190305
Fix some typos
2019-03-06 02:08:02 -08:00
Kubernetes Prow Robot d7971e24f3
Merge pull request #74870 from neolit123/fix-join-phase
kubeadm: update output of init, join reset commands
2019-03-06 00:44:38 -08:00
Kubernetes Prow Robot 2b63efcd3e
Merge pull request #74671 from yagonobre/certificate-key
Add certificate-key to kubeadm upload-certs phase, and improve init output
2019-03-05 21:42:32 -08:00
Lubomir I. Ivanov 3e151ab546 kubeadm: amend flags for join phases
Certain join phases have flags that are redundant:
- getControlPlanePreparePhaseFlags():
  - amend flags (use switch / case)
  - add example for the parent command
  - rename internal function and sub-phase "manifests"
    to "control-plane"
- getControlPlaneJoinPhaseFlags():
  - amend flags
  - remove MacroCommandLongDescription
2019-03-06 04:59:35 +02:00
Yago Nobre 59d2f13850
Bump minimum kubeadm supported version to v1.12 2019-03-05 23:45:17 -03:00
Lubomir I. Ivanov 6f6b364b9c kubeadm: update output of init, join reset commands
- move most unrelated to phases output to klog.V(1)
- rename some prefixes for consistency - e.g.
[kubelet] -> [kubelet-start]
- control-plane-prepare: print details for each generated CP
component manifest.
- uppercase the info text for all "[reset].." lines
- modify the text for one line in reset
2019-03-06 03:17:35 +02:00
Yago Nobre b1936853c4
Add certificate-key to kubeadm init upload-certs phase, and improve init output 2019-03-05 14:35:52 -03:00
PingWang 55dac4804f Fix some typos
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
2019-03-05 17:58:09 +08:00
Lubomir I. Ivanov af9e3fcfaa kubeadm: add a flag to RunInitNodeChecks to indicate sec. control-plane
Add an extra flag isSecondaryControlPlane to RunInitNodeChecks
which can be used to indicate that the node we are checking is
a secondary control-plane. In such a case we skip some tests
that are already covered by  RunJoinNodeChecks and
RunOptionalJoinNodeChecks.
2019-03-05 02:44:30 +02:00
Lubomir I. Ivanov 269a07c077 kubeadm-reset: fetch init config only if client is non-nil 2019-03-04 04:14:51 +02:00
Kubernetes Prow Robot 37f0138278
Merge pull request #71874 from neolit123/fix-kubeconfig-path
kubeadm: use DefValue for the --kubeconfig flag
2019-03-03 17:28:44 -08:00
Kubernetes Prow Robot 1f6ea0455b
Merge pull request #74780 from pytimer/kubeadm-reduce
kubeadm: reduce some functions number of parameters
2019-03-03 04:23:24 -08:00
pytimer f600348006 kubeadm: reduce some functions number of parameters 2019-03-03 15:16:19 +08:00
fabriziopandini a3ed9f0c2c join-phases-texts 2019-03-02 21:52:04 +01:00
Kubernetes Prow Robot e1b79abfec
Merge pull request #74831 from fabriziopandini/remove-discovery-flags
Remove discovery flags from kubeadm join phases (when possible)
2019-03-02 11:16:12 -08:00
fabriziopandini 5ecd74afbe remove-discovery-flags 2019-03-02 18:31:32 +01:00
Kubernetes Prow Robot d8d260a09d
Merge pull request #74755 from liggitt/kubelet-watch
Revert kubelet to default to ttl cache secret/configmap behavior
2019-03-01 19:14:14 -08:00
Kubernetes Prow Robot fc30b38021
Merge pull request #74756 from fabriziopandini/cleanup-join-phases
Cleanup join data struct
2019-03-01 14:08:58 -08:00
Kubernetes Prow Robot 098075c458
Merge pull request #74797 from fabriziopandini/fix-go-vet-1.12
kubeadm fix for go vet 1.12
2019-03-01 12:49:18 -08:00
fabriziopandini d0d843c588 fix-go-vet-1.12 2019-03-01 15:13:17 +01:00
peibingit d41ad755c1
Update types.go 2019-03-01 12:03:12 +08:00
Kubernetes Prow Robot 9fd7a4c2dc
Merge pull request #74751 from fabriziopandini/cleanup-join-phases-flags
cleanup-join-phases-flags
2019-02-28 17:52:30 -08:00
Jordan Liggitt cd1c9f9018 Revert kubelet to default to ttl cache secret/configmap behavior 2019-02-28 17:54:22 -05:00
fabriziopandini 4c27d6a213 cleanup-join-phases 2019-02-28 23:37:25 +01:00
fabriziopandini d102dac411 cleanup-join-phases-flags 2019-02-28 22:25:35 +01:00
Dmitry Rozhkov bb8f4ac84f kubeadm: use Infoln instead of Infof where appropriate 2019-02-28 16:12:34 +02:00