Control plane

.github/workflows/e2e.yml

@@ -16,7 +16,6 @@ env:
   KIND_VERSION: "v0.22.0"
   KIND_CLUSTER_NAME: "kindnet"
   REGISTRY: ghcr.io
-  IMAGE_NAME: aojea/kindnetd
 
 jobs:
   build:
@@ -34,15 +33,22 @@ jobs:
 
     - name: Build
       run: |
-        docker build -t ghcr.io/aojea/kindnetd:test -f Dockerfile .
+        docker build -t ghcr.io/aojea/kindnetd:test -f Dockerfile.kindnetd .
+        docker build -t ghcr.io/aojea/kindnet-controller:test -f Dockerfile.kindnet-controller .
         mkdir _output
         docker save ghcr.io/aojea/kindnetd:test  > _output/kindnetd-image.tar
+        docker save ghcr.io/aojea/kindnet-controller:test  > _output/kindnet-controller-image.tar
 
     - uses: actions/upload-artifact@v2
       with:
         name: test-image
         path: _output/kindnetd-image.tar
 
+    - uses: actions/upload-artifact@v2
+      with:
+        name: test-image-controller
+        path: _output/kindnet-controller-image.tar
+
   e2e:
     name: e2e
     runs-on: ubuntu-latest
@@ -110,21 +116,31 @@ jobs:
       with:
         name: test-image
 
+    - uses: actions/download-artifact@v2
+      with:
+        name: test-image-controller
+
     - name: Install kindnetd
       run: |
         # preload kindnetd image
         docker load --input kindnetd-image.tar
         /usr/local/bin/kind load docker-image ghcr.io/aojea/kindnetd:test --name ${{ env.KIND_CLUSTER_NAME}}
+        # preload kindnet-controller image
+        docker load --input kindnet-controller-image.tar
+        /usr/local/bin/kind load docker-image ghcr.io/aojea/kindnet-controller:test --name ${{ env.KIND_CLUSTER_NAME}}
 
     - name: install ptp plugin
       run: |
-        sed -i s#aojea/kindnetd.*#aojea/kindnetd:test# install-kindnet.yaml
+        sed -i s#aojea/kindnet-controller.*#aojea/kindnet-controller:test# install-kindnet.yaml
+        sed -i s#aojea/kindnetd.*#aojea/kindnetd:test# docs/default-configuration.yaml
         /usr/local/bin/kubectl apply -f ./install-kindnet.yaml
 
     - name: Get Cluster status
       run: |
-        # wait network is ready
-        sleep 5
+        # wait kindnet-controller is ready
+        /usr/local/bin/kubectl wait --timeout=1m --for=condition=ready pods --namespace=kube-system -l app=kindnet-controller
+        /usr/local/bin/kubectl apply -f ./docs/default-configuration.yaml
+        # wait network is ready, kube-dns pods depend on the network
         /usr/local/bin/kubectl get nodes -o wide
         /usr/local/bin/kubectl get pods -A
         /usr/local/bin/kubectl wait --timeout=1m --for=condition=ready pods --namespace=kube-system -l k8s-app=kube-dns
@@ -195,6 +211,7 @@ jobs:
         path: ./_artifacts/logs
 
   publish:
+    permissions: write-all
     name: publish
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -208,6 +225,10 @@ jobs:
       with:
         name: test-image
 
+    - uses: actions/download-artifact@v2
+      with:
+        name: test-image-controller
+
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
@@ -219,13 +240,18 @@ jobs:
         docker load --input kindnetd-image.tar
         docker tag ghcr.io/aojea/kindnetd:test aojea/kindnetd
         docker push aojea/kindnetd
+        docker load --input kindnet-controller-image.tar
+        docker tag ghcr.io/aojea/kindnet-controller:test aojea/kindnet-controller
+        docker push aojea/kindnet-controller
 
     - name: Publish image for tags
       if: startsWith(github.ref, 'refs/tags/v')
       run: |
         TAG=$(git describe --tags --abbrev=0)
         docker tag ghcr.io/aojea/kindnetd:test aojea/kindnetd:$TAG
         docker push aojea/kindnetd:$TAG
