Merge pull request #70361 from qingsenLi/git181027

staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go

@@ -94,7 +94,7 @@ func (s *DeprecatedInsecureServingOptions) AddUnqualifiedFlags(fs *pflag.FlagSet
 	fs.Lookup("port").Hidden = false
 }
 
-// ApplyTo adds DeprecatedInsecureServingOptions to the insecureserverinfo amd kube-controller manager configuration.
+// ApplyTo adds DeprecatedInsecureServingOptions to the insecureserverinfo and kube-controller manager configuration.
 // Note: the double pointer allows to set the *DeprecatedInsecureServingInfo to nil without referencing the struct hosting this pointer.
 func (s *DeprecatedInsecureServingOptions) ApplyTo(c **server.DeprecatedInsecureServingInfo) error {
 	if s == nil {

test/e2e/common/downward_api.go

@@ -114,7 +114,7 @@ var _ = Describe("[sig-node] Downward API", func() {
 	/*
 	   Release : v1.9
 	   Testname: DownwardAPI, environment for CPU and memory limits and requests
-	   Description: Downward API MUST expose CPU request amd Memory request set through environment variables at runtime in the container.
+	   Description: Downward API MUST expose CPU request and Memory request set through environment variables at runtime in the container.
 	*/
 	framework.ConformanceIt("should provide container's limits.cpu/memory and requests.cpu/memory as env vars [NodeConformance]", func() {
 		podName := "downward-api-" + string(uuid.NewUUID())
@@ -165,7 +165,7 @@ var _ = Describe("[sig-node] Downward API", func() {
 	/*
 	   Release : v1.9
 	   Testname: DownwardAPI, environment for default CPU and memory limits and requests
-	   Description: Downward API MUST expose CPU request amd Memory limits set through environment variables at runtime in the container.
+	   Description: Downward API MUST expose CPU request and Memory limits set through environment variables at runtime in the container.
 	*/
 	framework.ConformanceIt("should provide default limits.cpu/memory from node allocatable [NodeConformance]", func() {
 		podName := "downward-api-" + string(uuid.NewUUID())