github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106998 from eltociear/patch-7

Browse Source 
Fix typo in get_test.go
This commit is contained in:
Kubernetes Prow Robot 2022-03-25 20:23:55 -07:00 committed by GitHub
commit 083c3ac4e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/phases/kubelet/flags.go
View File

@ -50,7 +50,7 @@ type kubeletFlagsOpts struct {
// (from lower to higher): // (from lower to higher):
// - actual hostname // - actual hostname
// - NodeRegistrationOptions.Name (same as "--node-name" passed to "kubeadm init/join") // - NodeRegistrationOptions.Name (same as "--node-name" passed to "kubeadm init/join")
// - "hostname-overide" flag in NodeRegistrationOptions.KubeletExtraArgs // - "hostname-override" flag in NodeRegistrationOptions.KubeletExtraArgs
// It also returns the hostname or an error if getting the hostname failed. // It also returns the hostname or an error if getting the hostname failed.
func GetNodeNameAndHostname(cfg *kubeadmapi.NodeRegistrationOptions) (string, string, error) { func GetNodeNameAndHostname(cfg *kubeadmapi.NodeRegistrationOptions) (string, string, error) {
hostname, err := kubeadmutil.GetHostname("") hostname, err := kubeadmutil.GetHostname("")

2
staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go
View File

@ -168,7 +168,7 @@ func TestGetObjectsWithOpenAPIOutputFormatPresent(t *testing.T) {
defer tf.Cleanup() defer tf.Cleanup()
codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...) codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
// overide the openAPISchema function to return custom output // override the openAPISchema function to return custom output
// for Pod type. // for Pod type.
tf.OpenAPISchemaFunc = testOpenAPISchemaData tf.OpenAPISchemaFunc = testOpenAPISchemaData
tf.UnstructuredClient = &fake.RESTClient{ tf.UnstructuredClient = &fake.RESTClient{