Support annotations for etcdCluster

yuanying · May 7, 2018 · ddc10d0 · ddc10d0
1 parent 6b40e62
commit ddc10d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/templates/etcd-cluster.yaml b/templates/etcd-cluster.yaml
@@ -2,15 +2,15 @@ apiVersion: "etcd.database.coreos.com/v1beta2"
 kind: "EtcdCluster"
 metadata:
   name: {{ template "kubernetes.fullname" . }}-etcd
-  # Adding this annotation make this cluster managed by clusterwide operators
-  # namespaced operators ignore it
   labels:
     app: {{ template "kubernetes.name" . }}-etcd
     chart: {{ template "kubernetes.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- with .Values.etcdCluster.annotations }}
   annotations:
-    etcd.database.coreos.com/scope: clusterwide
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
   size: {{ .Values.etcdCluster.replicaCount }}
   version: {{ .Values.etcdCluster.version }}
diff --git a/values.yaml b/values.yaml
@@ -23,8 +23,10 @@ image:
   pullPolicy: IfNotPresent
 
 etcdCluster:
-  replicaCount: 1
+  size: 1
   version: "3.2.13"
+  annotations: {}
+  # etcd.database.coreos.com/scope: clusterwide
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious