Commit Graph

4285 Commits

Author SHA1 Message Date
Kubernetes Prow Robot
c8125c4029 Merge pull request #121305 from neolit123/1.29-super-admin-conf
kubeadm: add support for separate super-admin.conf kubeconfig file
2023-10-27 08:51:31 +02:00
Lubomir I. Ivanov
837090135f kubeadm: make super-admin.conf changes to app/cmd
- Update unit tests in certs_test.go related to the "renew" CLI command.
- In /init, (d *initData) Client(), make sure that the new logic
for bootstrapping an "admin.conf" user is performed, by calling
EnsureAdminClusterRoleBinding() from the phases backend. Add a
"adminKubeConfigBootstrapped" flag that helps call this logic only
once per "kubeadm init" binary execution.
- In /phases/init include a new subphase for generating
the "super-admin.conf" file.
- In /phases/reset make sure the file "super-admin.conf" is
cleaned if present. Update unit tests.
2023-10-26 07:36:03 +03:00
Lubomir I. Ivanov
30ed50d32e kubeadm: make super-admin.conf changes in app/phases
- Register the new file in /certs/renewal, so that the
file is renewed if present. If not present the common message "MISSING"
is shown. Same for other certs/kubeconfig files.
- In /kubeconfig, update the spec for admin.conf to use
the "kubeadm:cluster-admins" Group. A new spec is added for
the "super-admin.conf" file that uses the "system:masters" Group.
- Add a new function EnsureAdminClusterRoleBinding() that includes
logic to ensure that admin.conf contains a User that is properly
bound on the "cluster-admin" built-in ClusterRole. This requires
bootstrapping using the "system:masters" containing "super-admin.conf".
Add detailed unit tests for this new logic.
- In /upgrade#PerformPostUpgradeTasks() add logic to create the
"admin.conf" and "super-admin.conf" with the new, updated specs.
Add detailed unit tests for this new logic.
- In /upgrade#StaticPodControlPlane() ensure that renewal of
"super-admin.conf" is performed if the file exists.
Update unit tests.
2023-10-26 07:36:03 +03:00
Lubomir I. Ivanov
c2a04fa1cf kubeadm: fix export comments to make golangci-lint happy 2023-10-25 19:35:10 +03:00
Lubomir I. Ivanov
98bed52fdd kubeadm: make super-admin.conf changes in app/constants
- Add the new file name: super-admin.conf and a function
to return its default path GetSuperAdminKubeConfigPath()
- Add the ClusterAdminsGroupAndClusterRoleBinding object name.
2023-10-25 11:46:49 +03:00
SataQiu
16b3acc27a cleanup UnknownCRISocket for unit tests 2023-10-24 16:46:51 +08:00
SataQiu
71bedf5cb2 kubeadm: skip CRI detection for 'kubeadm upgrade diff' 2023-10-24 16:43:46 +08:00
Paco Xu
fb0ffb07a7 kubeadm coredns use drop ALL instead of all 2023-10-20 17:59:39 +08:00
SataQiu
a4efb6fc13 kubeadm: add debug log for kubeProxyConfigFromCluster 2023-10-20 11:01:30 +08:00
Kubernetes Prow Robot
c3809672aa Merge pull request #121352 from SataQiu/fix-kubeadm-2023101902
kubeadm: remove unused DNSAddOnType from v1beta4 API
2023-10-19 14:05:59 +02:00
SataQiu
8ae3277152 kubeadm: remove unused DNSAddOnType from v1beta4 API 2023-10-19 17:44:41 +08:00
SataQiu
259dd93e71 kubeadm: skip CRI detection for 'kubeadm config validate' 2023-10-19 15:08:47 +08:00
SataQiu
3da7802b7c kubeadm: cleanup UnknownCRISocket from staticpods test 2023-10-19 14:44:02 +08:00
Kubernetes Prow Robot
1cb6793776 Merge pull request #121262 from my-git9/ut-tlsbootstrap
kubeadm: increase ut coverage for bootstraptoken/node
2023-10-18 08:38:15 +02:00
xin.li
e312d93a66 kubeadm: increase ut coverage for bootstraptoken/node
Signed-off-by: xin.li <xin.li@daocloud.io>
2023-10-18 12:16:31 +08:00
Kubernetes Prow Robot
478c934c1a Merge pull request #121295 from SataQiu/clean-kubeadm-20231017
kubeadm: remove reference to UnknownCRISocket from getInitConfigurationFromCluster
2023-10-18 06:06:59 +02:00
Kubernetes Prow Robot
ba7feccfa3 Merge pull request #121290 from pacoxu/revert-119946-ignore_preflight_error
Revert "kubeadm: FeatureGate MergeCLIArgumentsWithConfig is added for ignorePreflightErrors"
2023-10-17 17:21:36 +02:00
Kubernetes Prow Robot
760599db27 Merge pull request #121282 from neolit123/1.29-fix-typos-in-elliptic-kubeadm-api
kubeadm: fix "eliptic" typo in API package
2023-10-17 16:14:36 +02:00
SataQiu
c281c70bac kubeadm: remove reference to UnknownCRISocket from getInitConfigurationFromCluster 2023-10-17 21:50:05 +08:00
Paco Xu
e3c58378bc Revert "kubeadm: FeatureGate MergeCLIArgumentsWithConfig is added for ignorePreflightErrors" 2023-10-17 20:26:58 +08:00
Lubomir I. Ivanov
a45a813d5e kubeadm: fix "eliptic" typo in API package
Should be "elliptic".
2023-10-17 12:16:03 +03:00
Dave Chen
defda81bf8 kubeadm: remove ClusterConfiguration parameter from preflight check
Signed-off-by: Dave Chen <dave.chen@arm.com>
2023-10-17 15:17:46 +08:00
Kubernetes Prow Robot
3548ef0092 Merge pull request #119946 from chendave/ignore_preflight_error
kubeadm: FeatureGate MergeCLIArgumentsWithConfig is added for ignorePreflightErrors
2023-10-16 14:41:19 +02:00
Kubernetes Prow Robot
4254a77c21 Merge pull request #121249 from pohly/klog-call-fixes
fix invalid log calls
2023-10-16 13:14:01 +02:00
Patrick Ohly
957adfac49 fix invalid log calls
These were found with a modified klog that enables "go vet" to check klog call
parameters:

    cmd/kubeadm/app/features/features.go:149:4: printf: k8s.io/klog/v2.Warningf format %t has arg v of wrong type string (govet)
    			klog.Warningf("Setting deprecated feature gate %s=%t. It will be removed in a future release.", k, v)
    test/images/sample-device-plugin/sampledeviceplugin.go:147:5: printf: k8s.io/klog/v2.Errorf does not support error-wrapping directive %w (govet)
    				klog.Errorf("error: %w", err)
    test/images/sample-device-plugin/sampledeviceplugin.go:155:3: printf: k8s.io/klog/v2.Errorf does not support error-wrapping directive %w (govet)
    		klog.Errorf("Failed to add watch to %q: %w", triggerPath, err)
    staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go:207:5: printf: k8s.io/klog/v2.Fatalf does not support error-wrapping directive %w (govet)
    				klog.Fatalf("Package %v: unsupported %s value: %q :%w", i, tagEnabledName, ptag.value, err)
    staging/src/k8s.io/legacy-cloud-providers/vsphere/nodemanager.go:286:3: printf: (k8s.io/klog/v2.Verbose).Infof format %s reads arg #1, but call has 0 args (govet)
    		klog.V(4).Infof("Node %s missing in vSphere cloud provider cache, trying node informer")
    staging/src/k8s.io/legacy-cloud-providers/vsphere/nodemanager.go:302:3: printf: (k8s.io/klog/v2.Verbose).Infof format %s reads arg #1, but call has 0 args (govet)
    		klog.V(4).Infof("Node %s missing in vSphere cloud provider caches, trying the API server")
