Merge pull request #18 from quobyte/quobyte-1.4

Update services to 1.4 and minor fixes for client daemonset
quobyte · Aug 21, 2017 · e409264 · e409264
2 parents a096cb1 + 9b6fed3
commit e409264
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/kubernetes/client-ds.yaml b/kubernetes/client-ds.yaml
@@ -21,7 +21,6 @@ spec:
           - /bin/sh
           - -xec
           - |
-            ADDR=$(echo $(nslookup ${QUOBYTE_REGISTRY} | grep -A10 -m1 -e 'Name:' | grep Address | awk '{split($0,a,":"); print a[2]}'  | awk '{print $1":7861"}') | tr ' ' ,)
             if [[ ! -f /etcfs/fuse.conf ]]; then
               echo "Copy fuse config to host"
               { echo -e '# Copied from Quobyte Client Container\n'; cat /etc/fuse.conf; } > /etcfs/fuse.conf
@@ -30,14 +29,16 @@ spec:
               echo "user_allow_other" >> /etcfs/fuse.conf
             fi
             if cut -d" " -f2 /etcfs/mtab | grep -q ${QUOBYTE_MOUNT_POINT}; then
-              fusermount -u ${QUOBYTE_MOUNT_POINT}
+              umount ${QUOBYTE_MOUNT_POINT}
             else
               mkdir -p ${QUOBYTE_MOUNT_POINT}
             fi
             /bin/nsenter -t 1 --wd=. -m -- \
               lib/ld-linux-x86-64.so.2 \
               --library-path ./lib \
-            ./bin/mount.quobyte --hostname ${NODENAME} --allow-usermapping-in-volumename --http-port 55000 -f -d ${QUOBYTE_CLIENT_LOG_LEVEL} ${OPTS} ${ADDR}/ ${QUOBYTE_MOUNT_POINT}
+            ./bin/mount.quobyte --hostname ${NODENAME} --allow-usermapping-in-volumename \
+              --http-port 55000 -f -l /dev/stdout -d ${QUOBYTE_CLIENT_LOG_LEVEL} ${OPTS} \
+              ${QUOBYTE_REGISTRY}/ ${QUOBYTE_MOUNT_POINT}
         securityContext:
           privileged: true
         env:

diff --git a/kubernetes/data-ds.yaml b/kubernetes/data-ds.yaml
@@ -12,11 +12,11 @@ spec:
         prometheus.io/port: '7873'
       labels:
         role: data
-        version: 1.3.15
+        version: 1.4
     spec:
       containers:
       - name: quobyte-metadata
-        image: quay.io/quobyte/quobyte-server:1.3.15
+        image: quay.io/quobyte/quobyte-server:1.4
         securityContext:
           capabilities:
             add:

diff --git a/kubernetes/metadata-ds.yaml b/kubernetes/metadata-ds.yaml
@@ -12,11 +12,11 @@ spec:
         prometheus.io/port: '7872'
       labels:
         role: metadata
-        version: 1.3.15
+        version: 1.4
     spec:
       containers:
       - name: quobyte-metadata
-        image: quay.io/quobyte/quobyte-server:1.3.15
+        image: quay.io/quobyte/quobyte-server:1.4
         securityContext:
           capabilities:
             add:

diff --git a/kubernetes/qmgmt-pod.yaml b/kubernetes/qmgmt-pod.yaml
@@ -3,13 +3,13 @@ kind: Pod
 metadata:
   labels:
     role: qmgmt-pod
-    version: 1.3.15
+    version: 1.4
   name: qmgmt-pod
   namespace: quobyte
 spec:
   containers:
     - name: qmgmt-pod
-      image: quay.io/quobyte/quobyte-server:1.3.15
+      image: quay.io/quobyte/quobyte-server:1.4
       command:
         - /bin/bash
         - -xec

diff --git a/kubernetes/registry-ds.yaml b/kubernetes/registry-ds.yaml
@@ -8,11 +8,11 @@ spec:
     metadata:
       labels:
         role: registry
-        version: 1.3.15
+        version: 1.4
     spec:
       containers:
         - name: quobyte-registry
-          image: quay.io/quobyte/quobyte-server:1.3.15
+          image: quay.io/quobyte/quobyte-server:1.4
           securityContext:
             capabilities:
               add:

diff --git a/kubernetes/webconsole-deployment.yaml b/kubernetes/webconsole-deployment.yaml
@@ -8,11 +8,11 @@ spec:
     metadata:
       labels:
         role: webconsole
-        version: 1.3.15
+        version: 1.4
     spec:
       containers:
       - name: quobyte-webconsole
-        image: quay.io/quobyte/quobyte-server:1.3.15
+        image: quay.io/quobyte/quobyte-server:1.4
         env:
           - name: QUOBYTE_SERVICE
             value: "webconsole"