Merge pull request #9 from kilnfi/k1.35

Support Kubernetes 1.35

Author: dud225

.dockerignore

@@ -0,0 +1,6 @@
+.git/
+.github/
+charts/
+docs/
+test/
+vendor/

.github/kiln-values.yaml

@@ -0,0 +1,97 @@
+name: Container images
+
+on:
+  release:
+    types: [published]
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - 'charts/**'
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'charts/**'
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: docker/setup-buildx-action@v4
+      - uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Controller image metadata
+        id: controller-meta
+        uses: docker/metadata-action@v6
+        with:
+          images: ghcr.io/kilnfi/carina
+          tags: |
+            type=semver,pattern=controller-{{version}}
+            type=ref,event=pr,prefix=controller-pr-
+      - name: Build and push controller image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          load: true
+          push: ${{ github.event_name == 'release' }}
+          tags: ${{ steps.controller-meta.outputs.tags }}
+          labels: ${{ steps.controller-meta.outputs.labels }}
+          cache-from: type=gha,scope=controller
+          cache-to: type=gha,mode=max,scope=controller
+      - name: Scheduler image metadata
+        id: scheduler-meta
+        uses: docker/metadata-action@v6
+        with:
+          images: ghcr.io/kilnfi/carina
+          tags: |
+            type=semver,pattern=scheduler-{{version}}
+            type=ref,event=pr,prefix=scheduler-pr-
+      - name: Build and push scheduler image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./scheduler
+          load: true
+          push: ${{ github.event_name == 'release' }}
+          tags: ${{ steps.scheduler-meta.outputs.tags }}
+          labels: ${{ steps.scheduler-meta.outputs.labels }}
+          cache-from: type=gha,scope=scheduler
+          cache-to: type=gha,mode=max,scope=scheduler
+      - name: Create KinD cluster
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: helm/kind-action@v1
+        with:
+          cluster_name: kind
+      # Interactive debug
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+      #   with:
+      #     detached: true
+      - name: Test Kubernetes
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          set -x
+          controller_tag="${{ steps.controller-meta.outputs.version }}"
+          scheduler_tag="${{ steps.scheduler-meta.outputs.version }}"
+          kind load docker-image "ghcr.io/kilnfi/carina:${controller_tag}" "ghcr.io/kilnfi/carina:${scheduler_tag}"
+
+          helm install --create-namespace -n carina --set carina-scheduler.image.tag="${scheduler_tag}" --set image.carina.tag="${controller_tag}" --hide-notes --wait carina-csi-driver charts/
+
+          # Create a 50G loopback device inside carina-node to simulate a disk
+          kubectl wait pod -n carina -l app=csi-carina-node --for=condition=ready --timeout=120s
+          kubectl exec -t -n carina -c csi-carina-node ds/csi-carina-node -- sh -c "truncate -s 50G /tmp/disk.device && losetup /dev/loop2 /tmp/disk.device && pvcreate /dev/loop2"
+
+          # Run the helm test — creates a PVC and a pod that uses carina storage.
+          helm test -n carina --hide-notes carina-csi-driver

.github/workflows/ci.yaml

@@ -0,0 +1,31 @@
+name: Helm chart
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'charts/Chart.yaml'
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  helm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Push chart
+        run: |
+          helm package charts
+          helm push carina-csi-driver-*.tgz "oci://ghcr.io/kilnfi/helm-charts"

.github/workflows/container_images.yaml

@@ -1,28 +1,20 @@
 # Build the manager binary
-FROM registry.cn-hangzhou.aliyuncs.com/carina/golang:1.19.13 AS builder
+FROM golang:1.26 AS builder
 
-ENV GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOPROXY=https://goproxy.cn,direct
-ENV WORKSPACE=/workspace/github.com/carina-io/carina
-ENV GOMODCACHE=$WORKSPACE/vendor
+WORKDIR /workspace
+COPY go.mod go.sum ./
+RUN go mod download
+COPY . .
 
-WORKDIR $WORKSPACE
-ADD . .
+RUN cd cmd/carina-node && CGO_ENABLED=0 go build -o /tmp/carina-node .
+RUN cd cmd/carina-controller && CGO_ENABLED=0 go build -o /tmp/carina-controller .
 
-# Build
-RUN echo Commit: `git log --pretty='%s%b%B' -n 1`
-RUN cd $WORKSPACE/cmd/carina-node && go build -ldflags="-X main.gitCommitID=`git rev-parse HEAD`" -gcflags '-N -l' -o /tmp/carina-node .
-RUN cd $WORKSPACE/cmd/carina-controller && go build -ldflags="-X main.gitCommitID=`git rev-parse HEAD`" -gcflags '-N -l' -o /tmp/carina-controller .
+FROM alpine:3.20
 
-FROM registry.cn-hangzhou.aliyuncs.com/carina/centos-lvm2:runtime-20220108
+RUN apk add --no-cache bash bcache-tools device-mapper e2fsprogs eudev lvm2 parted thin-provisioning-tools util-linux xfsprogs
 
-# copy binary file
 COPY --from=builder /tmp/carina-node /usr/bin/
 COPY --from=builder /tmp/carina-controller /usr/bin/
-COPY --from=builder /workspace/github.com/carina-io/carina/debug/hack/config.json /etc/carina/
-RUN chmod +x /usr/bin/carina-node && chmod +x /usr/bin/carina-controller
+COPY --from=builder /workspace/debug/hack/config.json /etc/carina/
 
-# Update time zone to Asia-Shanghai
-COPY --from=builder /workspace/github.com/carina-io/carina/Shanghai /etc/localtime
-RUN echo 'Asia/Shanghai' > /etc/timezone
-
-CMD ["echo carina-node carina-controller"]
+CMD ["carina-controller"]