mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Merge pull request #65019 from mirake/fix-typo-toto
Automatic merge from submit-queue (batch tested with PRs 65265, 64822, 65026, 65019, 65077). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Typo fix: toto -> to
This commit is contained in:
		@@ -1187,7 +1187,7 @@ binary | sha256 hash
 | 
				
			|||||||
* The implicit registration of Prometheus metrics for request count and latency have been removed, and a plug-able interface was added. If you were using our client libraries in your own binaries and want these metrics, add the following to your imports in the main package: "k8s.io/pkg/client/metrics/prometheus".  ([#30638](https://github.com/kubernetes/kubernetes/pull/30638), [@krousey](https://github.com/krousey))
 | 
					* The implicit registration of Prometheus metrics for request count and latency have been removed, and a plug-able interface was added. If you were using our client libraries in your own binaries and want these metrics, add the following to your imports in the main package: "k8s.io/pkg/client/metrics/prometheus".  ([#30638](https://github.com/kubernetes/kubernetes/pull/30638), [@krousey](https://github.com/krousey))
 | 
				
			||||||
* Add support for --image-pull-policy to 'kubectl run' ([#30614](https://github.com/kubernetes/kubernetes/pull/30614), [@AdoHe](https://github.com/AdoHe))
 | 
					* Add support for --image-pull-policy to 'kubectl run' ([#30614](https://github.com/kubernetes/kubernetes/pull/30614), [@AdoHe](https://github.com/AdoHe))
 | 
				
			||||||
* x509 authenticator: get groups from subject's organization field ([#30392](https://github.com/kubernetes/kubernetes/pull/30392), [@ericchiang](https://github.com/ericchiang))
 | 
					* x509 authenticator: get groups from subject's organization field ([#30392](https://github.com/kubernetes/kubernetes/pull/30392), [@ericchiang](https://github.com/ericchiang))
 | 
				
			||||||
* Add initial support for TokenFile to to the client config file. ([#29696](https://github.com/kubernetes/kubernetes/pull/29696), [@brendandburns](https://github.com/brendandburns))
 | 
					* Add initial support for TokenFile to the client config file. ([#29696](https://github.com/kubernetes/kubernetes/pull/29696), [@brendandburns](https://github.com/brendandburns))
 | 
				
			||||||
* update kubectl help output for better organization ([#25524](https://github.com/kubernetes/kubernetes/pull/25524), [@AdoHe](https://github.com/AdoHe))
 | 
					* update kubectl help output for better organization ([#25524](https://github.com/kubernetes/kubernetes/pull/25524), [@AdoHe](https://github.com/AdoHe))
 | 
				
			||||||
* daemonset controller should respect taints ([#31020](https://github.com/kubernetes/kubernetes/pull/31020), [@mikedanese](https://github.com/mikedanese))
 | 
					* daemonset controller should respect taints ([#31020](https://github.com/kubernetes/kubernetes/pull/31020), [@mikedanese](https://github.com/mikedanese))
 | 
				
			||||||
* Implement TLS bootstrap for kubelet using `--experimental-bootstrap-kubeconfig`  (2nd take) ([#30922](https://github.com/kubernetes/kubernetes/pull/30922), [@yifan-gu](https://github.com/yifan-gu))
 | 
					* Implement TLS bootstrap for kubelet using `--experimental-bootstrap-kubeconfig`  (2nd take) ([#30922](https://github.com/kubernetes/kubernetes/pull/30922), [@yifan-gu](https://github.com/yifan-gu))
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -395,7 +395,7 @@ func (f *KubeletFlags) AddFlags(mainfs *pflag.FlagSet) {
 | 
				
			|||||||
	fs.StringVar(&f.LockFilePath, "lock-file", f.LockFilePath, "<Warning: Alpha feature> The path to file for kubelet to use as a lock file.")
 | 
						fs.StringVar(&f.LockFilePath, "lock-file", f.LockFilePath, "<Warning: Alpha feature> The path to file for kubelet to use as a lock file.")
 | 
				
			||||||
	fs.BoolVar(&f.ExitOnLockContention, "exit-on-lock-contention", f.ExitOnLockContention, "Whether kubelet should exit upon lock-file contention.")
 | 
						fs.BoolVar(&f.ExitOnLockContention, "exit-on-lock-contention", f.ExitOnLockContention, "Whether kubelet should exit upon lock-file contention.")
 | 
				
			||||||
	fs.StringVar(&f.SeccompProfileRoot, "seccomp-profile-root", f.SeccompProfileRoot, "<Warning: Alpha feature> Directory path for seccomp profiles.")
 | 
						fs.StringVar(&f.SeccompProfileRoot, "seccomp-profile-root", f.SeccompProfileRoot, "<Warning: Alpha feature> Directory path for seccomp profiles.")
 | 
				
			||||||
	fs.StringVar(&f.BootstrapCheckpointPath, "bootstrap-checkpoint-path", f.BootstrapCheckpointPath, "<Warning: Alpha feature> Path to to the directory where the checkpoints are stored")
 | 
						fs.StringVar(&f.BootstrapCheckpointPath, "bootstrap-checkpoint-path", f.BootstrapCheckpointPath, "<Warning: Alpha feature> Path to the directory where the checkpoints are stored")
 | 
				
			||||||
	fs.Int32Var(&f.NodeStatusMaxImages, "node-status-max-images", f.NodeStatusMaxImages, "<Warning: Alpha feature> The maximum number of images to report in Node.Status.Images. If -1 is specified, no cap will be applied. Default: 50")
 | 
						fs.Int32Var(&f.NodeStatusMaxImages, "node-status-max-images", f.NodeStatusMaxImages, "<Warning: Alpha feature> The maximum number of images to report in Node.Status.Images. If -1 is specified, no cap will be applied. Default: 50")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// DEPRECATED FLAGS
 | 
						// DEPRECATED FLAGS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -308,7 +308,7 @@ kube::util::gv-to-swagger-name() {
 | 
				
			|||||||
# Assumed vars:
 | 
					# Assumed vars:
 | 
				
			||||||
# SWAGGER_API_PATH: Base path for swaggerapi on apiserver. Ex:
 | 
					# SWAGGER_API_PATH: Base path for swaggerapi on apiserver. Ex:
 | 
				
			||||||
# http://localhost:8080/swaggerapi.
 | 
					# http://localhost:8080/swaggerapi.
 | 
				
			||||||
# SWAGGER_ROOT_DIR: Root dir where we want to to save the fetched spec.
 | 
					# SWAGGER_ROOT_DIR: Root dir where we want to save the fetched spec.
 | 
				
			||||||
# VERSIONS: Array of group versions to include in swagger spec.
 | 
					# VERSIONS: Array of group versions to include in swagger spec.
 | 
				
			||||||
kube::util::fetch-swagger-spec() {
 | 
					kube::util::fetch-swagger-spec() {
 | 
				
			||||||
  for ver in ${VERSIONS}; do
 | 
					  for ver in ${VERSIONS}; do
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -125,7 +125,7 @@ func TestCreateJobFromCronJob(t *testing.T) {
 | 
				
			|||||||
		t.Errorf("expected length of labels array to be 1, got %d", l)
 | 
							t.Errorf("expected length of labels array to be 1, got %d", l)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	if v, ok := submittedJob.Labels["test-label"]; !ok || v != "test-value" {
 | 
						if v, ok := submittedJob.Labels["test-label"]; !ok || v != "test-value" {
 | 
				
			||||||
		t.Errorf("expected label test-label=test-value to to exist, got '%s'", v)
 | 
							t.Errorf("expected label test-label=test-value to exist, got '%s'", v)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if l := len(submittedJob.Spec.Template.Spec.Containers); l != 1 {
 | 
						if l := len(submittedJob.Spec.Template.Spec.Containers); l != 1 {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -205,7 +205,7 @@ func (c *containerLogManager) rotateLogs() error {
 | 
				
			|||||||
			}
 | 
								}
 | 
				
			||||||
			// In rotateLatestLog, there are several cases that we may
 | 
								// In rotateLatestLog, there are several cases that we may
 | 
				
			||||||
			// lose original container log after ReopenContainerLog fails.
 | 
								// lose original container log after ReopenContainerLog fails.
 | 
				
			||||||
			// We try to to recover it by reopening container log.
 | 
								// We try to recover it by reopening container log.
 | 
				
			||||||
			if err := c.runtimeService.ReopenContainerLog(id); err != nil {
 | 
								if err := c.runtimeService.ReopenContainerLog(id); err != nil {
 | 
				
			||||||
				glog.Errorf("Container %q log %q doesn't exist, reopen container log failed: %v", id, path, err)
 | 
									glog.Errorf("Container %q log %q doesn't exist, reopen container log failed: %v", id, path, err)
 | 
				
			||||||
				continue
 | 
									continue
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -248,7 +248,7 @@ func generateVolumeMsg(prefixMsg, suffixMsg, volumeName, details string) (simple
 | 
				
			|||||||
// VolumeToAttach represents a volume that should be attached to a node.
 | 
					// VolumeToAttach represents a volume that should be attached to a node.
 | 
				
			||||||
type VolumeToAttach struct {
 | 
					type VolumeToAttach struct {
 | 
				
			||||||
	// MultiAttachErrorReported indicates whether the multi-attach error has been reported for the given volume.
 | 
						// MultiAttachErrorReported indicates whether the multi-attach error has been reported for the given volume.
 | 
				
			||||||
	// It is used to to prevent reporting the error from being reported more than once for a given volume.
 | 
						// It is used to prevent reporting the error from being reported more than once for a given volume.
 | 
				
			||||||
	MultiAttachErrorReported bool
 | 
						MultiAttachErrorReported bool
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// VolumeName is the unique identifier for the volume that should be
 | 
						// VolumeName is the unique identifier for the volume that should be
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -322,7 +322,7 @@ func LabelZonesToSet(labelZonesValue string) (sets.String, error) {
 | 
				
			|||||||
	return stringToSet(labelZonesValue, kubeletapis.LabelMultiZoneDelimiter)
 | 
						return stringToSet(labelZonesValue, kubeletapis.LabelMultiZoneDelimiter)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// StringToSet converts a string containing list separated by specified delimiter to to a set
 | 
					// StringToSet converts a string containing list separated by specified delimiter to a set
 | 
				
			||||||
func stringToSet(str, delimiter string) (sets.String, error) {
 | 
					func stringToSet(str, delimiter string) (sets.String, error) {
 | 
				
			||||||
	zonesSlice := strings.Split(str, delimiter)
 | 
						zonesSlice := strings.Split(str, delimiter)
 | 
				
			||||||
	zonesSet := make(sets.String)
 | 
						zonesSet := make(sets.String)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2117,12 +2117,12 @@ func streamingUpload(file *os.File, fileName string, postBodyWriter *multipart.W
 | 
				
			|||||||
	// Set up the form file
 | 
						// Set up the form file
 | 
				
			||||||
	fileWriter, err := postBodyWriter.CreateFormFile("file", fileName)
 | 
						fileWriter, err := postBodyWriter.CreateFormFile("file", fileName)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		framework.Failf("Unable to to write file at %s to buffer. Error: %s", fileName, err)
 | 
							framework.Failf("Unable to write file at %s to buffer. Error: %s", fileName, err)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Copy kubectl binary into the file writer
 | 
						// Copy kubectl binary into the file writer
 | 
				
			||||||
	if _, err := io.Copy(fileWriter, file); err != nil {
 | 
						if _, err := io.Copy(fileWriter, file); err != nil {
 | 
				
			||||||
		framework.Failf("Unable to to copy file at %s into the file writer. Error: %s", fileName, err)
 | 
							framework.Failf("Unable to copy file at %s into the file writer. Error: %s", fileName, err)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Nothing more should be written to this instance of the postBodyWriter
 | 
						// Nothing more should be written to this instance of the postBodyWriter
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -575,7 +575,7 @@ func testPDPod(diskNames []string, targetNode types.NodeName, readOnly bool, num
 | 
				
			|||||||
	return pod
 | 
						return pod
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Waits for specified PD to to detach from specified hostName
 | 
					// Waits for specified PD to detach from specified hostName
 | 
				
			||||||
func waitForPDDetach(diskName string, nodeName types.NodeName) error {
 | 
					func waitForPDDetach(diskName string, nodeName types.NodeName) error {
 | 
				
			||||||
	if framework.TestContext.Provider == "gce" || framework.TestContext.Provider == "gke" {
 | 
						if framework.TestContext.Provider == "gce" || framework.TestContext.Provider == "gke" {
 | 
				
			||||||
		framework.Logf("Waiting for GCE PD %q to detach from node %q.", diskName, nodeName)
 | 
							framework.Logf("Waiting for GCE PD %q to detach from node %q.", diskName, nodeName)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user