+        docker tag ghcr.io/aojea/kindnet-controller:test aojea/kindnet-controller:$TAG
+        docker push aojea/kindnet-controller:$TAG
 
     - name: Log in to the Container registry
       uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
@@ -234,17 +260,32 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Extract metadata (tags, labels) for Docker
+    - name: Extract metadata (tags, labels) for Docker kindnetd
       id: meta
       uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
       with:
-        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+        images: ${{ env.REGISTRY }}/aojea/kindnetd
 
-    - name: Build and push Docker image
+    - name: Build and push Docker image kindnetd
       uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
       with:
         context: .
+        file: Dockerfile.kindnetd
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
 
+    - name: Extract metadata (tags, labels) for Docker kindnet-controller
+      id: meta2
+      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+      with:
+        images: ${{ env.REGISTRY }}/aojea/kindnet-controller
+
+    - name: Build and push Docker image kindnet-controller
+      uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+      with:
+        context: .
+        file: Dockerfile.kindnet-controller
+        push: true
+        tags: ${{ steps.meta2.outputs.tags }}
+        labels: ${{ steps.meta2.outputs.labels }}

.github/workflows/test.yaml

@@ -21,4 +21,4 @@ jobs:
     - uses: actions/checkout@v3
     - run: make test
     - run: make lint
-
+    - run: make verify

.gitignore

@@ -14,4 +14,5 @@
 #
 *.swp
 .gopath~/
+bin/
 vendor/src

Dockerfile.kindnet-controller

@@ -0,0 +1,19 @@
+ARG GOARCH="amd64"
+# STEP 1: Build kindnet-controller binary
+FROM golang:1.22 AS builder
+# golang envs
+ARG GOARCH="amd64"
+ARG GOOS=linux
+ENV CGO_ENABLED=0
+ENV GO111MODULE="on"
+ENV GOPROXY=https://proxy.golang.org
+# copy in sources
+WORKDIR /src
+COPY . .
+# build
+RUN CGO_ENABLED=0 go build -o /go/bin/kindnet-controller ./cmd/kindnet-controller
+# STEP 2: Build small image
+FROM gcr.io/distroless/static-debian12
+LABEL org.opencontainers.image.source=https://github.com/aojea/kindnet
+COPY --from=builder --chown=root:root /go/bin/kindnet-controller /bin/kindnet-controller
+CMD ["/bin/kindnet-controller"]

Dockerfile → Dockerfile.kindnetd

@@ -43,6 +43,7 @@ RUN echo "Installing CNI binaries ..." \
     -delete
 # STEP 2: Build small image
 FROM registry.k8s.io/build-image/distroless-iptables:v0.5.2
+LABEL org.opencontainers.image.source=https://github.com/aojea/kindnet
 COPY --from=builder --chown=root:root /go/bin/kindnetd /bin/kindnetd
 COPY --from=builder --chown=root:root /opt/cni/bin /opt/cni/bin
 CMD ["/bin/kindnetd"]

Makefile

@@ -20,20 +20,21 @@ test:
 lint:
 	hack/lint.sh
 
-update:
+update: update-vendor generate
+
+verify:
+	hack/verify-all.sh
+
+# Generate code
+generate:
+	hack/update-codegen.sh
+
+update-vendor:
 	go mod tidy && go mod vendor
 
-# get image name from directory we're building
-IMAGE_NAME=kindnetd
-# docker image registry, default to upstream
-REGISTRY?=ghcr.io/aojea
-# tag based on date-sha
-TAG?=$(shell echo "$$(date +v%Y%m%d)-$$(git describe --always --dirty)")
-# the full image tag
-IMAGE?=$(REGISTRY)/$(IMAGE_NAME):$(TAG)
-
-# required to enable buildx
-export DOCKER_CLI_EXPERIMENTAL=enabled
 image-build:
-# docker buildx build --platform=${PLATFORMS} $(OUTPUT) --progress=$(PROGRESS) -t ${IMAGE} --pull $(EXTRA_BUILD_OPT) .
-	docker build . -t ${IMAGE}
+	hack/build-images.sh
+
+
+
+