Add priority class name, use same temp directory as before

gardener · Apr 2, 2020 · 1fe8036 · 1fe8036
1 parent a2be0b4
commit 1fe8036
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/charts/etcd/templates/etcd-statefulset.yaml b/charts/etcd/templates/etcd-statefulset.yaml
@@ -48,6 +48,7 @@ spec:
       - ip: "127.0.0.1"
         hostnames:
         - {{ .Values.name }}-local
+      priorityClassName: gardener-shoot-controlplane
       containers:
       - name: etcd
         image: {{ .Values.etcd.image }}
@@ -306,4 +307,4 @@ spec:
 {{ end }}
       resources:
         requests:
-          storage: {{ .Values.storageCapacity }}
+          storage: {{ .Values.storageCapacity }}
diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml
@@ -1,6 +1,6 @@
 name: test
 uid: uuid-of-etcd-resource
-serviceName: test 
+serviceName: test
 configMapName: test
 
 replicas: 1
@@ -31,8 +31,8 @@ etcd:
 
 backup:
   pullPolicy: IfNotPresent
-  snapstoreTempDir: "/tmp"
-  etcdConnectionTimeout: 30
+  snapstoreTempDir: "/var/etcd/data/temp"
+  etcdConnectionTimeout: 300
   etcdQuotaBytes: 8Gi
   garbageCollectionPolicy: LimitBased
   maxBackups: 7
@@ -51,4 +51,4 @@ storageCapacity: 16Gi
 store:
   storageProvider: ""
   storePrefix: ""
-  storageContainer: ""
+  storageContainer: ""
diff --git a/controllers/etcd_controller.go b/controllers/etcd_controller.go
@@ -826,8 +826,8 @@ func (r *EtcdReconciler) getMapFromEtcd(etcd *druidv1alpha1.Etcd) (map[string]in
 		"pullPolicy":               corev1.PullIfNotPresent,
 		"garbageCollectionPolicy":  etcd.Spec.Backup.GarbageCollectionPolicy,
 		"etcdQuotaBytes":           quota,
-		"etcdConnectionTimeout":    "30s",
-		"snapstoreTempDir":         "/tmp",
+		"etcdConnectionTimeout":    "300",
+		"snapstoreTempDir":         "/var/etcd/data/temp",
 		"garbageCollectionPeriod":  etcd.Spec.Backup.GarbageCollectionPeriod,
 		"deltaSnapshotPeriod":      etcd.Spec.Backup.DeltaSnapshotPeriod,
 		"deltaSnapshotMemoryLimit": deltaSnapshotMemoryLimit,