Commit Graph

2644 Commits

Author SHA1 Message Date
Ed Bartosh
ad0179897d kubeadm: skip upgrade if manifest is not changed
When doing upgrades kubeadm generates new manifest and
waits until kubelet restarts correspondent pod.

However, kubelet won't restart pod if there are no changes
in the manifest. That makes kubeadm stuck waiting for
restarted pod.

Skipping upgrade if new component manifest is the same as
current manifest should solve this.

Fixes: kubernetes/kubeadm#1054
2018-10-17 11:07:51 +03:00
k8s-ci-robot
1e4ad048fa Merge pull request #67763 from rosti/join-discovery-split
kubeadm: Split discovery from JoinConfiguration
2018-10-16 19:25:47 -07:00
k8s-ci-robot
ee4346651c Merge pull request #69800 from xichengliudui/fix181015
Fixing grammatical errors
2018-10-16 17:53:20 -07:00
Andrew Rynhard
197fd02dca Fix node join taints 2018-10-16 14:24:53 -07:00
k8s-ci-robot
d169696b2e Merge pull request #69622 from fabriziopandini/kubeadm-add-phase-runner
kubeadm refactor cmd init
2018-10-16 13:01:42 -07:00
Rostislav M. Georgiev
576b8d3f4f kubeadm: Split discovery from JoinConfiguration
This change splits out discovery fields from JoinConfiguration by performing
the following changes:

- Introduce a BootstrapTokenDiscovery structure, that houses configuration
  options needed for bootstrap token based discovery.

- Introduce a FileDiscovery structure, that houses configuration options
  (currently only a single option) needed for KubeConfig based discovery.

- Introduce a Discovery structure, that houses common options (such as
  discovery timeout and TLS bootstrap token) as well as pointer to an instance
  of either BootstrapTokenDiscovery or FileDiscovery structures.

- Replace the old discovery related JoinConfiguration members with a single
  Discovery member.

This change is required in order to cleanup the code of unnecessary logic and
make the serialized JoinConfiguration more structured (and therefore, more
intuitive).

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2018-10-16 15:25:32 +03:00
fabriziopandini
68b4286ae0 cmd init refactor 2018-10-16 11:38:42 +02:00
xichengliudui
0dba66a2a1 Delete repeated words and fix misspellings
Delete repeated words and fix misspellings
2018-10-16 01:05:05 -04:00
k8s-ci-robot
2f8b585d9c Merge pull request #69330 from vaikas-google/json-patch
Add support for JSON patch in fake client
2018-10-15 15:04:32 -07:00
Tomáš Kukrál
a031d03501 use etcd endpoint from advertise-client-urls
It makes more sense to use advertised etcd endpoints instead of using
listened client URLS.

I'm solving this use case: Listen on localhost and public IP but I don't
want to add multiple endpoints to kube-apiservers because it's targeting
same etcd server.
2018-10-15 21:23:13 +02:00
k8s-ci-robot
b11211ed8c Merge pull request #69645 from neolit123/kubeadm-set-version-fix
kubeadm: modify SetKubernetesVersion
2018-10-15 11:40:42 -07:00
xichengliudui
a20fbf0b5a Fix syntax error
Fixing grammatical errors
2018-10-15 06:52:55 -04:00
Ibrahim AshShohail
2fb3ba71f1 Update usages of http.ResponseWriter.WriteHeader to use http.Error
Signed-off-by: Ibrahim AshShohail <me@ibrasho.com>
2018-10-14 05:58:00 +03:00
k8s-ci-robot
653b027200 Merge pull request #69646 from zhouhaozz/delete-cert
certs: Delete useless code
2018-10-13 08:47:13 -07:00
Lubomir I. Ivanov
fa9940c71c kubeadm: modify SetKubernetesVersion
Without this patch SetKubernetesVersion does not set
a version in all locations where it's called, because
the passed config to it always has a default version
stable-1.

This always triggers the != "" check and the function
returns without setting a version.

Validate against DefaultKubernetesVersion and "" instead.

This fixes all cases where fetching a version from the internet
is not needed at all - e.g. "kubeadm token create".

Also make SetKubernetesVersion default to version.Get().String()
and add unit tests for the function.
2018-10-13 17:16:22 +03:00
k8s-ci-robot
e4200cea9c Merge pull request #69354 from yujuhong/rm-jwt
GCP: Remove the deprecated google-json-key support
2018-10-12 17:16:46 -07:00
k8s-ci-robot
f22334f14d Merge pull request #69720 from fabriziopandini/kubeadm-add-etcd-ports-constant
Kubeadm - Add etcd ports constant
2018-10-12 16:02:01 -07:00
k8s-ci-robot
7d45044c11 Merge pull request #69684 from fabriziopandini/kubeadm-add-phase-runner2
kubeadm add phase runner
2018-10-12 14:48:56 -07:00
fabriziopandini
6a8ace5c65 add phase runner 2018-10-12 17:55:10 +02:00
fabriziopandini
66e846fa26 Add etcd ports constant 2018-10-12 09:33:07 +02:00
k8s-ci-robot
709ac9ce85 Merge pull request #69624 from bart0sh/PR0029-kubeadm-token-mix-config-with-print-join-command
kubeadm: allow usage --config with --print-join-command
2018-10-11 11:06:58 -07:00
k8s-ci-robot
8f620950e2 Merge pull request #69614 from mitar/patch-1
Adding more kernel config paths
2018-10-11 03:36:22 -07:00
Ville Aikas
a363b15385 Add support for JSON patch in fake client 2018-10-11 08:13:50 +00:00
Zhou Hao
081cf49671 certs: Delete useless code
Signed-off-by: Zhou Hao <zhouhao.oci@gmail.com>
2018-10-11 09:16:48 +08:00
k8s-ci-robot
8a4022fd49 Merge pull request #69517 from SataQiu/fix-2018100801
cleanup: delete duplicate lines
2018-10-10 16:46:45 -07:00
k8s-ci-robot
77742ea94c Merge pull request #69301 from neolit123/kubeadm-version-stable
kubeadm: handle stable-1 as the default version
2018-10-10 12:01:18 -07:00
k8s-ci-robot
ccf6611c65 Merge pull request #69586 from neolit123/kubeadm-cleanup-init
kubadm: remove misleading message in `init`
2018-10-10 06:03:24 -07:00
k8s-ci-robot
c487e67290 Merge pull request #69575 from fabriziopandini/Kubeadm-api-doc
kubeadm - improve api config documentation
2018-10-10 06:03:04 -07:00
Ed Bartosh
eacff9436e kubeadm: allow usage --config with --print-join-command
kubeadm token create  --print-join-command --config <path>
fails with Error: can not mix '--config' with arguments [print-join-command]

