github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117391 from catandcoder/master

Browse Source 
fix doc mismatch
This commit is contained in:
Kubernetes Prow Robot
2023-05-06 08:35:17 -07:00
committed by GitHub
parent 2a327f8e96 1359ebcc5b
commit 98cf297e57
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-apiserver/app/server.go
View File

@@ -339,7 +339,7 @@ func CreateKubeAPIServerConfig(s completedServerRunOptions) (
return config, serviceResolver, pluginInitializers, nil return config, serviceResolver, pluginInitializers, nil
} }
// BuildGenericConfig takes the master server options and produces the genericapiserver.Config associated with it // buildGenericConfig takes the master server options and produces the genericapiserver.Config associated with it
func buildGenericConfig( func buildGenericConfig(
s *options.ServerRunOptions, s *options.ServerRunOptions,
proxyTransport *http.Transport, proxyTransport *http.Transport,

2
cmd/kubeadm/app/phases/upgrade/health.go
View File

@@ -92,7 +92,7 @@ func CheckClusterHealth(client clientset.Interface, cfg *kubeadmapi.ClusterConfi
return preflight.RunChecks(healthChecks, os.Stderr, ignoreChecksErrors) return preflight.RunChecks(healthChecks, os.Stderr, ignoreChecksErrors)
} }
// CreateJob is a check that verifies that a Job can be created in the cluster // createJob is a check that verifies that a Job can be created in the cluster
func createJob(client clientset.Interface, cfg *kubeadmapi.ClusterConfiguration) (lastError error) { func createJob(client clientset.Interface, cfg *kubeadmapi.ClusterConfiguration) (lastError error) {
const ( const (
jobName = "upgrade-health-check" jobName = "upgrade-health-check"

2
cmd/kubeadm/app/util/apiclient/clientbacked_dryrun.go
View File

@@ -113,7 +113,7 @@ func (clg *ClientBackedDryRunGetter) Client() clientset.Interface {
return clg.client return clg.client
} }
// decodeUnversionedIntoAPIObject converts the *unversioned.Unversioned object returned from the dynamic client // decodeUnstructuredIntoAPIObject converts the *unversioned.Unversioned object returned from the dynamic client
// to bytes; and then decodes it back _to an external api version (k8s.io/api)_ using the normal API machinery // to bytes; and then decodes it back _to an external api version (k8s.io/api)_ using the normal API machinery
func decodeUnstructuredIntoAPIObject(action core.Action, unstructuredObj runtime.Unstructured) (runtime.Object, error) { func decodeUnstructuredIntoAPIObject(action core.Action, unstructuredObj runtime.Unstructured) (runtime.Object, error) {
objBytes, err := json.Marshal(unstructuredObj) objBytes, err := json.Marshal(unstructuredObj)