Containers images, Manifest files

- Manifest files
- Dockerfile for server
- Dockerfile for csi
- CSI pods deployment
- Server pods deployment

Signed-off-by: Aravinda VK <[email protected]>

Author: aravindavk

.gitignore

@@ -1,3 +1,4 @@
 glustercs_csi.egg-info
 build
 dist
+manifests/*.yaml

Makefile

@@ -1,7 +1,21 @@
 .PHONY: help build-grpc
 
+NODE?=kube1
+BRICK?=/exports/data
+
 help:
-	@echo "    make build-grpc  - To generate grpc Python Code"
+	@echo "    make build-grpc        - To generate grpc Python Code"
+	@echo "    make build-containers  - To create server, csi and Operator containers"
+	@echo "    make gen-manifest      - To generate manifest files to deploy"
 
 build-grpc:
 	python3 -m grpc_tools.protoc -I./csi/protos --python_out=csi --grpc_python_out=csi ./csi/protos/csi.proto
+
+build-containers:
+	bash build.sh
+
+gen-manifest:
+	@echo "Generating manifest files for node=${NODE} brick=${BRICK},"
+	@echo "run the following commands"
+	@echo
+	@python3 extras/scripts/gen_manifest.py ${NODE} ${BRICK}

build.sh

@@ -0,0 +1,61 @@
+#! /bin/bash
+
+set -e -o pipefail
+
+REPO="${REPO:-aravindavk}"
+
+RUNTIME_CMD=${RUNTIME_CMD:-docker}
+build="build"
+if [[ "${RUNTIME_CMD}" == "buildah" ]]; then
+	build="bud"
+fi
+
+# This sets the version variable to (hopefully) a semver compatible string. We
+# expect released versions to have a tag of vX.Y.Z (with Y & Z optional), so we
+# only look for those tags. For version info on non-release commits, we want to
+# include the git commit info as a "build" suffix ("+stuff" at the end). There
+# is also special casing here for when no tags match.
+VERSION_GLOB="v[0-9]*"
+# Get the nearest "version" tag if one exists. If not, this returns the full
+# git hash
+NEAREST_TAG="$(git describe --always --tags --match "$VERSION_GLOB" --abbrev=0)"
+# Full output of git describe for us to parse: TAG-<N>-g<hash>-<dirty>
+FULL_DESCRIBE="$(git describe --always --tags --match "$VERSION_GLOB" --dirty)"
+# If full matches against nearest, we found a valid tag earlier
+if [[ $FULL_DESCRIBE =~ ${NEAREST_TAG}-(.*) ]]; then
+        # Build suffix is the last part of describe w/ "-" replaced by "."
+        VERSION="$NEAREST_TAG+${BASH_REMATCH[1]//-/.}"
+else
+        # We didn't find a valid tag, so assume version 0 and everything ends up
+        # in build suffix.
+        VERSION="0.0.0+g${FULL_DESCRIBE//-/.}"
+fi
+
+BUILDDATE="$(date -u '+%Y-%m-%dT%H:%M:%S.%NZ')"
+
+build_args=()
+build_args+=(--build-arg "version=$VERSION")
+build_args+=(--build-arg "builddate=$BUILDDATE")
+
+# Print Docker version
+echo "=== $RUNTIME_CMD version ==="
+$RUNTIME_CMD version
+
+IMAGE_NAME=glusterfsd
+DOCKERFILE=glusterfsd.Dockerfile
+
+function build_container()
+{
+    IMAGE_NAME=$1
+    DOCKERFILE=$2
+    $RUNTIME_CMD $build \
+                 -t "${REPO}/${IMAGE_NAME}" \
+                 "${build_args[@]}" \
+                 --network host \
+                 -f "$DOCKERFILE" \
+                 . ||
+        exit 1
+}
+
+build_container "kadalu-server" "server/Dockerfile"
+build_container "kadalu-csi" "csi/Dockerfile"

csi/Dockerfile

@@ -0,0 +1,40 @@
+FROM docker.io/fedora:29
+
+COPY extras/release6-fedora.repo /etc/yum.repos.d/glusterfs-6-rc0.repo
+
+RUN yum update -y && \
+    yum -y install procps-ng glusterfs-fuse xfsprogs && \
+    yum clean all -y && \
+    rm -rf /var/cache/yum && \
+    rpm -qa | grep gluster | tee /gluster-rpm-versions.txt
+
+# Install Python GRPC library and copy all CSI related files
+RUN python3 -m pip install grpcio googleapis-common-protos
+RUN mkdir -p /kadalu-csi
+
+COPY csi/controllerserver.py   /kadalu-csi/
+COPY csi/csi_pb2_grpc.py       /kadalu-csi/
+COPY csi/csi_pb2.py            /kadalu-csi/
+COPY csi/identityserver.py     /kadalu-csi/
+COPY csi/main.py               /kadalu-csi/
+COPY csi/nodeserver.py         /kadalu-csi/
+COPY csi/utils.py              /kadalu-csi/
+
+ARG version="(unknown)"
+# Container build time (date -u '+%Y-%m-%dT%H:%M:%S.%NZ')
+ARG builddate="(unknown)"
+
+LABEL build-date="${builddate}"
+LABEL io.k8s.description="KaDalu CSI driver"
+LABEL name="kadalu-csi"
+LABEL Summary="KaDalu CSI driver"
+LABEL vcs-type="git"
+LABEL vcs-url="https://github.com/aravindavk/kadalu"
+LABEL vendor="kadalu.gluster"
+LABEL version="${version}"
+
+ENTRYPOINT ["/usr/bin/python3", "/kadalu-csi/main.py"]
+
+# Debugging, Comment the above line and
+# uncomment below line
+# ENTRYPOINT ["tail", "-f", "/dev/null"]

csi/controllerserver.py

@@ -1,78 +1,72 @@
-from concurrent import futures
-import time
-import logging
-
-import grpc
+import os
 
 import csi_pb2
 import csi_pb2_grpc
+from utils import mount_glusterfs, execute
 
-_ONE_DAY_IN_SECONDS = 60 * 60 * 24
-HOSTVOL_MOUNTDIR = "/mnt/"
+HOSTVOL_MOUNTDIR = "/mnt"
 GLUSTERFS_CMD = "/usr/sbin/glusterfs"
 MOUNT_CMD = "/usr/bin/mount"
 UNMOUNT_CMD = "/usr/bin/umount"
-
-
-def get_value_from_context(context, key):
-    for k, v in context:
-        if k == key:
-            return v
-
-    return ""
+mkfs_xfs_cmd = "/usr/sbin/mkfs.xfs"
 
 
 class ControllerServer(csi_pb2_grpc.ControllerServicer):
 
     def CreateVolume(self, request, context):
         # TODO: Get Hosting Volume name from Storage Class Option
-        hostVol = "ghostvol"
+        hostVol = "glustervol"
         mntdir = os.path.join(HOSTVOL_MOUNTDIR, hostVol)
 
         # # Try to mount the Host Volume, handle failure if already mounted
-        # # TODO: Get Glusterfs command with static Volfile
-        execute(GLUSTERFS_CMD,)
+        mount_glusterfs(hostVol, mntdir)
 
         # TODO: Get Volume capacity from PV claim
         pvsize = 1073741824  # 1GiB
-        
+
         # TODO: get pvtype from storage class
         pvtype = "virtblock"
+        volpath = os.path.join(mntdir, request.name)
         if pvtype == "virtblock":
             # Create a file with required size
+            fd = os.open(volpath, os.O_CREAT | os.O_RDWR)
+            os.close(fd)
+            os.truncate(volpath, pvsize)
             # Mkfs.xfs or based on storage class option
-            pass
+            execute(mkfs_xfs_cmd, volpath)
         else:
             # Create a subdir
-            # Set BackendQuota using RPC to sidecar container of each glusterfsd pod
-            pass
+            os.makedirs(volpath)
+            # TODO: Set BackendQuota using RPC to sidecar
+            # container of each glusterfsd pod
 
         return csi_pb2.CreateVolumeResponse(
-            volume_id=request.volume_id,
-            capacity_bytes=pvsize,
-            volume_context=[
-                {"key": "glustervol", "value": hostVol},
-                {"key": "pvtype", "value": pvtype}
-            ]
+            volume={
+                "volume_id": request.name,
+                "capacity_bytes": pvsize,
+                "volume_context": {
+                    "glustervol": hostVol,
+                    "pvtype": pvtype
+                }
+            }
         )
 
     def DeleteVolume(self, request, context):
         # TODO: Get Hosting Volume name from Storage Class Option
-        hostVol = "ghostvol"
+        hostVol = "glustervol"
         mntdir = os.path.join(HOSTVOL_MOUNTDIR, hostVol)
 
-        # # Try to mount the Host Volume, handle failure if already mounted
-        # # TODO: Get Glusterfs command with static Volfile
-        execute(GLUSTERFS_CMD,)
+        # Try to mount the Host Volume, handle
+        # failure if already mounted
+        mount_glusterfs(hostVol, mntdir)
 
         # TODO: get pvtype from storage class
         pvtype = "virtblock"
+        volpath = os.path.join(mntdir, request.name)
         if pvtype == "virtblock":
-            # Remove file
-            pass
+            os.remove(volpath)
         else:
-            # Remove directory
-            pass
+            os.removedirs(volpath)
 
         return csi_pb2.DeleteVolumeResponse()
 
@@ -86,24 +80,20 @@ def ListVolumes(self, request, context):
         # Listdir and return the list
         # Volume capacity need to be stored somewhere
         pass
-    
-    def ControllerGetCapabilities(self, request, context):
-        # TODO
-        pass
-
-
-def main():
-    logging.basicConfig()
-    server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
-    csi_pb2_grpc.add_ControllerServicer_to_server(ControllerServer(), server)
-    server.add_insecure_port('[::]:50051')
-    server.start()
-    try:
-        while True:
-            time.sleep(_ONE_DAY_IN_SECONDS)
-    except KeyboardInterrupt:
-        server.stop(0)
 
-
-if __name__ == '__main__':
-    main()
+    def ControllerGetCapabilities(self, request, context):
+        capabilityType = csi_pb2.ControllerServiceCapability.RPC.Type.Value
+        return csi_pb2.ControllerGetCapabilitiesResponse(
+            capabilities=[
+                {
+                    "rpc": {
+                        "type": capabilityType("CREATE_DELETE_VOLUME")
+                    }
+                },
+                {
+                    "rpc": {
+                        "type": capabilityType("LIST_VOLUMES")
+                    }
+                }
+            ]
+        )

csi/csi.Dockerfile

@@ -1,17 +1,6 @@
-from concurrent import futures
-import time
-import logging
-
-import grpc
-
 import csi_pb2
 import csi_pb2_grpc
-
-_ONE_DAY_IN_SECONDS = 60 * 60 * 24
-
-
-DRIVER_NAME = "org.gluster.glusterfs"
-DRIVER_VERSION = "0.1.0"
+from utils import DRIVER_NAME, DRIVER_VERSION
 
 
 class IdentityServer(csi_pb2_grpc.IdentityServicer):
@@ -23,27 +12,16 @@ def GetPluginInfo(self, request, context):
         )
 
     def GetPluginCapabilities(self, request, context):
-        # TODO: Update Capabilities
+        capabilityType = csi_pb2.PluginCapability.Service.Type.Value
         return csi_pb2.GetPluginCapabilitiesResponse(
-            capabilities=[]
+            capabilities=[
+                {
+                    "service": {
+                        "type": capabilityType("CONTROLLER_SERVICE")
+                    }
+                }
+            ]
         )
 
     def Probe(self, request, context):
-        return csi_pb2.Probe()
-
-
-def main():
-    logging.basicConfig()
-    server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
-    csi_pb2_grpc.add_IdentityServicer_to_server(IdentityServer(), server)
-    server.add_insecure_port('[::]:50051')
-    server.start()
-    try:
-        while True:
-            time.sleep(_ONE_DAY_IN_SECONDS)
-    except KeyboardInterrupt:
-        server.stop(0)
-
-
-if __name__ == '__main__':
-    main()
+        return csi_pb2.ProbeResponse()