As print-joint command can't be put into the configuration file it
should be possible to use those 2 options at the same time.

Added print-join-command options to the list of exceptions in
ValidateMixedArguments check to allow its usage with --config option.

Fixes: kubernetes/kubeadm#1166
2018-10-10 16:00:55 +03:00
Mitar
3f8ef7c6f8 Adding more kernel config paths 2018-10-10 00:37:14 -07:00
Lubomir I. Ivanov
28c936ea7f kubadm: remove misleading message in init
The message right before the kubelet boots up the control
plane is misleading because the image pulling is now part of
preflight.

Remove the message.
2018-10-09 22:27:12 +03:00
fabriziopandini
17cf652783 kubeadm-improve-apidoc 2018-10-09 17:40:05 +02:00
Pingan2017
e734553d3d remove --skip-preflight-checks deprecated info 2018-10-08 17:23:46 +08:00
SataQiu
6b7951a2d0 cleanup: delete duplicate lines 2018-10-08 17:14:22 +08:00
RA489
8729cade98 util/config` packages; filenames and methods should be updated to use new names 2018-10-08 14:12:17 +05:30
Christoph Blecker
97b2992dc1 Update gofmt for go1.11 2018-10-05 12:59:38 -07:00
k8s-ci-robot
b836fa432e Merge pull request #69420 from ereslibre/fix-kubeadm-panic
kubeadm: do not panic if etcd local alpha phase is called when an external etcd config is used
2018-10-05 10:55:30 -07:00
Rostislav M. Georgiev
f0d82fb5f4 kubeadm: Allow mixing Init and Join Configurations
This change allows mixing InitConfiguration/ClusterConfiguration with
JoinConfiguration in a single YAML file, by performing the following changes:

- Replace the explicit error in `DetectUnsupportedVersion` with a warning.
- Modify `NodeConfigFileAndDefaultsToInternalConfig` to use only
  `JoinConfiguration`.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2018-10-05 10:46:23 +03:00
Rafael Fernández López
503c6c7b85 kubeadm: do not panic if etcd local alpha phase is called when an external etcd config is used
If etcd local alpha phase is called manually while the kubeadm configuration
points to an external etcd cluster kubeadm panics.
2018-10-05 07:55:17 +02:00
Lubomir I. Ivanov
505413581e kubeadm: handle stable-1 as the default version
The default version in kubeadm is now `stable-1`. This will
pull a version from the `stable-1.txt` endpoint which might
end up being newer than the version of the client by a magnitude
of MINOR or even a MAJOR release.

To be able to prevent this scenario add the new helper function:
validateStableVersion()

This function determines if the remote version is newer than the
local client version and if that's the case it returns `stable-X.xx`
that conforms with the version of the client. If not it returns
the remote version.
2018-10-05 00:02:57 +03:00
fabriziopandini
b4092acdb6 autogenerated 2018-10-04 13:20:20 +02:00
fabriziopandini
9aec633c40 Fix tests 2018-10-04 13:20:11 +02:00
fabriziopandini
488ac6825b Automated bump from v1alpha3 references to v1beta1 2018-10-04 12:03:38 +02:00
fabriziopandini
8ae5179a7b Add a duplicated v1beta1 API 2018-10-04 12:02:50 +02:00
Justin Santa Barbara
34b8433006 kubeadm: fix printf format error
go test in 1.11 verifies format strings; this fix is needed for the
test to pass with go 1.11.
2018-10-03 15:16:04 -04:00
k8s-ci-robot
c179a9c9df Merge pull request #67356 from yliaog/master
Moved staging/src/k8s.io/client-go/tools/bootstrap to staging/src/k8s…
2018-10-02 20:35:51 -07:00
Yu-Ju Hong
ed92397eff GCP: Remove the deprecated google-json-key support
The flag was deprecated in 1.10. According to the deprecation policy, it
is safe to remove the flag now.
2018-10-02 16:53:28 -07:00
Yu Liao
fc21115c3f Moved staging/src/k8s.io/client-go/tools/bootstrap to staging/src/k8s.io/cluster-bootstrap 2018-10-02 09:46:13 -07:00
Lubomir I. Ivanov
94e4c25ae6 kubeadm: include better details about v1alpha3 godocs
- update examples in v1alpha3/doc.go
- add docs link when printing `kubeadm config print-default`
2018-10-02 19:12:41 +03:00
k8s-ci-robot
1fbf7c5542 Merge pull request #69259 from xichengliudui/fix180929
Fix typo
2018-10-01 22:20:39 -07:00