fix(k8s): fix build-sync Pod crash loop issue

garden-io · Feb 19, 2020 · 86ee925 · 86ee925
1 parent 0c69b6e
commit 86ee925
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 3 deletions.
diff --git a/garden-service/src/plugins/kubernetes/hot-reload.ts b/garden-service/src/plugins/kubernetes/hot-reload.ts
@@ -120,7 +120,7 @@ export function configureHotReload({
 
   const rsyncContainer = {
     name: "garden-rsync",
-    image: "gardendev/rsync:0.1",
+    image: "gardendev/rsync:0.2.0",
     imagePullPolicy: "IfNotPresent",
     env: [
       // This makes sure the server is accessible on any IP address, because CIDRs can be different across clusters.

diff --git a/garden-service/static/kubernetes/system/build-sync/templates/deployment.yaml b/garden-service/static/kubernetes/system/build-sync/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
               name: garden-build-sync
       containers:
         - name: sync
-          image: "gardendev/rsync:0.1"
+          image: "gardendev/rsync:0.2.0"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: rsync

diff --git a/garden-service/test/unit/src/plugins/kubernetes/hot-reload.ts b/garden-service/test/unit/src/plugins/kubernetes/hot-reload.ts
@@ -81,7 +81,7 @@ describe("configureHotReload", () => {
               },
               {
                 name: "garden-rsync",
-                image: "gardendev/rsync:0.1",
+                image: "gardendev/rsync:0.2.0",
                 imagePullPolicy: "IfNotPresent",
                 env: [
                   {

diff --git a/rsync-server/Dockerfile b/rsync-server/Dockerfile
@@ -0,0 +1,7 @@
+FROM alpine:3.11.3
+
+RUN apk add --no-cache rsync
+
+ADD entrypoint.sh /
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/rsync-server/entrypoint.sh b/rsync-server/entrypoint.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+VOLUME=${VOLUME:-/data}
+ALLOW=${ALLOW:-192.168.0.0/16 172.16.0.0/12}
+
+mkdir -p ${VOLUME}
+
+cat <<EOF > /etc/rsyncd.conf
+uid = 0
+#gid =
+use chroot = no
+log file = /dev/stdout
+reverse lookup = no
+munge symlinks = yes
+[volume]
+    hosts deny = *
+    hosts allow = ${ALLOW}
+    read only = false
+    path = ${VOLUME}
+    comment = docker volume
+EOF
+
+exec /usr/bin/rsync --no-detach --daemon --config /etc/rsyncd.conf
diff --git a/rsync-server/garden.yml b/rsync-server/garden.yml
@@ -0,0 +1,6 @@
+kind: Module
+type: container
+name: rsync-server
+description: The rsync server image, used for hot reloading and in-cluster build syncs
+image: gardendev/rsync:0.2.0
+dockerfile: Dockerfile