Merge pull request #6930 from mikesplain/automated-cherry-pick-of-#6835-

#6821-#6859-origin-release-1.14 Automated cherry pick of #6835: Add ap-east-1 zones infer #6821: update tolerations #6859: Protect against nil derefence
kubernetes · May 12, 2019 · 33057cc · 33057cc
2 parents 39884d0 + 9e38118
commit 33057cc
Show file tree

Hide file tree

Showing 65 changed files with 6,769 additions and 1,885 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -39,7 +39,7 @@ required = [
 # aws-sdk-go is one of our critical dependencies
 [[override]]
   name = "github.com/aws/aws-sdk-go"
-  version = "v1.16.11"
+  version = "v1.19.18"
 
 # We need this for our build
 [[override]]

diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go
@@ -173,7 +173,7 @@ func (b *BootstrapScript) ResourceNodeUp(ig *kops.InstanceGroup, cluster *kops.C
 			if cs.NodeAuthorization != nil {
 				spec["nodeAuthorization"] = cs.NodeAuthorization
 			}
-			if cs.KubeAPIServer.EnableBootstrapAuthToken != nil {
+			if cs.KubeAPIServer != nil && cs.KubeAPIServer.EnableBootstrapAuthToken != nil {
 				spec["kubeAPIServer"] = map[string]interface{}{
 					"enableBootstrapAuthToken": cs.KubeAPIServer.EnableBootstrapAuthToken,
 				}

diff --git a/upup/pkg/fi/cloud.go b/upup/pkg/fi/cloud.go
@@ -143,6 +143,12 @@ var zonesToCloud = map[string]kops.CloudProviderID{
 	"ap-northeast-2d": kops.CloudProviderAWS,
 	"ap-northeast-2e": kops.CloudProviderAWS,
 
+	"ap-east-1a": kops.CloudProviderAWS,
+	"ap-east-1b": kops.CloudProviderAWS,
+	"ap-east-1c": kops.CloudProviderAWS,
+	"ap-east-1d": kops.CloudProviderAWS,
+	"ap-east-1e": kops.CloudProviderAWS,
+
 	"sa-east-1a": kops.CloudProviderAWS,
 	"sa-east-1b": kops.CloudProviderAWS,
 	"sa-east-1c": kops.CloudProviderAWS,

diff --git a/vendor/github.com/aws/aws-sdk-go/NOTICE.txt b/vendor/github.com/aws/aws-sdk-go/NOTICE.txt
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/BUILD.bazel b/vendor/github.com/aws/aws-sdk-go/aws/BUILD.bazel
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/client.go b/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go
diff --git a/.../github.com/aws/aws-sdk-go/aws/context.go → ...hub.com/aws/aws-sdk-go/aws/context_1_5.go b/.../github.com/aws/aws-sdk-go/aws/context.go → ...hub.com/aws/aws-sdk-go/aws/context_1_5.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/context_1_7.go b/vendor/github.com/aws/aws-sdk-go/aws/context_1_7.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/context_1_9.go b/vendor/github.com/aws/aws-sdk-go/aws/context_1_9.go
diff --git a/...hub.com/aws/aws-sdk-go/aws/context_1_6.go → .../aws-sdk-go/aws/context_background_1_5.go b/...hub.com/aws/aws-sdk-go/aws/context_1_6.go → .../aws-sdk-go/aws/context_background_1_5.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/context_background_1_7.go b/vendor/github.com/aws/aws-sdk-go/aws/context_background_1_7.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/context_sleep.go b/vendor/github.com/aws/aws-sdk-go/aws/context_sleep.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/BUILD.bazel b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/BUILD.bazel
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/csm/BUILD.bazel b/vendor/github.com/aws/aws-sdk-go/aws/csm/BUILD.bazel