Commit Graph

4295 Commits

Author SHA1 Message Date
Stephen Kitt
4c83aae2cc kubeadm: replace intstr.FromInt with intstr.FromInt32
This touches cases where FromInt() is used on numeric constants, or
values which are already int32s, or int variables which are defined
close by and can be changed to int32s with little impact.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
2023-05-01 09:17:50 +02:00
Kubernetes Prow Robot
bc872028ab Merge pull request #117660 from pacoxu/UpgradeAddonsBeforeControlPlane
kubeadm: add deprecated FG UpgradeAddonsBeforeControlPlane
2023-04-29 20:50:17 -07:00
Kubernetes Prow Robot
9924dc65b7 Merge pull request #117614 from chendave/multi_cri
kubeadm: fix unit test failure on node with multiple cri endpoints
2023-04-28 01:30:16 -07:00
Dave Chen
2572a43034 kubeadm: fix unit test failure on node with multiple cri endpoints
Signed-off-by: Dave Chen <dave.chen@arm.com>
2023-04-28 15:00:16 +08:00
Paco Xu
c6f4bee98d kubeadm: add deprecated FG UpgradeAddonsBeforeControlPlane 2023-04-28 13:55:46 +08:00
Kubernetes Prow Robot
78b56ce16d Merge pull request #116570 from SataQiu/fix-kubeadm-20230314
kubeadm: support upgrade coredns and kube-proxy addons after all the control plane instances have been upgraded
2023-04-27 01:44:26 -07:00
SataQiu
170d5ef9fa code cleanup for kubeadm 2023-04-26 23:51:39 +08:00
SataQiu
e3d84aa93c kubeadm: add the experimental (alpha) feature gate UpgradeAddonsAfterControlPlane that supports upgrade coredns and kube-proxy addons after all the control plane instances have been upgraded 2023-04-25 22:12:50 +08:00
Kubernetes Prow Robot
c0804231b9 Merge pull request #117521 from nberlee/fix-coredns-rbac
remove nodes resource from CoreDNS RBAC manifest
2023-04-24 10:57:13 -07:00
Kubernetes Prow Robot
b35ffd1dcb Merge pull request #113969 from Octopusjust/k8s-pr11
Add test for cmd/kubeadm/app/phases/upgrade/compute.go
2023-04-24 02:45:01 -07:00
SataQiu
3469bb05db kubeadm: fix unit test panic for TestNewResetData 2023-04-22 17:02:34 +08:00
Nico Berlee
39e52449f9 remove nodes resource from CoreDNS RBAC manifest
This commit syncs RBAC from coredns/deployment and removes a get nodes
RBAC.

Historically the federation CoreDNS plugin needed the nodes resource to
fetch zone and region labels.

However, the CoreDNS federation plugin was deprecated and cleaned up a
long time ago and removed the Nodes RBAC requirement here in
`coredns/deployment` coredns.yaml.sed:
https://github.com/coredns/deployment/pull/229

This change however, never made it to `kubernetes/kubernetes`.

