github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-27 20:42:58 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: skip CRI detection for 'kubeadm upgrade diff'

Browse Source
This commit is contained in:
SataQiu 2023-10-24 16:43:46 +08:00
parent 3e438c54a7
commit 71bedf5cb2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/upgrade/diff.go
View File

@ -111,7 +111,9 @@ func runDiff(flags *diffFlags, args []string) error {
var err error var err error
var cfg *kubeadmapi.InitConfiguration var cfg *kubeadmapi.InitConfiguration
if flags.cfgPath != "" { if flags.cfgPath != "" {
cfg, err = configutil.LoadInitConfigurationFromFile(flags.cfgPath, configutil.LoadOrDefaultConfigurationOptions{}) cfg, err = configutil.LoadInitConfigurationFromFile(flags.cfgPath, configutil.LoadOrDefaultConfigurationOptions{
SkipCRIDetect: true,
})
} else { } else {
var client *client.Clientset var client *client.Clientset
client, err = kubeconfigutil.ClientSetFromFile(flags.kubeConfigPath) client, err = kubeconfigutil.ClientSetFromFile(flags.kubeConfigPath)

4
cmd/kubeadm/app/cmd/upgrade/diff_test.go
View File

@ -49,12 +49,10 @@ func TestRunDiff(t *testing.T) {
testUpgradeDiffConfigContents := []byte(fmt.Sprintf(` testUpgradeDiffConfigContents := []byte(fmt.Sprintf(`
apiVersion: %s apiVersion: %s
kind: InitConfiguration kind: InitConfiguration
nodeRegistration:
criSocket: %s
--- ---
apiVersion: %[1]s apiVersion: %[1]s
kind: ClusterConfiguration kind: ClusterConfiguration
kubernetesVersion: %[3]s`, kubeadmapiv1.SchemeGroupVersion.String(), constants.UnknownCRISocket, currentVersion)) kubernetesVersion: %s`, kubeadmapiv1.SchemeGroupVersion.String(), currentVersion))
testUpgradeDiffConfig, err := createTestRunDiffFile(testUpgradeDiffConfigContents) testUpgradeDiffConfig, err := createTestRunDiffFile(testUpgradeDiffConfigContents)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)