From 3e83f0f08abab4c10dfab7053529709883c9b834 Mon Sep 17 00:00:00 2001
From: qingsenLi
Date: Tue, 30 Oct 2018 01:27:50 +0800
Subject: [PATCH] fix typo and instead of amd
---
.../pkg/server/options/deprecated_insecure_serving.go | 2 +-
test/e2e/common/downward_api.go | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go b/staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go
index e8e3d7feb3f..3610bfae2f6 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/deprecated_insecure_serving.go
@@ -92,7 +92,7 @@ func (s *DeprecatedInsecureServingOptions) AddUnqualifiedFlags(fs *pflag.FlagSet
fs.MarkDeprecated("port", "see --secure-port instead.")
}
-// 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 {
diff --git a/test/e2e/common/downward_api.go b/test/e2e/common/downward_api.go
index 3776dd0bbc7..2db46218e9e 100644
--- a/test/e2e/common/downward_api.go
+++ b/test/e2e/common/downward_api.go
@@ -114,7 +114,7 @@ var _ = Describe("[sig-api-machinery] 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-api-machinery] 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())