remove auto-adding v to the etcd image version

README.md

@@ -98,7 +98,7 @@ metadata:
   name: "example-etcd-cluster"
 spec:
   size: 5
-  version: "3.2.13"
+  version: "v3.2.13"
 ```
 
 Apply the size change to the cluster CR:
@@ -126,7 +126,7 @@ metadata:
   name: "example-etcd-cluster"
 spec:
   size: 3
-  version: "3.2.13"
+  version: "v3.2.13"
 ```
 ```
 $ kubectl apply -f example/example-etcd-cluster.yaml
@@ -251,7 +251,7 @@ metadata:
   name: "example-etcd-cluster"
 spec:
   size: 3
-  version: "3.2.13"
+  version: "v3.2.13"
 ```
 
 Apply the version change to the cluster CR:

doc/user/abs_backup.md

@@ -82,7 +82,7 @@ spec:
   storageType: ABS
 status:
   etcdRevision: 1
-  etcdVersion: 3.2.13
+  etcdVersion: v3.2.13
   succeeded: true
 
 ```

doc/user/gcs_backup.md

@@ -64,7 +64,7 @@ spec:
   storageType: GCS
 status:
   etcdRevision: 1
-  etcdVersion: 3.2.13
+  etcdVersion: v3.2.13
   succeeded: true
 
 ```

doc/user/oss_backup.md

@@ -60,7 +60,7 @@ spec:
   storageType: OSS
 status:
   etcdRevision: 1
-  etcdVersion: 3.2.13
+  etcdVersion: v3.2.13
   succeeded: true
 ```
 

doc/user/spec_examples.md

@@ -14,7 +14,7 @@ This will use the default version chosen by the etcd-operator.
 ```yaml
 spec:
   size: 3
-  version: "3.2.13"
+  version: "v3.2.13"
 ```
 
 ## Three member cluster with node selector and anti-affinity across nodes

doc/user/walkthrough/backup-operator.md

@@ -81,7 +81,7 @@ kind: EtcdBackup
 ...
 status:
   etcdRevision: 1
-  etcdVersion: 3.2.13
+  etcdVersion: v3.2.13
   succeeded: true
 ```
 

example/example-etcd-cluster.yaml

@@ -8,4 +8,4 @@ metadata:
   #   etcd.database.coreos.com/scope: clusterwide
 spec:
   size: 3
-  version: "3.2.13"
+  version: "v3.2.13"

go.mod

@@ -3,7 +3,6 @@ module github.com/coreos/etcd-operator
 go 1.13
 
 require (
-	cloud.google.com/go v0.52.0 // indirect
 	cloud.google.com/go/storage v1.6.0
 	contrib.go.opencensus.io/exporter/ocagent v0.6.0 // indirect
 	github.com/Azure/azure-sdk-for-go v11.3.0-beta+incompatible
@@ -36,7 +35,7 @@ require (
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/pflag v1.0.3 // indirect
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	google.golang.org/api v0.20.0
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	k8s.io/api v0.0.0-20190226173710-145d52631d00

pkg/apis/etcd/v1beta2/cluster.go

@@ -18,13 +18,13 @@ import (
 	"errors"
 	"strings"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
 	defaultRepository  = "quay.io/coreos/etcd"
-	DefaultEtcdVersion = "3.2.13"
+	DefaultEtcdVersion = "v3.2.13"
 )
 
 var (
@@ -86,7 +86,7 @@ type ClusterSpec struct {
 	// The version must follow the [semver]( http://semver.org) format, for example "3.2.13".
 	// Only etcd released versions are supported: https://github.com/coreos/etcd/releases
 	//
-	// If version is not set, default is "3.2.13".
+	// If version is not set, default is "v3.2.13".
 	Version string `json:"version,omitempty"`
 
 	// Paused is to pause the control of the operator for the etcd cluster.
@@ -167,6 +167,12 @@ type PodPolicy struct {
 	// The default is to not use memory as the storage medium
 	// No effect if persistent volume is used
 	Tmpfs bool `json:"tmpfs,omitempty"`
+
+	// hostNetwork will set HostNetwork: true in podspec
+	HostNetwork bool `json:"hostNetwork,omitempty"`
+
+	// dnsPolicy will set dnsPolicy: <whatever> in podspec
+	DNSPolicy v1.DNSPolicy `json:"dnsPolicy,omitempty"`
 }
 
 // TODO: move this to initializer
@@ -199,7 +205,8 @@ func (e *EtcdCluster) SetDefaults() {
 		c.Version = DefaultEtcdVersion
 	}
 
-	c.Version = strings.TrimLeft(c.Version, "v")
+	// not used anymore, we take the full version name as final version (not prepending v to the version)
+	// c.Version = strings.TrimLeft(c.Version, "v")
 
 	// convert PodPolicy.AntiAffinity to Pod.Affinity.PodAntiAffinity
 	// TODO: Remove this once PodPolicy.AntiAffinity is removed

pkg/util/k8sutil/k8sutil.go

@@ -30,7 +30,7 @@ import (
 	"github.com/pborman/uuid"
 
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -136,7 +136,8 @@ fi
 }
 
 func ImageName(repo, version string) string {
-	return fmt.Sprintf("%s:v%v", repo, version)
+	// return fmt.Sprintf("%s:v%v", repo, version)
+	return fmt.Sprintf("%s:%s", repo, version)
 }
 
 // imageNameBusybox returns the default image for busybox init container, or the image specified in the PodPolicy
@@ -253,9 +254,9 @@ func AddEtcdVolumeToPod(pod *v1.Pod, pvc *v1.PersistentVolumeClaim, tmpfs bool)
 		vol.VolumeSource = v1.VolumeSource{
 			PersistentVolumeClaim: &v1.PersistentVolumeClaimVolumeSource{ClaimName: pvc.Name},
 		}
-               // Addresses case C from https://github.com/coreos/etcd-operator/blob/master/doc/design/persistent_volumes_etcd_data.md
-               // When PVC is used, make the pod auto recover in case of failure
-               pod.Spec.RestartPolicy = v1.RestartPolicyAlways
+		// Addresses case C from https://github.com/coreos/etcd-operator/blob/master/doc/design/persistent_volumes_etcd_data.md
+		// When PVC is used, make the pod auto recover in case of failure
+		pod.Spec.RestartPolicy = v1.RestartPolicyAlways
 	} else {
 		vol.VolumeSource = v1.VolumeSource{EmptyDir: &v1.EmptyDirVolumeSource{}}
 		if tmpfs {
@@ -433,6 +434,15 @@ func newEtcdPod(kubecli kubernetes.Interface, m *etcdutil.Member, initialCluster
 			SecurityContext:              podSecurityContext(cs.Pod),
 		},
 	}
+
+	if cs.Pod.DNSPolicy != "" {
+		pod.Spec.DNSPolicy = cs.Pod.DNSPolicy
+	}
+
+	if cs.Pod.HostNetwork {
+		pod.Spec.HostNetwork = true
+	}
+
 	SetEtcdVersion(pod, cs.Version)
 	return pod, nil
 }

test/e2e/basic_test.go

@@ -125,7 +125,7 @@ func TestEtcdUpgrade(t *testing.T) {
 		t.Fatalf("failed to create 3 members etcd cluster: %v", err)
 	}
 
-	targetVersion := "3.2.13"
+	targetVersion := "v3.2.13"
 	updateFunc := func(cl *api.EtcdCluster) {
 		cl = e2eutil.ClusterWithVersion(cl, targetVersion)
 	}