2023-10-16 10:21:07 +02:00
Dave Chen
8009530d77 kubeadm: FeatureGate MergeCLIArgumentsWithConfig is added for ignorePreflightErrors
Turn on FeatureGate MergeCLIArgumentsWithConfig to keep the legacy way of management of
ignorePreflightErrors, which means the value defined by the flag `ignore-preflight-errors`
will be merged with the value `ignorePreflightErrors` defined in the config file.

Otherwise, the value defined by the flag will replace the value from the config file if set.

Signed-off-by: Dave Chen <dave.chen@arm.com>
2023-10-16 14:37:10 +08:00
Kubernetes Prow Robot
afc302c2d2 Merge pull request #121230 from SataQiu/fix-kubeadm-20231014
kubeadm: fill with the DefaultCRISocket when CRI socket detection is not required
2023-10-16 06:45:18 +02:00
xin.li
6732c4110f kubeadm: fix uninvalid namespace field for clusterrole
Signed-off-by: xin.li <xin.li@daocloud.io>
2023-10-15 18:49:52 +08:00
SataQiu
32d2afe42b kubeadm: fill with the DefaultCRISocket when CRI socket detection is not required 2023-10-14 16:21:38 +08:00
Kubernetes Prow Robot
c2db4d03dc Merge pull request #121136 from carlory/fix-kubeadm-2941
kubeadm: using struct option rather than a long list of parameters
2023-10-13 12:31:21 +02:00
carlory
db8e106e3f Code Refactor: using struct option rather than a long list of parameters
Co-authored-by: Shida Qiu <shidaqiu2018@gmail.com>
2023-10-13 17:17:03 +08:00
Kubernetes Prow Robot
801932c012 Merge pull request #120825 from pacoxu/kubeadm-skew-match
kubeadm: adjust kubeadm skew policy for upgrades
2023-10-12 16:00:02 +02:00
SataQiu
adae1e33ea kubeadm: remove AlphaDisclaimer for certs phases 2023-10-12 15:11:12 +08:00
Paco Xu
7b1d87383e add kubelet policy skew test for kubeadm 2023-10-12 11:17:05 +08:00
Kubernetes Prow Robot
12458285b9 Merge pull request #120788 from chendave/componentCfg
kubeadm: Remove the support of configurable component configs
2023-10-11 04:42:53 +02:00
SataQiu
c3bf541ede kubeadm: clean up unnecessary references to UnknownCRISocket 2023-10-08 16:57:45 +08:00
Kubernetes Prow Robot
10827a193a Merge pull request #121045 from my-git9/fixetcdutk
kubeadm: fix wrong ut for util/etcd
2023-10-08 07:03:01 +02:00
xin.li
20db4ef3d6 kubeadm: fix wrong ut for util/etcd
Signed-off-by: xin.li <xin.li@daocloud.io>
2023-10-07 21:57:20 +08:00
Kubernetes Prow Robot
0554675d78 Merge pull request #121020 from chendave/set_opt
kubeadm: Optimize the logic to override the arguments
2023-10-07 11:58:31 +02:00
Kubernetes Prow Robot
bb06804e52 Merge pull request #120828 from SataQiu/fix-kubeadm-cri-20230922
kubeadm: fix the bug that kubeadm always do CRI detection when --config is passed even if it is not required by the subcommand
2023-10-07 11:58:22 +02:00
Kubernetes Prow Robot
854d0e7fc8 Merge pull request #120956 from my-git9/clusterinfout
kubeadm: increase ut converage for bootstraptoken/clusterinfo
2023-10-06 13:43:22 +02:00
Dave Chen
e8e22f645d kubeadm: Optimize the logic to override the arguments
Signed-off-by: Dave Chen <dave.chen@arm.com>
2023-10-06 19:01:00 +08:00
xin.li
8510057e2d kubeadm: increase ut converage for bootstraptoken/clusterinfo
Signed-off-by: xin.li <xin.li@daocloud.io>
2023-10-06 18:36:02 +08:00
Kubernetes Prow Robot
c54c6b2383 Merge pull request #120938 from ptsgr/fix-linter
Refactoring variable declaration and value setting
2023-09-29 10:56:43 -07:00
Kubernetes Prow Robot
afe4c041f3 Merge pull request #120530 from my-git9/node-ut
kubeadm: add unit test for phases/bootstraptoken/node/token.go
2023-09-29 07:08:43 -07:00
Egor Pats
5ebde41efb Refactoring variable declaration and value setting 2023-09-29 16:17:28 +03:00
Kubernetes Prow Robot
29ff98ff37 Merge pull request #120417 from neolit123/1.29-v1beta4-ecdsa
kubeadm: add v1beta4.ClusterConfiguration.EncryptionAlgorithm
2023-09-28 02:38:33 -07:00
xin.li
e320fadebe kubeadm: add unit test for phases/bootstraptoken/node/token.go
Signed-off-by: xin.li <xin.li@daocloud.io>
2023-09-28 16:42:29 +08:00
caoyingjunz
2172ea6083 Fix typos: update Enpoint to Endpoint 2023-09-26 21:23:44 +08:00
SataQiu
1a68195626 kubeadm: fix the bug that kubeadm always do CRI detection when --config is passed even if it is not required by subcommand 2023-09-25 16:35:47 +08:00