From 2e2ef9b0e7b2151fac1a846eea6fdfb12d0d6d2c Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Tue, 21 Feb 2023 12:16:56 +0000 Subject: [PATCH] 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. --- .../phases/upgrade/postupgrade_others_test.go | 24 +++++++++++++++++++ .../app/phases/upgrade/postupgrade_test.go | 2 +- .../upgrade/postupgrade_windows_test.go | 24 +++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 cmd/kubeadm/app/phases/upgrade/postupgrade_others_test.go create mode 100644 cmd/kubeadm/app/phases/upgrade/postupgrade_windows_test.go diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade_others_test.go b/cmd/kubeadm/app/phases/upgrade/postupgrade_others_test.go new file mode 100644 index 00000000000..b13ad4a7a8a --- /dev/null +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade_others_test.go @@ -0,0 +1,24 @@ +//go:build !windows +// +build !windows + +/* +Copyright 2023 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package upgrade + +const ( + missingKubeletConfig = "no kubelet component config found.*no such file or directory" +) diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go b/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go index 5754136be77..cd310301ffc 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go @@ -138,7 +138,7 @@ func TestWriteKubeletConfigFiles(t *testing.T) { { name: "aggregate errs: no kubelet config file and cannot read config file", dryrun: true, - errPattern: "no kubelet component config found.*no such file or directory", + errPattern: missingKubeletConfig, cfg: &kubeadmapi.InitConfiguration{}, }, { diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade_windows_test.go b/cmd/kubeadm/app/phases/upgrade/postupgrade_windows_test.go new file mode 100644 index 00000000000..58550edeca8 --- /dev/null +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade_windows_test.go @@ -0,0 +1,24 @@ +//go:build windows +// +build windows + +/* +Copyright 2023 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package upgrade + +const ( + missingKubeletConfig = "no kubelet component config found.*The system cannot find the file specified." +)