Add sh in Dockerfile (#319)

Also remove runAsUser, and separate secret for 
local and s3 mode for simpler usage in Helm Chart

Author: nitisht

Dockerfile

@@ -29,6 +29,8 @@ RUN cargo build --release
 FROM gcr.io/distroless/cc-debian11:nonroot
 
 WORKDIR /parseable
+
+COPY --from=busybox:1.35.0-uclibc /bin/sh /bin/sh
 COPY --from=builder /parseable/target/release/parseable /usr/bin/parseable
 
 CMD ["parseable"]

helm/templates/deployment.yaml

@@ -43,7 +43,8 @@ spec:
             - name: {{ $key }}
               value: {{ tpl $value $ | quote }}
             {{- end }}
-            {{- range $secret := .Values.parseable.secrets }}
+            {{- if .Values.parseable.local }}
+            {{- range $secret := .Values.parseable.localModeSecret }}
             {{- range $key := $secret.keys }}
             {{- $envPrefix := $secret.prefix | default "" | upper }}
             {{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -54,6 +55,19 @@ spec:
                   key: {{ $key }}
             {{- end }}
             {{- end }}
+            {{- else}}
+            {{- range $secret := .Values.parseable.s3ModeSecret }}
+            {{- range $key := $secret.keys }}
+            {{- $envPrefix := $secret.prefix | default "" | upper }}
+            {{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
+            - name: {{ $envPrefix }}{{ $envKey }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $secret.name }}
+                  key: {{ $key }}
+            {{- end }}
+            {{- end }}
+            {{- end }}
           ports:
             - containerPort: 8000
           resources:

helm/values.yaml

@@ -15,7 +15,17 @@ parseable:
       storageClass: ""
       accessMode: ReadWriteOnce
       size: 1Gi
-  secrets: 
+  localModeSecret:
+  - type: env
+    name: parseable-env-secret
+    prefix: P_
+    keys:
+    - addr
+    - username
+    - password
+    - staging.dir
+    - fs.dir
+  s3ModeSecret:
   - type: env
     name: parseable-env-secret
     prefix: P_
@@ -52,7 +62,6 @@ parseable:
       cpu: 500m
       memory: 1Gi
   securityContext:
-   runAsUser: 10001
    allowPrivilegeEscalation: false
   podAnnotations: {}
   podSecurityContext: {}

server/src/main.rs

@@ -105,7 +105,7 @@ async fn main() -> anyhow::Result<()> {
             _ = &mut localsync_outbox => {
                 // crash the server if localsync fails for any reason
                 // panic!("Local Sync thread died. Server will fail now!")
-                return Err(anyhow::Error::msg("Failed to sync local data to disc. This can happen due to critical error in disc or environment. Please restart the Parseable server.\n\nJoin us on Parseable Slack if the issue persists after restart : https://launchpass.com/parseable"))
+                return Err(anyhow::Error::msg("Failed to sync local data to drive. Please restart the Parseable server.\n\nJoin us on Parseable Slack if the issue persists after restart : https://launchpass.com/parseable"))
             },
             _ = &mut remote_sync_outbox => {
                 // remote_sync failed, this is recoverable by just starting remote_sync thread again