[ws-daemon] Fix config discrepancies

gitpod-io · Jul 26, 2021 · 40f913c · 40f913c
1 parent 60b9307
commit 40f913c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/.werft/values.dev.gcp-storage.yaml b/.werft/values.dev.gcp-storage.yaml
@@ -11,7 +11,6 @@ components:
         secretName: remote-storage-gcloud
         projectId: gitpod-dev
         region: europe-west1
-        tmpdir: /mnt/sync-tmp
         parallelUpload: 6
     volumes:
       - name: gcloud-creds

diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
@@ -349,7 +349,6 @@ storage:
     region: {{ $remoteStorageMinio.region | default "local" }}
     parallelUpload: {{ $remoteStorageMinio.parallelUpload | default "" }}
     maxBackupSize: {{ $remoteStorageMinio.maxBackupSize | default "" }}
-    tmpdir: {{ $remoteStorageMinio.tmpdir | default "/tmp" }}
 {{- else }}
 {{ toYaml .remoteStorage | indent 2 }}
 {{- end -}}

diff --git a/chart/templates/ws-daemon-configmap.yaml b/chart/templates/ws-daemon-configmap.yaml
@@ -26,6 +26,7 @@ daemon:
     {{- if (and $comp.workspaceSizeLimit (not (eq $comp.workspaceSizeLimit ""))) }}
     workspaceSizeLimit: {{ ($comp.workspaceSizeLimit | default "0g") | quote }}
     {{- end }}
+    tempDir: {{ $comp.backupTempDir | default "/tmp" }}
 {{ include "gitpod.remoteStorage.config" (dict "root" . "remoteStorage" .Values.components.contentService.remoteStorage) | indent 4 }}
     backup:
       timeout: "5m"
@@ -61,8 +62,9 @@ daemon:
         - name: {{ (printf "reg.%s" (.Values.components.registryFacade.hostname | default .Values.hostname)) | quote }}
           addr: 127.0.0.1
   disk:
-    path: "/mnt/wsdaemon-workingarea"
-    minBytesAvail: 21474836480
+    locations:
+    - path: "/mnt/wsdaemon-workingarea"
+      minBytesAvail: 21474836480
 service:
   address: ":{{ $comp.servicePort }}"
   tls:

diff --git a/components/ws-daemon/example-config.json b/components/ws-daemon/example-config.json
@@ -4,6 +4,7 @@
         "workingArea": "/tmp/wsdaemon",
         "backupPeriod": "30m",
         "workspaceSizeLimit": "20g",
+        "tempDir": "/tmp",
         "storage": {
             "kind": "minio",
             "stage": "dev",
@@ -13,14 +14,12 @@
                 "project": "gitpod-dev",
                 "parallelUpload": 4,
                 "maximumBackupSize": 32212254720,
-                "maximumBackupCount": 20,
-                "tmpdir": "/tmp/gcloud"
+                "maximumBackupCount": 20
             },
             "minio": {
                 "endpoint": "127.0.0.1:9000",
                 "accessKeyID": "C1GL0KSOR9ERG1R5GW92",
-                "secretAccessKey": "CNmBGC9T5u7UC3xQfd+MVrVnfAVRkS0X2N3+B0RS",
-                "tmpdir": "/tmp/upload"
+                "secretAccessKey": "CNmBGC9T5u7UC3xQfd+MVrVnfAVRkS0X2N3+B0RS"
             }
         }
     },

diff --git a/components/ws-daemon/pkg/content/config.go b/components/ws-daemon/pkg/content/config.go
@@ -42,7 +42,7 @@ type Config struct {
 
 		// Attempts configures how many backup attempts we will make.
 		// Detaults to 3
-		Attempts int `json:"backupAttempts"`
+		Attempts int `json:"attempts"`
 
 		// Period is the time between regular workspace backups
 		Period util.Duration `json:"period"`

diff --git a/install/gcp-terraform/modules/storage/templates/values.tpl b/install/gcp-terraform/modules/storage/templates/values.tpl
@@ -15,14 +15,14 @@ components:
         projectId: ${project}
         region: ${region}
         credentialsFile: /credentials/key.json
-        tmpdir: /mnt/sync-tmp
         parallelUpload: 6
 
   wsDaemon:
     name: "ws-daemon"
     hostWorkspaceArea: /var/gitpod/workspaces
     servicePort: 8080
     workspaceSizeLimit: ""
+    backupTempDir: /mnt/sync-tmp
     containerRuntime:
       runtime: containerd
       containerd: