Merge pull request #97513 from fenggw-fnst/work
Fix typo in comment Kubernetes-commit: a01bc2ba8979cff17fd465777d8f0fc18e6537fb
This commit is contained in:
		
						commit
						b3a0f34fb7
					
				| 
						 | 
					@ -944,7 +944,7 @@
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "k8s.io/component-base",
 | 
								"ImportPath": "k8s.io/component-base",
 | 
				
			||||||
			"Rev": "fc5f0989f107"
 | 
								"Rev": "a49f91b05020"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"ImportPath": "k8s.io/component-helpers",
 | 
								"ImportPath": "k8s.io/component-helpers",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										4
									
								
								go.mod
								
								
								
								
							
							
						
						
									
										4
									
								
								go.mod
								
								
								
								
							| 
						 | 
					@ -38,7 +38,7 @@ require (
 | 
				
			||||||
	k8s.io/apimachinery v0.0.0-20210206010734-c93b0f84892e
 | 
						k8s.io/apimachinery v0.0.0-20210206010734-c93b0f84892e
 | 
				
			||||||
	k8s.io/cli-runtime v0.0.0-20210206012746-85724360dac6
 | 
						k8s.io/cli-runtime v0.0.0-20210206012746-85724360dac6
 | 
				
			||||||
	k8s.io/client-go v0.0.0-20210206011112-100613764a76
 | 
						k8s.io/client-go v0.0.0-20210206011112-100613764a76
 | 
				
			||||||
	k8s.io/component-base v0.0.0-20210206011540-fc5f0989f107
 | 
						k8s.io/component-base v0.0.0-20210209114056-a49f91b05020
 | 
				
			||||||
	k8s.io/component-helpers v0.0.0-20210206011635-fb438f0205fc
 | 
						k8s.io/component-helpers v0.0.0-20210206011635-fb438f0205fc
 | 
				
			||||||
	k8s.io/klog/v2 v2.5.0
 | 
						k8s.io/klog/v2 v2.5.0
 | 
				
			||||||
	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
 | 
						k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
 | 
				
			||||||
| 
						 | 
					@ -54,7 +54,7 @@ replace (
 | 
				
			||||||
	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210206012746-85724360dac6
 | 
						k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210206012746-85724360dac6
 | 
				
			||||||
	k8s.io/client-go => k8s.io/client-go v0.0.0-20210206011112-100613764a76
 | 
						k8s.io/client-go => k8s.io/client-go v0.0.0-20210206011112-100613764a76
 | 
				
			||||||
	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210206010601-575533eae677
 | 
						k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210206010601-575533eae677
 | 
				
			||||||
	k8s.io/component-base => k8s.io/component-base v0.0.0-20210206011540-fc5f0989f107
 | 
						k8s.io/component-base => k8s.io/component-base v0.0.0-20210209114056-a49f91b05020
 | 
				
			||||||
	k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210206011635-fb438f0205fc
 | 
						k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210206011635-fb438f0205fc
 | 
				
			||||||
	k8s.io/metrics => k8s.io/metrics v0.0.0-20210206012643-eb773d8be706
 | 
						k8s.io/metrics => k8s.io/metrics v0.0.0-20210206012643-eb773d8be706
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								go.sum
								
								
								
								
							
							
						
						
									
										2
									
								
								go.sum
								
								
								
								
							| 
						 | 
					@ -629,7 +629,7 @@ k8s.io/apimachinery v0.0.0-20210206010734-c93b0f84892e/go.mod h1:usCLrfBNFPxV+np
 | 
				
			||||||
k8s.io/cli-runtime v0.0.0-20210206012746-85724360dac6/go.mod h1:gmDITNmIqJ/I20ljW5MrFzXjkkenegLa3ws9VNBkGug=
 | 
					k8s.io/cli-runtime v0.0.0-20210206012746-85724360dac6/go.mod h1:gmDITNmIqJ/I20ljW5MrFzXjkkenegLa3ws9VNBkGug=
 | 
				
			||||||
k8s.io/client-go v0.0.0-20210206011112-100613764a76/go.mod h1:JP/D55gccwJmpx9Ipo+OBw26gGWX3rzwISGjNZfGViM=
 | 
					k8s.io/client-go v0.0.0-20210206011112-100613764a76/go.mod h1:JP/D55gccwJmpx9Ipo+OBw26gGWX3rzwISGjNZfGViM=
 | 
				
			||||||
k8s.io/code-generator v0.0.0-20210206010601-575533eae677/go.mod h1:O7FXIFFMbeLstjVDD1gKtnexuIo2JF8jkudWpXyjVeo=
 | 
					k8s.io/code-generator v0.0.0-20210206010601-575533eae677/go.mod h1:O7FXIFFMbeLstjVDD1gKtnexuIo2JF8jkudWpXyjVeo=
 | 
				
			||||||
k8s.io/component-base v0.0.0-20210206011540-fc5f0989f107/go.mod h1:2obbX6UCGVs4cZSLH0tOnotvu8nSzowHxNyvM3qCGW8=
 | 
					k8s.io/component-base v0.0.0-20210209114056-a49f91b05020/go.mod h1:2obbX6UCGVs4cZSLH0tOnotvu8nSzowHxNyvM3qCGW8=
 | 
				
			||||||
k8s.io/component-helpers v0.0.0-20210206011635-fb438f0205fc/go.mod h1:DNlKj5pvNV00ZBKZBfB+o6Z6ayBGoScA83QRqzRa+FI=
 | 
					k8s.io/component-helpers v0.0.0-20210206011635-fb438f0205fc/go.mod h1:DNlKj5pvNV00ZBKZBfB+o6Z6ayBGoScA83QRqzRa+FI=
 | 
				
			||||||
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 | 
					k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 | 
				
			||||||
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 | 
					k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -652,7 +652,7 @@ func (o *ApplyOptions) MarkNamespaceVisited(info *resource.Info) {
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// MarkNamespaceVisited keeps track of UIDs of the applied
 | 
					// MarkObjectVisited keeps track of UIDs of the applied
 | 
				
			||||||
// objects. Used for pruning.
 | 
					// objects. Used for pruning.
 | 
				
			||||||
func (o *ApplyOptions) MarkObjectVisited(info *resource.Info) error {
 | 
					func (o *ApplyOptions) MarkObjectVisited(info *resource.Info) error {
 | 
				
			||||||
	metadata, err := meta.Accessor(info.Object)
 | 
						metadata, err := meta.Accessor(info.Object)
 | 
				
			||||||
| 
						 | 
					@ -663,7 +663,7 @@ func (o *ApplyOptions) MarkObjectVisited(info *resource.Info) error {
 | 
				
			||||||
	return nil
 | 
						return nil
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// PrintAndPrune returns a function which meets the PostProcessorFn
 | 
					// PrintAndPrunePostProcessor returns a function which meets the PostProcessorFn
 | 
				
			||||||
// function signature. This returned function prints all the
 | 
					// function signature. This returned function prints all the
 | 
				
			||||||
// objects as a list (if configured for that), and prunes the
 | 
					// objects as a list (if configured for that), and prunes the
 | 
				
			||||||
// objects not applied. The returned function is the standard
 | 
					// objects not applied. The returned function is the standard
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue