[stable/etcd-operator] Add cluster.restore, cluster.pod, nodeSelector & update

stable/etcd-operator/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: CoreOS etcd-operator Helm chart for Kubernetes
 name: etcd-operator
-version: 0.4.2
+version: 0.4.3
 appVersion: 0.3.3
 home: https://github.com/coreos/etcd-operator
 icon: https://raw.githubusercontent.com/coreos/etcd/master/logos/etcd-horizontal-color.png

stable/etcd-operator/README.md

@@ -59,6 +59,7 @@ The following tables lists the configurable parameters of the etcd-operator char
 | `resources.limits.memory`                         | Memory limit per etcd-operator pod                                   | `128Mi`                                        |
 | `resources.requests.cpu`                          | CPU request per etcd-operator pod                                    | `100m`                                         |
 | `resources.requests.memory`                       | Memory request per etcd-operator pod                                 | `128Mi`                                        |
+| `nodeSelector`                                    | node labels for etcd-operator pod assignment                         | `{}`                                           |
 | `cluster.enabled`                                 | Whether to enable provisioning of an etcd-cluster                    | `false`                                        |
 | `cluster.name`                                    | etcd cluster name                                                    | `etcd-cluster`                                 |
 | `cluster.version`                                 | etcd cluster version                                                 | `v3.1.8`                                       |
@@ -69,6 +70,15 @@ The following tables lists the configurable parameters of the etcd-operator char
 | `cluster.backup.config.maxSnapshot`               | maximum number of snapshots to keep                                  | `5`                                            |
 | `cluster.backup.config.storageType`               | Type of storage to provision                                         | `PersistentVolume`                             |
 | `cluster.backup.config.pv.volumeSizeInMB`         | size of backup PV                                                    | `512MB`                                        |
+| `cluster.restore.enabled`                         | Whether to restore from PV                                           | `false`                                        |
+| `cluster.restore.config.storageType`              | Type of storage to restore from                                      | `PersistentVolume`                             |
+| `cluster.restore.config.backupClusterName`        | Name of cluster to restore from                                      | `etcd-cluster`                                 |
+| `cluster.pod.antiAffinity`                        | Whether etcd cluster pods should have an antiAffinity                | `false`                                        |
+| `cluster.pod.resources.limits.cpu`                | CPU limit per etcd cluster pod                                       | `100m`                                         |
+| `cluster.pod.resources.limits.memory`             | Memory limit per etcd cluster pod                                    | `128Mi`                                        |
+| `cluster.pod.resources.requests.cpu`              | CPU request per etcd cluster pod                                     | `100m`                                         |
+| `cluster.pod.resources.requests.memory`           | Memory request per etcd cluster pod                                  | `128Mi`                                        |
+| `cluster.pod.nodeSelector`                        | node labels for etcd cluster pod assignment                          | `{}`                                           |
 | `rbac.install`                                    | install required rbac service account, roles and rolebindings        | `false`                                         |
 | `rbac.apiVersion`                                 | rbac api version `v1alpha1|v1beta1`                                  | `v1beta1`                                      |
 

stable/etcd-operator/templates/cluster.yaml

@@ -15,4 +15,10 @@ spec:
   backup:
 {{ toYaml .Values.cluster.backup.config | indent 4 }}
   {{- end -}}
+  {{- if .Values.cluster.restore.enabled }}
+  restore:
+{{ toYaml .Values.cluster.restore.config | indent 4 }}
+  {{- end }}
+  pod:
+{{ toYaml .Values.cluster.pod | indent 4 }}
 {{- end -}}

stable/etcd-operator/templates/deployment.yaml

@@ -41,3 +41,7 @@ spec:
               fieldPath: metadata.name
         resources:
 {{ toYaml .Values.resources | indent 12 }}
+    {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+    {{- end }}

stable/etcd-operator/values.yaml

@@ -13,6 +13,10 @@ resources:
   requests:
     cpu: 100m
     memory: 128Mi
+## Node labels for etcd-operator pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
 
 ## etcd-operator specific values
 ## additional command arguments go here; will be translated to `--key=value` form
@@ -38,7 +42,30 @@ cluster:
       pv:
         volumeSizeInMB: 512
 
+  restore:
+    enabled: false
+    config:
+      storageType: PersistentVolume
+      backupClusterName: etcd-cluster
+
+  ## etcd cluster pod specific values
+  pod:
+    ## Antiaffinity for etcd pod assignment
+    ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+    ##
+    antiAffinity: false
+    resources:
+      limits:
+        cpu: 100m
+        memory: 128Mi
+      requests:
+        cpu: 100m
+        memory: 128Mi
+    ## Node labels for etcd pod assignment
+    ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+    ##
+    nodeSelector: {}
 ## Install Default RBAC roles and bindings
 rbac:
   install: false
-  apiVersion: v1beta1
+  apiVersion: v1beta1