Merge branch 'release-0.29' into scidr_m

sayboras · Oct 6, 2020 · 41ad572 · 41ad572
2 parents 015539a + 7762887
commit 41ad572
Show file tree

Hide file tree

Showing 13 changed files with 3,187 additions and 129 deletions.
diff --git a/docs/release_notes/0.29.2.md b/docs/release_notes/0.29.2.md
@@ -0,0 +1,9 @@
+# Release 0.29.2
+
+## Bug Fixes
+
+- Fix kubernetesNetworkConfig with new nodegroups for existing clusters (#2713)
+
+## Acknowledgments
+Weaveworks would like to sincerely thank our contributors!
+
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ go 1.15
 require (
 	github.com/Azure/go-autorest/autorest v0.10.0 // indirect
 	github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 // indirect
-	github.com/aws/aws-sdk-go v1.30.11
+	github.com/aws/aws-sdk-go v1.35.4
 	github.com/benjamintf1/unmarshalledmatchers v0.0.0-20190408201839-bb1c1f34eaea
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/bxcodec/faker v2.0.1+incompatible

diff --git a/go.sum b/go.sum
@@ -119,6 +119,8 @@ github.com/aws/aws-sdk-go v1.25.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
 github.com/aws/aws-sdk-go v1.26.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.30.11 h1:bJoa1QGyyAV4COx1SXpf+LElFVVnOreG6KM0jIxwZq0=
 github.com/aws/aws-sdk-go v1.30.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/aws/aws-sdk-go v1.35.4 h1:GG0sdhmzQSe4/UcF9iuQP9i+58bPRyU4OpujyzMlVjo=
+github.com/aws/aws-sdk-go v1.35.4/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
 github.com/bazelbuild/bazel-gazelle v0.18.2-0.20190823151146-67c9ddf12d8a/go.mod h1:D0ehMSbS+vesFsLGiD6JXu3mVEzOlfUl8wNnq+x/9p0=
 github.com/bazelbuild/bazel-gazelle v0.18.2/go.mod h1:D0ehMSbS+vesFsLGiD6JXu3mVEzOlfUl8wNnq+x/9p0=
@@ -564,6 +566,9 @@ github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
 github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5 h1:lrdPtrORjGv1HbbEvKWDUAy97mPpFm4B8hp77tcCUJY=
 github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=

diff --git a/pkg/ctl/create/nodegroup.go b/pkg/ctl/create/nodegroup.go
@@ -108,8 +108,8 @@ func doCreateNodeGroups(cmd *cmdutils.Cmd, ng *api.NodeGroup, params createNodeG
 		return err
 	}
 
-	if err := ctl.LoadClusterVPC(cfg); err != nil {
-		return errors.Wrapf(err, "getting VPC configuration for cluster %q", cfg.Metadata.Name)
+	if err := ctl.LoadClusterIntoSpec(cfg); err != nil {
+		return errors.Wrapf(err, "getting existing configuration for cluster %q", cfg.Metadata.Name)
 	}
 
 	stackManager := ctl.NewStackManager(cfg)

diff --git a/pkg/eks/eks.go b/pkg/eks/eks.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/kris-nova/logger"
@@ -260,6 +261,21 @@ func (c *ClusterProvider) NewOpenIDConnectManager(spec *api.ClusterConfig) (*iam
 	return iamoidc.NewOpenIDConnectManager(c.Provider.IAM(), parsedARN.AccountID, *c.Status.clusterInfo.cluster.Identity.Oidc.Issuer, parsedARN.Partition)
 }
 
+// LoadClusterIntoSpec loads the cluster configuration into the spec
+// At the moment VPC and KubernetesNetworkConfig are respected
+func (c *ClusterProvider) LoadClusterIntoSpec(spec *api.ClusterConfig) error {
+	if err := c.LoadClusterVPC(spec); err != nil {
+		return err
+	}
+	if err := c.RefreshClusterStatus(spec); err != nil {
+		return err
+	}
+	if err := c.loadClusterKubernetesNetworkConfig(spec); err != nil {
+		return err
+	}
+	return nil
+}
+
 // LoadClusterVPC loads the VPC configuration
 func (c *ClusterProvider) LoadClusterVPC(spec *api.ClusterConfig) error {
 	stack, err := c.NewStackManager(spec).DescribeClusterStack()
@@ -270,6 +286,21 @@ func (c *ClusterProvider) LoadClusterVPC(spec *api.ClusterConfig) error {
 	return vpc.UseFromCluster(c.Provider, stack, spec)
 }
 
+// loadClusterKubernetesNetworkConfig gets the network config of an existing
+// cluster, note status must be refreshed!
+func (c *ClusterProvider) loadClusterKubernetesNetworkConfig(spec *api.ClusterConfig) error {
+	if spec.Status == nil {
+		return errors.New("cluster hasn't been refreshed")
+	}
+	knCfg := c.Status.clusterInfo.cluster.KubernetesNetworkConfig
+	if knCfg != nil {
+		spec.KubernetesNetworkConfig = &api.KubernetesNetworkConfig{
+			ServiceIPv4CIDR: aws.StringValue(knCfg.ServiceIpv4Cidr),
+		}
+	}
+	return nil
+}
+
 // ListClusters display details of all the EKS cluster in your account
 func (c *ClusterProvider) ListClusters(clusterName string, chunkSize int, output printers.Type, eachRegion bool) error {
 	// NOTE: this needs to be reworked in the future so that the functionality

diff --git a/pkg/eks/mocks/CloudFormationAPI.go b/pkg/eks/mocks/CloudFormationAPI.go