Merge pull request #1608 from HotelsDotCom/v0.13.0-rc.2-prep1

v0.13.0-rc.2

Author: davidmccormick

build

@@ -6,7 +6,8 @@ TAG=$(git describe --exact-match --abbrev=0 --tags "${COMMIT}" 2> /dev/null || t
 BRANCH=$(git branch | grep \* | cut -d ' ' -f2 | sed -e 's/[^a-zA-Z0-9+=._:/-]*//g' || true)
 OUTPUT_PATH=${OUTPUT_PATH:-"bin/kube-aws"}
 VERSION=""
-KUBERNETES_VERSION="v1.13.5"
+ETCD_VERSION="v3.2.26"
+KUBERNETES_VERSION="v1.13.6"
 
 if [ -z "$TAG" ]; then
         [[ -n "$BRANCH" ]] && VERSION="${BRANCH}/"
@@ -42,4 +43,4 @@ fi
 if [[ ! "${BUILD_GOARCH:-}" == "" ]];then
   export GOARCH=$BUILD_GOARCH
 fi
-go build -ldflags "-X github.com/kubernetes-incubator/kube-aws/pkg/model.VERSION=${VERSION} -X github.com/kubernetes-incubator/kube-aws/pkg/api.KUBERNETES_VERSION=${KUBERNETES_VERSION}" -a -tags netgo -installsuffix netgo -o "$OUTPUT_PATH" ./
+go build -ldflags "-X github.com/kubernetes-incubator/kube-aws/pkg/model.VERSION=${VERSION} -X github.com/kubernetes-incubator/kube-aws/pkg/api.KUBERNETES_VERSION=${KUBERNETES_VERSION} -X github.com/kubernetes-incubator/kube-aws/pkg/api.ETCD_VERSION=${ETCD_VERSION}" -a -tags netgo -installsuffix netgo -o "$OUTPUT_PATH" ./

builtin/files/cluster.yaml.tmpl

@@ -759,10 +759,10 @@ worker:
 #    instanceProfile:
 #      arn: "arn:aws:iam::YOURACCOUNTID:instance-profile/INSTANCEPROFILENAME"
 #
-#  # The version of etcd to be used. Set to e.g. "3.2.1" to use etcd3
+#  # The version of etcd to be used.
 #  # CAUTION: Increasing etcd version will permanently change the state of etcd and a cloud formation rollback, will not succeed due to etcd
 #  being unable to downgrade.
-#  version: 3.2.13
+#  version: 3.2.26
 #
 #  snapshot:
 #    # Set to true to periodically take an etcd snapshot

builtin/files/etcdadm/README.md

@@ -14,7 +14,6 @@ AWS_SECRET_ACCESS_KEY=... \
 ETCDADM_AWSCLI_DOCKER_IMAGE=quay.io/coreos/awscli \
 # Required settings
 AWS_DEFAULT_REGION=ap-northeast-1 \
-ETCD_VERSION=3.2.13 \
 ETCD_DATA_DIR=/var/lib/etcd \
 ETCD_INITIAL_CLUSTER=etcd0=http://127.0.0.1:3080,etcd1=http://127.0.0.1:3180,etcd2=http://127.0.0.1:3280 \
 ETCDCTL_ENDPOINTS=http://127.0.0.1:3079,etcd1=http://127.0.0.1:3179,etcd2=http://127.0.0.1:3279, \

builtin/files/etcdadm/test

@@ -98,7 +98,7 @@ RestartSec=10s
 TimeoutStartSec=0
 LimitNOFILE=40000
 
-Environment="ETCD_IMAGE_TAG=v3.2.13"
+Environment="ETCD_IMAGE_TAG=v3.2.26"
 Environment="ETCD_NAME=%m"
 Environment="ETCD_USER=etcd"
 Environment="ETCD_DATA_DIR=/var/lib/etcd"

builtin/files/userdata/cloud-config-controller

@@ -3366,11 +3366,7 @@ write_files:
           - --secure-port=443
           - --enable-bootstrap-token-auth=true
           - --token-auth-file=/etc/kubernetes/auth/tokens.csv
-          {{if .Etcd.Version.Is3}}
           - --storage-backend=etcd3
-          {{else}}
-          - --storage-backend=etcd2
-          {{end}}
           - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP
           {{if .Experimental.AuditLog.Enabled}}
           - --audit-log-maxage={{.Experimental.AuditLog.MaxAge}}

builtin/files/userdata/cloud-config-etcd

@@ -263,14 +263,13 @@ coreos:
         ExecStart=/bin/sleep 3600
         TimeoutStartSec=900
     {{ end -}}
-    {{if .Etcd.DisasterRecovery.SupportsEtcdVersion .Etcd.Version -}}
     - name: etcdadm-reconfigure.service
       enable: true
       content: |
         [Unit]
         Description=etcdadm reconfigure runner
-        BindsTo={{.Etcd.SystemdUnitName}}
-        Before={{.Etcd.SystemdUnitName}}
+        BindsTo=etcd-member.service
+        Before=etcd-member.service
         Wants=cfn-etcd-environment.service
         After=cfn-etcd-environment.service
         After=network.target
@@ -286,7 +285,7 @@ coreos:
         ExecStartPre=/usr/bin/systemctl is-active cfn-etcd-environment.service
         ExecStartPre=/usr/bin/mkdir -p /var/run/coreos/etcdadm/snapshots
         ExecStart=/opt/bin/etcdadm reconfigure
-        {{if .Etcd.DisasterRecovery.IsAutomatedForEtcdVersion .Etcd.Version -}}
+        {{if .Etcd.DisasterRecovery.Automated -}}
         ExecStartPost=/usr/bin/systemctl start etcdadm-check.timer
         {{end -}}
         TimeoutStartSec=120
@@ -296,8 +295,8 @@ coreos:
       content: |
         [Unit]
         Description=etcdadm update status
-        BindsTo={{.Etcd.SystemdUnitName}}
-        After={{.Etcd.SystemdUnitName}}
+        BindsTo=etcd-member.service
+        After=etcd-member.service
         After=network.target
 
         [Service]
@@ -307,11 +306,10 @@ coreos:
         EnvironmentFile=-/etc/etcd-environment
         EnvironmentFile=-/var/run/coreos/etcdadm-environment
         ExecStart=/opt/bin/etcdadm member_status_set_started
-        {{if .Etcd.Snapshot.IsAutomatedForEtcdVersion .Etcd.Version -}}
+        {{if .Etcd.Snapshot.Automated -}}
         ExecStartPost=/usr/bin/systemctl start etcdadm-save.timer
         {{end -}}
         TimeoutStartSec=120
-    {{- end}}
 
     - name: etcdadm-check.service
       enable: true
@@ -323,11 +321,11 @@ coreos:
         Type=oneshot
         EnvironmentFile=-/etc/etcd-environment
         EnvironmentFile=-/var/run/coreos/etcdadm-environment
-        ExecStartPre=/usr/bin/systemctl is-active {{.Etcd.SystemdUnitName}}
+        ExecStartPre=/usr/bin/systemctl is-active etcd-member.service
         ExecStart=/opt/bin/etcdadm check
         TimeoutStartSec=120
 
-    {{if .Etcd.DisasterRecovery.IsAutomatedForEtcdVersion .Etcd.Version -}}
+    {{if .Etcd.DisasterRecovery.Automated -}}
     - name: etcdadm-check.timer
       enable: true
       content: |
@@ -354,11 +352,11 @@ coreos:
         Type=oneshot
         EnvironmentFile=-/etc/etcd-environment
         EnvironmentFile=-/var/run/coreos/etcdadm-environment
-        ExecStartPre=/usr/bin/systemctl is-active {{.Etcd.SystemdUnitName}}
+        ExecStartPre=/usr/bin/systemctl is-active etcd-member.service
         ExecStart=/opt/bin/etcdadm save
         TimeoutStartSec=300
 
-    {{if .Etcd.Snapshot.IsAutomatedForEtcdVersion .Etcd.Version -}}
+    {{if .Etcd.Snapshot.Automated -}}
     - name: etcdadm-save.timer
       enable: true
       content: |
@@ -375,7 +373,7 @@ coreos:
         WantedBy=timers.target
     {{- end}}
 
-    - name: {{.Etcd.SystemdUnitName}}
+    - name: etcd-member.service
       drop-ins:
         - name: 20-aws-cluster.conf
           content: |
@@ -386,12 +384,9 @@ coreos:
             Wants=decrypt-assets.service
             After=decrypt-assets.service
             {{- end}}
-            {{if .Etcd.DisasterRecovery.SupportsEtcdVersion .Etcd.Version -}}
-            {{/* can be `Wants` if you like etcd-member to not stop when etcdadm-reconfigure failed */}}
             BindsTo=etcdadm-reconfigure.service etcdadm-update-status.service
             After=etcdadm-reconfigure.service
             Before=etcdadm-update-status.service
-            {{end -}}
 
             [Service]
             EnvironmentFile=-/etc/etcd-environment
@@ -403,32 +398,30 @@ coreos:
             ExecStartPre=/usr/bin/systemctl is-active decrypt-assets.service
             {{- end}}
             ExecStartPre=/usr/bin/chown -R etcd:etcd /var/lib/etcd2
-        {{if .Etcd.Version.Is3 }}
         - name: 40-version.conf
           content: |
             [Service]
-            Environment="ETCD_IMAGE_TAG=v{{.Etcd.Version}}"
+            Environment="ETCD_IMAGE_TAG={{.Etcd.Version}}"
         - name: 40-auto-compaction.conf
           content: |
             [Service]
             Environment="ETCD_AUTO_COMPACTION_RETENTION=1"
-        {{end}}
       enable: true
       command: start
 
     - name: var-lib-etcd2.mount
       enable: true
       content: |
         [Unit]
-        Before={{.Etcd.SystemdUnitName}}
+        Before=etcd-member.service
 
         [Mount]
         What=/dev/xvdf
         Where=/var/lib/etcd2
         Type=ext4
 
         [Install]
-        RequiredBy={{.Etcd.SystemdUnitName}}
+        RequiredBy=etcd-member.service
 
     - name: format-etcd2-volume.service
       enable: true
@@ -453,7 +446,7 @@ coreos:
       content: |
         [Unit]
         Description=decrypt etcd2 tls assets using amazon kms
-        Before={{.Etcd.SystemdUnitName}}
+        Before=etcd-member.service
 
         [Service]
         Restart=on-failure
@@ -484,16 +477,16 @@ coreos:
         ExecStart=-/usr/bin/rkt rm --uuid-file=/var/run/coreos/decrypt-assets.uuid
 
         [Install]
-        RequiredBy={{.Etcd.SystemdUnitName}}
+        RequiredBy=etcd-member.service
 {{ end }}
 
 {{ if .WaitSignal.Enabled }}
     - name: cfn-signal.service
       command: start
       content: |
         [Unit]
-        Wants={{.Etcd.SystemdUnitName}}
-        After={{.Etcd.SystemdUnitName}}
+        Wants=etcd-member.service
+        After=etcd-member.service
         {{ if .EtcdMigrationEnabled -}}
         After=import-existing-etcd-state.service
         {{ end -}}
@@ -504,7 +497,7 @@ coreos:
         RestartSec=10
 
         EnvironmentFile={{.EtcdNodeEnvFileName}}
-        ExecStartPre=/usr/bin/systemctl is-active {{.Etcd.SystemdUnitName}}
+        ExecStartPre=/usr/bin/systemctl is-active etcd-member.service
         {{ if .EtcdMigrationEnabled -}}
         ExecStartPre=/usr/bin/systemctl is-active import-existing-etcd-state.service
         {{ end -}}

core/root/cluster.go

@@ -482,6 +482,8 @@ func (cl *Cluster) create(cfSvc *cloudformation.CloudFormation) error {
 		return err
 	}
 
+	logger.Infof("Creating cluster %s with Kubernetes %s and etcd %s ...", cl.Cfg.ClusterName, cl.Cfg.K8sVer, cl.Cfg.Etcd.Version())
+
 	q := make(chan struct{}, 1)
 	defer func() { q <- struct{}{} }()
 
@@ -736,6 +738,8 @@ func (cl *Cluster) update(cfSvc *cloudformation.CloudFormation, targets Operatio
 		return "", err
 	}
 
+	logger.Infof("Updating cluster %s with Kubernetes %s and etcd %s ...", cl.Cfg.ClusterName, cl.Cfg.K8sVer, cl.Cfg.Etcd.Version())
+
 	q := make(chan struct{}, 1)
 	defer func() { q <- struct{}{} }()
 

pkg/api/cluster.go

@@ -839,17 +839,8 @@ func (e EtcdSettings) Validate() error {
 		return err
 	}
 
-	if e.Etcd.Version().Is3() {
-		if e.Etcd.DisasterRecovery.Automated && !e.Etcd.Snapshot.Automated {
-			return errors.New("`etcd.disasterRecovery.automated` is set to true but `etcd.snapshot.automated` is not - automated disaster recovery requires snapshot to be also automated")
-		}
-	} else {
-		if e.Etcd.DisasterRecovery.Automated {
-			return errors.New("`etcd.disasterRecovery.automated` is set to true for enabling automated disaster recovery. However the feature is available only for etcd version 3")
-		}
-		if e.Etcd.Snapshot.Automated {
-			return errors.New("`etcd.snapshot.automated` is set to true for enabling automated snapshot. However the feature is available only for etcd version 3")
-		}
+	if e.Etcd.DisasterRecovery.Automated && !e.Etcd.Snapshot.Automated {
+		return errors.New("`etcd.disasterRecovery.automated` is set to true but `etcd.snapshot.automated` is not - automated disaster recovery requires snapshot to be also automated")
 	}
 
 	return nil

pkg/api/etcd.go

@@ -30,7 +30,7 @@ type Etcd struct {
 	UnknownKeys        `yaml:",inline"`
 }
 
-type EtcdVersion string
+var ETCD_VERSION string = "v99.99"
 
 type EtcdDisasterRecovery struct {
 	Automated bool `yaml:"automated,omitempty"`
@@ -41,23 +41,10 @@ type UserSuppliedArgs struct {
 	AutoCompactionRetention int `yaml:"autoCompactionRetention,omitempty"`
 }
 
-// Supported returns true when the disaster recovery feature provided by etcdadm can be enabled on the specified version of etcd
-func (r EtcdDisasterRecovery) SupportsEtcdVersion(etcdVersion EtcdVersion) bool {
-	return etcdVersion.Is3()
-}
-
-func (r EtcdDisasterRecovery) IsAutomatedForEtcdVersion(etcdVersion EtcdVersion) bool {
-	return etcdVersion.Is3() && r.Automated
-}
-
 type EtcdSnapshot struct {
 	Automated bool `yaml:"automated,omitempty"`
 }
 
-func (s EtcdSnapshot) IsAutomatedForEtcdVersion(etcdVersion EtcdVersion) bool {
-	return etcdVersion.Is3() && s.Automated
-}
-
 func NewDefaultEtcd() Etcd {
 	return Etcd{
 		EC2Instance: EC2Instance{
@@ -160,13 +147,6 @@ func (e Etcd) SecurityGroupRefs() []string {
 	return refs
 }
 
-func (e Etcd) SystemdUnitName() string {
-	if e.Version().Is3() {
-		return "etcd-member.service"
-	}
-	return "etcd2.service"
-}
-
 func ValidateQuotaBackendBytes(bytes int) error {
 	if bytes > MaxQuotaBackendBytes {
 		return fmt.Errorf("quotaBackendBytes: %v is higher than the maximum allowed value 8,589,934,592", bytes)
@@ -201,17 +181,9 @@ func (e Etcd) FormatOpts() string {
 }
 
 // Version returns the version of etcd (e.g. `3.2.1`) to be used for this etcd cluster
-func (e Etcd) Version() EtcdVersion {
+func (e Etcd) Version() string {
 	if e.Cluster.Version != "" {
 		return e.Cluster.Version
 	}
-	return "3.2.13"
-}
-
-func (v EtcdVersion) Is3() bool {
-	return strings.HasPrefix(string(v), "3")
-}
-
-func (v EtcdVersion) String() string {
-	return string(v)
+	return ETCD_VERSION
 }

pkg/api/etcd_cluster.go

@@ -3,12 +3,12 @@ package api
 import "fmt"
 
 type EtcdCluster struct {
-	InternalDomainName     string      `yaml:"internalDomainName,omitempty"`
-	MemberIdentityProvider string      `yaml:"memberIdentityProvider,omitempty"`
-	HostedZone             Identifier  `yaml:"hostedZone,omitempty"`
-	ManageRecordSets       *bool       `yaml:"manageRecordSets,omitempty"`
-	KMSKeyARN              string      `yaml:"kmsKeyArn,omitempty"`
-	Version                EtcdVersion `yaml:"version,omitempty"`
+	InternalDomainName     string     `yaml:"internalDomainName,omitempty"`
+	MemberIdentityProvider string     `yaml:"memberIdentityProvider,omitempty"`
+	HostedZone             Identifier `yaml:"hostedZone,omitempty"`
+	ManageRecordSets       *bool      `yaml:"manageRecordSets,omitempty"`
+	KMSKeyARN              string     `yaml:"kmsKeyArn,omitempty"`
+	Version                string     `yaml:"version,omitempty"`
 }
 
 const (

pkg/api/etcd_test.go

@@ -36,18 +36,10 @@ func TestEtcd(t *testing.T) {
 		t.Errorf("name tag key incorrect, expected: kube-aws:etcd:name, got: %s", etcdTest.NameTagKey())
 	}
 
-	if etcdTest.Version() != "3.2.13" {
-		t.Errorf("etcd version incorrect, epxected: 3.2.13, got: %s", etcdTest.Version())
-	}
-
 	if !etcdTest.NodeShouldHaveEIP() {
 		t.Error("expected: true, got: false")
 	}
 
-	if etcdTest.SystemdUnitName() != "etcd-member.service" {
-		t.Errorf("etcd systemd unit name incorrect, expected: etcd-member.service, got %s", etcdTest.SystemdUnitName())
-	}
-
 	if etcdTest.SecurityGroupRefs()[0] != `{"Fn::ImportValue" : {"Fn::Sub" : "${NetworkStackName}-EtcdSecurityGroup"}}` {
 		t.Errorf("etcd security group refs incorrect, expected: `{'Fn::ImportValue' : {'Fn::Sub' : '${NetworkStackName}-EtcdSecurityGroup'}}`, got: %s", etcdTest.SecurityGroupRefs()[0])
 	}