Signed-off-by: Nico Berlee <nico.berlee@on2it.net>
2023-04-21 15:10:31 +02:00
Chris Bandy
b9ef160322 Cleanup environment in tests that call os.Unsetenv
testing.T.Cleanup ensures the environment is restored after a test and
any of its parallel sub-tests. It's possible that some of these can be
simplified further to T.Setenv(key, ""), but I did not investigate.
2023-04-17 20:03:33 -05:00
Chris Bandy
240fccd766 Replace os.Setenv with testing.T.Setenv in tests
T.Setenv ensures that the environment is returned to its prior state
when the test ends. It also panics when called from a parallel test to
prevent racy test interdependencies.
2023-04-17 20:03:09 -05:00
cui fliter
1359ebcc5b fix doc mismatch
Signed-off-by: cui fliter <imcusg@gmail.com>
2023-04-16 18:29:45 +08:00
guangli.bao
046bb89256 supported version of etcd 3.5.7-0 for Kubernetes v1.27.0-rc.0
Signed-off-by: guangli.bao <guangli.bao@daocloud.io>
2023-04-08 17:56:21 +08:00
Kubernetes Prow Robot
fe9dc2ee11 Merge pull request #116573 from claudiubelu/fix-kubeadm-unittests
unit tests: Fixes init and rejoin unit tests for Windows
2023-03-14 08:36:52 -07:00
Kubernetes Prow Robot
4f76e4a0fd Merge pull request #115603 from pacoxu/coredns-v1.10.1
update coredns to v1.10.1
2023-03-14 08:36:28 -07:00
Claudiu Belu
4f16887a11 unit tests: Fixes init and rejoin unit tests for Windows
The default CRI Socket on Windows is npipe://./pipe/containerd-containerd.
2023-03-14 09:45:16 +00:00
Kubernetes Prow Robot
bd1435dccd Merge pull request #114016 from songxiao-wang87/runwxs-test3
word misspelling
2023-02-28 14:53:16 -08:00
Kubernetes Prow Robot
fb37f1331b Merge pull request #113574 from chendave/cleanup_testcases
kubeadm: Improve testcases for `init` and `join` command
2023-02-28 00:43:16 -08:00
SataQiu
70b33409de kubeadm: modify '--config' flag from required to optional for 'kubeadm kubeconfig user' 2023-02-27 12:19:31 +08:00
Dave Chen
a825450707 kubeadm: improve test coverage by validating the data structure
data structure is what returned if everything okay, but this
structure is not validated at all both in `init` and `join` cmd.

Signed-off-by: Dave Chen <dave.chen@arm.com>
2023-02-27 10:41:25 +08:00
Paco Xu
b24725eed7 update coredns to v1.10.1
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
2023-02-26 09:25:40 +08:00
Paco Xu
b1ee8c8b82 kubeadm: no need to check if target coredns version is not changed 2023-02-25 21:53:28 +08:00
Kubernetes Prow Robot
70c129fea5 Merge pull request #115420 from chendave/2806
kubeadm: skip ipv4 check if the cluster is using IPv6 address
2023-02-23 02:51:36 -08:00
Dave Chen
66f043f650 kubeadm: skip ipv4 check if the cluster is using IPv6 address
Signed-off-by: Dave Chen <dave.chen@arm.com>
2023-02-22 10:02:54 +08:00
Claudiu Belu
2e2ef9b0e7 unit tests: Fixes kubeadm postupgrade failing unit test on Windows
The unit test TestWriteKubeletConfigFiles fails on Windows because the
file not found error message is different on Windows.
2023-02-21 16:53:06 +00:00
Kubernetes Prow Robot
bd914b493c Merge pull request #115676 from chendave/conversion_api
kubeadm: remove the manual conversion from versioned cluster cfg to internal cfg
2023-02-20 02:53:48 -08:00
Kubernetes Prow Robot
8e31885e36 Merge pull request #115575 from SataQiu/fix-20230207
kubeadm: fix a bug where the uploaded kubelet configuration in kube-system/kubelet-config ConfigMap does not respect user patch
2023-02-16 00:45:38 -08:00
SataQiu
d12b4d4c67 kubeadm: show a warning message when detecting that the sandbox image of the container runtime is inconsistent with that used by kubeadm 2023-02-10 14:59:40 +08:00
Dave Chen
82990268ec kubeadm: remove the manual conversion from versioned cluster cfg to internal cfg
The manual conversion was needed to adapt `ClusterConfiguration.DNS` from v1beta2
to v1beta3, now that v1beta2 is removed from the code base, the manual conversion
is unnecessary as well.

The help to reduce the maintenance efforts.

Signed-off-by: Dave Chen <dave.chen@arm.com>
2023-02-10 14:46:15 +08:00
SataQiu
69e50cabd2 kubeadm: fix a bug where the uploaded kubelet configuration in kube-system/kubelet-config ConfigMap does not respect user patch 2023-02-07 18:24:31 +08:00
Kubernetes Prow Robot
8e20effbb7 Merge pull request #114695 from chendave/fix_cross_move
kubeadm: backup kubelet config for "upgrade node" and "upgrade apply"
2023-02-07 02:18:58 -08:00
Kubernetes Prow Robot
6eb008620c Merge pull request #115379 from artemvmin/serial-mkfs
Add an option to limit the number of concurrent mkfs calls
2023-02-06 18:26:58 -08:00
Kubernetes Prow Robot
561a35f358 Merge pull request #115038 from mercedes-benz/tobiasgiese/kubeadmfix-etcd-learner-join
kubeadm: fix etcd learner join
2023-02-06 02:09:01 -08:00
Artem Minyaylov
f573e14942 Update k8s.io/utils to latest version
Update all usages of FakeExec to pointer to avoid copying the mutex
2023-02-04 11:05:22 -08:00
Dave Chen
5127cbf949 kubeadm: backup kubelet config file for upgrade apply
Back up kubelet config file for `kubeadm upgrade apply`, some code
refactoring is done to de-dup some redundant code logic.

