Merge pull request #4 from shafinhasnat/main

Driver version v0.0.4

Author: shahedex

Dockerfile

@@ -1,67 +1,26 @@
-# syntax=docker/dockerfile:1.4
-
 FROM golang:1.24 as build
-
-ENV TZ=UTC
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
 WORKDIR /build
-
-RUN go install github.com/go-task/task/v3/cmd/task@latest
-RUN go install github.com/goreleaser/goreleaser@latest
-
-# Install dependencies
-COPY --link go.mod go.sum ./
-
+COPY go.mod go.sum ./
 RUN go mod tidy
-
-# Build binary
-COPY --link Taskfile.yaml .goreleaser.yaml ./
-COPY --link main.go ./
-COPY --link pkg ./pkg
-# For goreleaser, TODO: remove
-COPY --link .git ./.git
-
-RUN task build
-
+COPY . .
+RUN go mod tidy && go mod download
+ARG VERSION
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
+    go build \
+      -ldflags "-s -w \
+        -X main.name=csi-hyperstack \
+        -X main.version=${VERSION} \
+        -X k8s.io/csi-hyperstack/pkg/driver.DriverName=hyperstack.csi.nexgencloud.com \
+        -X k8s.io/csi-hyperstack/pkg/driver.DriverVersion=${VERSION}" \
+      -o /csi-hyperstack
 
 FROM alpine:3.20 as runtime
-
-RUN apk add --no-cache --update \
-  ca-certificates \
-  bash \
-  vim \
-  curl
-
-RUN curl -o /usr/local/bin/gosu \
-      -fsSL "https://github.com/tianon/gosu/releases/download/1.12/gosu-amd64" \
- && chmod +x /usr/local/bin/gosu
-
-RUN curl -fsSL "https://github.com/fullstorydev/grpcurl/releases/download/v1.7.0/grpcurl_1.7.0_linux_x86_64.tar.gz" -o grpcurl_1.7.0_linux_x86_64.tar.gz \
- && tar -xvf grpcurl_1.7.0_linux_x86_64.tar.gz \
- && chmod +x grpcurl
-RUN apk add e2fsprogs
-ENV HOME="/app"
-ENV PATH="/app:$PATH"
-WORKDIR "${HOME}"
-
-ENV ELEVATED_USER "false"
-ENV GROUP_ID 1000
-ENV GROUP_NAME app
-ENV USER_ID 1000
-ENV USER_NAME app
-RUN addgroup -g "${GROUP_ID}" "${GROUP_NAME}" \
- && adduser -u "${USER_ID}" -G "${GROUP_NAME}" -h "${HOME}" -D "${USER_NAME}"
-
-COPY --link build/entrypoint.sh entrypoint.sh
-RUN chmod +x entrypoint.sh
-
-COPY --link --from=build /build/dist/csi-hyperstack .
+RUN apk add --no-cache --update e2fsprogs
+RUN wget "https://github.com/fullstorydev/grpcurl/releases/download/v1.7.0/grpcurl_1.7.0_linux_x86_64.tar.gz" \
+ && tar -xvf grpcurl_1.7.0_linux_x86_64.tar.gz -C /usr/local/bin grpcurl \
+ && chmod +x /usr/local/bin/grpcurl \
+ && rm -rf grpcurl_1.7.0_linux_x86_64.tar.gz
+COPY --from=build /csi-hyperstack .
 RUN chmod +x csi-hyperstack
-
-ENV LOCAL_HEALTH_PORT "8080"
-HEALTHCHECK --interval=5s --timeout=3s --start-period=5s --retries=1 \
-  CMD curl -f "http://localhost:${LOCAL_HEALTH_PORT}/health" || exit 1
 RUN mkdir -p /csi
-# ENTRYPOINT ["entrypoint.sh"]
-# CMD ["csi-hyperstack", "start", "--endpoint", "unix:///csi/csi.sock", "--hyperstack-cluster-id", "''", "--hyperstack-node-id", "''", "--service-controller-enabled", "--service-node-enabled"]
+ENTRYPOINT ["/csi-hyperstack"]

Makefile

@@ -0,0 +1,19 @@
+IMAGE ?= ghcr.io/nexgencloud/csi-hyperstack/csi
+VERSION :=
+TAG ?= $(VERSION)
+
+ifeq ($(VERSION),)
+  $(error VERSION is not set. Usage: make <target> VERSION=<version> [TAG=<tag>])
+endif
+
+.PHONY: docker-build
+docker-build:
+	docker build -t $(IMAGE):$(TAG) --build-arg VERSION=$(VERSION) .
+
+.PHONY: docker-push
+docker-push: docker-build
+	docker push $(IMAGE):$(TAG)
+
+.PHONY: docker-build-push
+docker-build-push:
+	docker build -t $(IMAGE):$(TAG) --build-arg VERSION=$(VERSION) . --push

README.md

@@ -10,13 +10,6 @@ Before you begin, ensure you have the following tools installed:
 * A Hyperstack Kubernetes cluster
 
 ### CLI Dependencies (installed via Go)
