Merge pull request #115924 from claudiubelu/fix-kubeadm-unittest

unit tests: Fixes kubeadm postupgrade failing unit test on Windows
This commit is contained in:
Kubernetes Prow Robot 2023-02-22 00:50:08 -08:00 committed by GitHub
commit 4dd887797f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 1 deletions

View File

@ -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"
)

View File

@ -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{},
},
{

View File

@ -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."
)