Signed-off-by: Dave Chen <dave.chen@arm.com>
2023-02-02 12:09:18 +08:00
Dave Chen
9e6e13e562 kubeadm: include the err got from PrintDryRunFile
The error was ingored which means if anything wrong from `PrintDryRunFiles`,
it was sliently ignored.

Signed-off-by: Dave Chen <dave.chen@arm.com>
2023-02-02 12:00:19 +08:00
Dave Chen
c55a98fde9 kubeadm: fix invalid cross-device link error
The root cause for that error is because `rename` doesn't work
across different mount points.

The kubelet config file and back up directory are mounted to
different file system in kinder environment.

```
df /var/lib/kubelet/config.yaml | tail -n1 | awk '{print $1}'
/dev/sda2

df /etc/kubernetes/tmp/kubeadm-kubelet-configxxx | tail -n1 | awk '{print $1}'
overlay
```

Call `cp` instead of `rename` to back up the kubelet file would fix
that issue.

Signed-off-by: Dave Chen <dave.chen@arm.com>
2023-02-02 11:43:18 +08:00
Dave Chen
016cc0c120 kubeadm:[cherry-pick]backup kubelet config for "upgrade node"
This addresses the TODO item so that the old kubelet config file could
be recovered if something goes wrong.

Signed-off-by: Dave Chen <dave.chen@arm.com>
Co-authored-by: Paco Xu <paco.xu@daocloud.io>
2023-02-02 11:43:18 +08:00
Kubernetes Prow Robot
5681b0da14 Merge pull request #115338 from danwinship/nodeutil.gethostname
Move GetHostname() from k/k/pkg/util/node to k/component-helpers/node/util
2023-01-30 09:07:20 -08:00
Dan Winship
f994ae2521 Move GetHostname() from k/k/pkg/util/node to k/component-helpers/node/util
In fact, this actually uses pkg/util/node's GetHostname() but takes
the unit tests from cmd/kubeadm/app/util's private fork of that
function since they were more extensive. (Of course the fact that
kubeadm had a private fork of this function is a strong argument for
moving it to component-helpers.)
2023-01-27 18:24:38 -05:00
Mohamed Zaian
90570b7595 etcd: Update to version 3.5.7 2023-01-27 17:24:00 +01:00
Tobias Giese
ea46c91868 kubeadm: promote member after the static pod manifest was written
Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>
Co-authored-by: Christian Schlotter <christi.schlotter@gmail.com>
2023-01-16 11:11:58 +01:00
Lubomir I. Ivanov
7938631e22 Revert "UpdateOrCreateToken get secrets err handling optimization" 2023-01-14 00:11:49 +02:00
Kubernetes Prow Robot
a66aad2d80 Merge pull request #115000 from helen-frank/feature/UpdateOrCreateTokenAddErrProcessing
UpdateOrCreateToken get secrets err handling optimization
2023-01-12 19:57:12 -08:00
Kubernetes Prow Robot
2b69bec35d Merge pull request #114901 from SataQiu/fix-lint-error-20230108
Fix gocritic lint errors for cmd/kubeadm/*
2023-01-12 09:05:06 -08:00
helen
e6591d24ce when UpdateOrCreateTokens get secrets, if the error is not a NotFound, the error is thrown in time
Signed-off-by: helen <haitao.zhang@daocloud.io>
2023-01-12 20:50:02 +08:00
SataQiu
3df577ea28 kubeadm: remove unused variable DefaultAuditPolicyLogMaxAge 2023-01-12 12:30:30 +08:00