-
-* [GoReleaser](https://goreleaser.com/) – Manages Go builds.
-
-  ```bash
-  go install github.com/goreleaser/goreleaser@latest
-  ```
-
 * (Optional) [gRPCurl](https://github.com/fullstorydev/grpcurl) – Useful for debugging gRPC calls.
 
   ```bash
@@ -47,7 +40,7 @@ You can invoke a specific RPC method for a given operation using `grpcurl`.
 To build the project:
 
 ```bash
-task build
+make build VERSION=<VERSION>
 ```
 
 ## Usage
@@ -60,16 +53,6 @@ For more information about the features of the Hyperstack API, visit
 the [Hyperstack Documentation](https://infrahub-doc.nexgencloud.com/docs/features/).
 
 Relevant docs:
-
-- [Simple guide](https://arslan.io/2018/06/21/how-to-write-a-container-storage-interface-csi-plugin/)
 - [Kubernetes CSI Developer Documentation](https://kubernetes-csi.github.io/docs/introduction.html):
-  official documentation on CSI plugin development
-- [CSI Volume Plugins in Kubernetes Design Doc](https://github.com/kubernetes/design-proposals-archive/blob/main/storage/container-storage-interface.md):
-  initial CSI proposal
-
-Examples (reference for development):
-
-- [Openstack cinder driver](https://github.com/kubernetes/cloud-provider-openstack/blob/master/pkg/csi/cinder/driver.go)
-- [Azure file](https://github.com/kubernetes-sigs/azurefile-csi-driver/blob/master/pkg/azurefile/azurefile.go)
-- [Synology](https://github.com/SynologyOpenSource/synology-csi/blob/main/main.go)
-- [Deployment example](https://github.com/kubernetes-csi/csi-driver-host-path/blob/master/deploy/kubernetes-1.27/hostpath/csi-hostpath-plugin.yaml)
+- [CSI Specification](https://github.com/container-storage-interface/spec/blob/master/spec.md)
+- [Openstack cinder driver](https://github.com/kubernetes/cloud-provider-openstack/blob/master/pkg/csi/cinder/driver.go)

Taskfile.yaml

@@ -3,5 +3,5 @@ name: csi-hyperstack
 description: |
   HELM chart for Hyperstack CSI drvier deployment
 type: application
-version: 0.0.2
-appVersion: 0.0.1
+version: 0.0.6
+appVersion: v0.0.4

charts/csi-hyperstack/Chart.yaml

@@ -22,20 +22,47 @@ spec:
       hostNetwork: true
       containers:
         - name: csi-hyperstack-node
-          image: {{ .Values.components.csiHyperstack.image }}:{{ .Values.components.csiHyperstack.tag }}
+          image: {{ .Values.components.csiHyperstack.image }}:{{ .Values.components.csiHyperstack.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.components.csiHyperstack.imagePullPolicy}}
           securityContext:
             privileged: true
             runAsUser: 0
             runAsGroup: 0
-          command: ["csi-hyperstack"]
+          # command: ["csi-hyperstack"]
           args:
             - "start"
             - "--endpoint=unix:///csi/csi.sock"
-            - "--hyperstack-api-address={{ .Values.hyperstack.apiKey }}"
-            - "--hyperstack-api-key={{ .Values.hyperstack.apiAddress }}"
-            - "--service-node-enabled"
+            - "--hyperstack-api-address={{ .Values.hyperstack.apiAddress }}"
+            - "--hyperstack-api-key={{ .Values.hyperstack.apiKey }}"
+            - "--service-node-enabled=true"
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - |
+                  grpcurl -plaintext -unix /csi/csi.sock csi.v1.Identity.GetPluginInfo >/dev/null 2>&1 \
+                  && grpcurl -plaintext -unix /csi/csi.sock csi.v1.Node.NodeGetInfo >/dev/null 2>&1
+            # initialDelaySeconds: 20
+            # periodSeconds: 10
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - |
+                  grpcurl -plaintext -unix /csi/csi.sock csi.v1.Identity.GetPluginInfo >/dev/null 2>&1 \
+                  && grpcurl -plaintext -unix /csi/csi.sock csi.v1.Node.NodeGetInfo >/dev/null 2>&1
+            # initialDelaySeconds: 20
+            # periodSeconds: 10
+            # timeoutSeconds: 5
+            # failureThreshold: 3
+            # successThreshold: 1
           env:
+            - name: DRIVER_NAME
+              value: "hyperstack.csi.nexgencloud.com"
+            - name: DRIVER_VERSION
+              value: "v1.0.0"
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -57,6 +84,12 @@ spec:
             - --v=5
             - --csi-address=/csi/csi.sock
             - --kubelet-registration-path=/var/lib/kubelet/plugins/hyperstack.csi.nexgencloud.com/csi.sock
+          livenessProbe:
+            exec:
+              command:
+              - /csi-node-driver-registrar
+              - --kubelet-registration-path=/var/lib/kubelet/plugins/hyperstack.csi.nexgencloud.com/csi.sock
+              - --mode=kubelet-registration-probe
           securityContext:
             privileged: true
           env:
@@ -70,6 +103,13 @@ spec:
               name: socket-dir
             - mountPath: /registration
               name: registration-dir
+        - name: liveness-probe
+          image: {{ .Values.components.livenessProbe.image }}
+          args:
+            - --csi-address=/csi/csi.sock
+          volumeMounts:
+            - mountPath: /csi
+              name: socket-dir
       volumes:
         - name: socket-dir
           hostPath: