Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit fc2b597

Browse files
committed
*: bump etcd-operator to 0.3.2
This changes the self hosted etcd pods to use FQDN: ``` ${member-name}.${cluster-name}.${namespace}.svc.cluster.local ``` We also need to change the bootstrap etcd pod to use cluster DNS. In order to survive reboot, we update kenc to checkpoint etcd hosts onto /var/etcd (where etcd data-dir resides).
1 parent cc47f58 commit fc2b597

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

pkg/asset/images.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ package asset
44
var DefaultImages = ImageVersions{
55
Busybox: "busybox",
66
Etcd: "quay.io/coreos/etcd:v3.1.8",
7-
EtcdOperator: "quay.io/coreos/etcd-operator:v0.3.0",
7+
EtcdOperator: "quay.io/coreos/etcd-operator:v0.3.2",
88
Flannel: "quay.io/coreos/flannel:v0.7.1-amd64",
99
Hyperkube: "quay.io/coreos/hyperkube:v1.6.4_coreos.0",
10-
Kenc: "quay.io/coreos/kenc:48b6feceeee56c657ea9263f47b6ea091e8d3035",
10+
Kenc: "quay.io/coreos/kenc:8f6e2e885f790030fbbb0496ea2a2d8830e58b8f",
1111
KubeDNS: "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.1",
1212
KubeDNSMasq: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.1",
1313
KubeDNSSidecar: "gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.1",

pkg/asset/internal/templates.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,9 @@ spec:
316316
- mountPath: /etc/kubernetes/selfhosted-etcd
317317
name: checkpoint-dir
318318
readOnly: false
319+
- mountPath: /var/etcd
320+
name: etcd-dir
321+
readOnly: false
319322
- mountPath: /var/lock
320323
name: var-lock
321324
readOnly: false
@@ -335,6 +338,9 @@ spec:
335338
- name: checkpoint-dir
336339
hostPath:
337340
path: /etc/kubernetes/checkpoint-iptables
341+
- name: etcd-dir
342+
hostPath:
343+
path: /var/etcd
338344
- name: var-lock
339345
hostPath:
340346
path: /var/lock
@@ -885,6 +891,11 @@ metadata:
885891
labels:
886892
k8s-app: etcd-operator
887893
spec:
894+
strategy:
895+
type: RollingUpdate
896+
rollingUpdate:
897+
maxUnavailable: 1
898+
maxSurge: 1
888899
replicas: 1
889900
template:
890901
metadata:
@@ -954,6 +965,7 @@ spec:
954965
- --data-dir=/var/etcd/data
955966
hostNetwork: true
956967
restartPolicy: Never
968+
dnsPolicy: ClusterFirstWithHostNet
957969
`)
958970

959971
var BootstrapEtcdSvcTemplate = []byte(`{

0 commit comments

Comments
 (0)