github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix providerless kubelet startup

Browse Source
This commit is contained in:
Jordan Liggitt 2020-07-31 12:29:31 -04:00
parent 6324c137ea
commit 93e2868d4e
4 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubelet/app/options/BUILD
View File

@ -13,6 +13,7 @@ go_library(
"globalflags.go",
"globalflags_linux.go",
"globalflags_other.go",
"globalflags_providers.go",
"options.go",
"osflags_others.go",
"osflags_windows.go",

4
cmd/kubelet/app/options/globalflags.go
View File

@ -84,9 +84,7 @@ func addCredentialProviderFlags(fs *pflag.FlagSet) {
global := pflag.CommandLine
local := pflag.NewFlagSet(os.Args[0], pflag.ExitOnError)
// TODO(#58034): This is not a static file, so it's not quite as straightforward as --google-json-key.
// We need to figure out how ACR users can dynamically provide pull credentials before we can deprecate this.
pflagRegister(global, local, "azure-container-registry-config")
addLegacyCloudProviderCredentialProviderFlags(global, local)
fs.AddFlagSet(local)
}

27
cmd/kubelet/app/options/globalflags_providerless.go Normal file
View File

@ -0,0 +1,27 @@
// +build providerless
/*
Copyright 2020 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 options
import (
"github.com/spf13/pflag"
)
func addLegacyCloudProviderCredentialProviderFlags(global, local *pflag.FlagSet) {
// no-op when no legacy providers are compiled in
}

29
cmd/kubelet/app/options/globalflags_providers.go Normal file
View File

@ -0,0 +1,29 @@
// +build !providerless
/*
Copyright 2020 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 options
import (
"github.com/spf13/pflag"
)
func addLegacyCloudProviderCredentialProviderFlags(global, local *pflag.FlagSet) {
// TODO(#58034): This is not a static file, so it's not quite as straightforward as --google-json-key.
// We need to figure out how ACR users can dynamically provide pull credentials before we can deprecate this.
pflagRegister(global, local, "azure-container-registry-config")
}