Merge pull request #615 from hongchaodeng/up

*: upgrade etcd-operator to 0.4.0

Author: hongchaodeng

glide.lock

@@ -1,7 +1,7 @@
 package: github.com/kubernetes-incubator/bootkube
 import:
 - package: github.com/coreos/etcd-operator
-  version: v0.3.2
+  version: v0.4.0
   subpackages:
   - pkg/spec
 - package: github.com/coreos/etcd

glide.yaml

@@ -25,15 +25,15 @@ const (
 	AssetPathEtcdClientKey                  = "tls/etcd-client.key"
 	AssetPathEtcdPeerCert                   = "tls/etcd-peer.crt"
 	AssetPathEtcdPeerKey                    = "tls/etcd-peer.key"
-	AssetPathSelfHostedOperatorEtcdCA       = "tls/operator/etcd-ca-crt.pem"
-	AssetPathSelfHostedOperatorEtcdCert     = "tls/operator/etcd-crt.pem"
-	AssetPathSelfHostedOperatorEtcdKey      = "tls/operator/etcd-key.pem"
-	AssetPathSelfHostedEtcdMemberClientCA   = "tls/etcdMember/client-ca-crt.pem"
-	AssetPathSelfHostedEtcdMemberClientCert = "tls/etcdMember/client-crt.pem"
-	AssetPathSelfHostedEtcdMemberClientKey  = "tls/etcdMember/client-key.pem"
-	AssetPathSelfHostedEtcdMemberPeerCA     = "tls/etcdMember/peer-ca-crt.pem"
-	AssetPathSelfHostedEtcdMemberPeerCert   = "tls/etcdMember/peer-crt.pem"
-	AssetPathSelfHostedEtcdMemberPeerKey    = "tls/etcdMember/peer-key.pem"
+	AssetPathSelfHostedOperatorEtcdCA       = "tls/operator/etcd-client-ca.crt"
+	AssetPathSelfHostedOperatorEtcdCert     = "tls/operator/etcd-client.crt"
+	AssetPathSelfHostedOperatorEtcdKey      = "tls/operator/etcd-client.key"
+	AssetPathSelfHostedEtcdMemberClientCA   = "tls/etcdMember/server-ca.crt"
+	AssetPathSelfHostedEtcdMemberClientCert = "tls/etcdMember/server.crt"
+	AssetPathSelfHostedEtcdMemberClientKey  = "tls/etcdMember/server.key"
+	AssetPathSelfHostedEtcdMemberPeerCA     = "tls/etcdMember/peer-ca.crt"
+	AssetPathSelfHostedEtcdMemberPeerCert   = "tls/etcdMember/peer.crt"
+	AssetPathSelfHostedEtcdMemberPeerKey    = "tls/etcdMember/peer.key"
 	AssetPathServiceAccountPrivKey          = "tls/service-account.key"
 	AssetPathServiceAccountPubKey           = "tls/service-account.pub"
 	AssetPathKubeletKey                     = "tls/kubelet.key"

pkg/asset/asset.go

@@ -3,7 +3,7 @@ package asset
 // DefaultImages are the defualt images bootkube components use.
 var DefaultImages = ImageVersions{
 	Etcd:            "quay.io/coreos/etcd:v3.1.8",
-	EtcdOperator:    "quay.io/coreos/etcd-operator:v0.3.3",
+	EtcdOperator:    "quay.io/coreos/etcd-operator:v0.4.0",
 	Flannel:         "quay.io/coreos/flannel:v0.7.1-amd64",
 	FlannelCNI:      "quay.io/coreos/flannel-cni:0.1.0",
 	Calico:          "quay.io/calico/node:v1.3.0",

pkg/asset/images.go

@@ -964,13 +964,13 @@ spec:
     - --initial-cluster-state=new
     - --data-dir=/var/etcd/data
     - --peer-client-cert-auth=true
-    - --peer-trusted-ca-file=/etc/kubernetes/secrets/etcdMember/peer-ca-crt.pem
-    - --peer-cert-file=/etc/kubernetes/secrets/etcdMember/peer-crt.pem
-    - --peer-key-file=/etc/kubernetes/secrets/etcdMember/peer-key.pem
+    - --peer-trusted-ca-file=/etc/kubernetes/secrets/etcdMember/peer-ca.crt
+    - --peer-cert-file=/etc/kubernetes/secrets/etcdMember/peer.crt
+    - --peer-key-file=/etc/kubernetes/secrets/etcdMember/peer.key
     - --client-cert-auth=true
-    - --trusted-ca-file=/etc/kubernetes/secrets/etcdMember/client-ca-crt.pem
-    - --cert-file=/etc/kubernetes/secrets/etcdMember/client-crt.pem
-    - --key-file=/etc/kubernetes/secrets/etcdMember/client-key.pem
+    - --trusted-ca-file=/etc/kubernetes/secrets/etcdMember/server-ca.crt
+    - --cert-file=/etc/kubernetes/secrets/etcdMember/server.crt
+    - --key-file=/etc/kubernetes/secrets/etcdMember/server.key
     volumeMounts:
     - mountPath: /etc/kubernetes/secrets
       name: secrets
@@ -1040,7 +1040,7 @@ var EtcdTPRTemplate = []byte(`{
       "static": {
         "member": {
           "peerSecret": "etcd-member-peer-tls",
-          "clientSecret": "etcd-member-client-tls"
+          "serverSecret": "etcd-member-client-tls"
         },
         "operatorSecret": "etcd-operator-client-tls"
       }

pkg/asset/internal/templates.go

@@ -124,13 +124,13 @@ spec:
     - --advertise-client-urls=https://{{ .BootEtcdServiceIP }}:12379
     - --data-dir=/var/etcd/data
     - --peer-client-cert-auth=true
-    - --peer-trusted-ca-file=/etc/kubernetes/secrets/etcdMember/peer-ca-crt.pem
-    - --peer-cert-file=/etc/kubernetes/secrets/etcdMember/peer-crt.pem
-    - --peer-key-file=/etc/kubernetes/secrets/etcdMember/peer-key.pem
+    - --peer-trusted-ca-file=/etc/kubernetes/secrets/etcdMember/peer-ca.crt
+    - --peer-cert-file=/etc/kubernetes/secrets/etcdMember/peer.crt
+    - --peer-key-file=/etc/kubernetes/secrets/etcdMember/peer.key
     - --client-cert-auth=true
-    - --trusted-ca-file=/etc/kubernetes/secrets/etcdMember/client-ca-crt.pem
-    - --cert-file=/etc/kubernetes/secrets/etcdMember/client-crt.pem
-    - --key-file=/etc/kubernetes/secrets/etcdMember/client-key.pem
+    - --trusted-ca-file=/etc/kubernetes/secrets/etcdMember/server-ca.crt
+    - --cert-file=/etc/kubernetes/secrets/etcdMember/server.crt
+    - --key-file=/etc/kubernetes/secrets/etcdMember/server.key
     volumeMounts:
       - mountPath: /var/etcd
         name: etcd