Improve workflow and generate CRDs

.gitea/workflows/build.yaml

@@ -9,75 +9,67 @@ on:
 
 jobs:
   build:
-    name: Build container
+    name: Build container and manifests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.huizinga.dev
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name}}
           tags: |
+            type=edge
             type=ref,event=branch
-            type=ref,event=pr
+            type=semver,pattern=v{{version}}
-            type=semver,pattern={{version}}
+            type=semver,pattern=v{{major}}.{{minor}}
-            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern=v{{major}}
             type=sha
 
-      - name: Login to registry
+      - name: Set up Docker Buildx
-        uses: docker/login-action@v3
+        uses: docker/setup-buildx-action@v3
-        with:
-          registry: git.huizinga.dev
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
 
       - name: Build and push Docker image
-        uses: https://github.com/docker/build-push-action@v5
+        id: build
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
+          load: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-  manifests:
+      - name: Generate CRDs
-    name: Publish manifests
+        run: |
-    runs-on: ubuntu-latest
+          docker run --rm git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name }}:latest crdgen > ./manifests/crds.yaml
-    steps:
+          cat ./crds.yaml
-      - name: Checkout
-        uses: actions/checkout@v4
 
       - name: Install kustomize
         run: |
           curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash
 
-      - name: Setup Flux CLI
+      - name: Kustomize manifests
-        uses: https://github.com/fluxcd/flux2/action@main
-        with:
-          version: v2.5.0
-
-      - name: Login to registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.huizinga.dev
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-
-      # TODO: Generate and include crds
-      - name: Generate manifets
         run: |
-          ./kustomize build ./manifests | sed "s/\${SHA_SHORT}/$(git rev-parse --short HEAD)/" > ./app.yaml
+          ./kustomize build ./manifests | sed "s/\${SHA_SHORT}/$(git rev-parse --short HEAD)/" > ./manifests.yaml
 
       - name: Push manifests
         run: |
-          flux push artifact oci://git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name }}/manifests:sha-$(git rev-parse --short HEAD) \
+          flux push artifact oci://git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name }}/manifests:latest \
-            --path="./app.yaml" \
+            --path="./manifests.yaml" \
             --source="$(git config --get remote.origin.url)" \
-            --revision="$(git branch --show-current)@sha1:$(git rev-parse HEAD)"
+            --revision="$(git branch --show-current)@sha1:$(git rev-parse HEAD)" \
+            $(echo ${{ steps.meta.outputs.labels }} | sed -e 's/^/-a /')
 
       - name: Tag manifests
         run: |
           flux tag artifact oci://git.huizinga.dev/dreaded_x/${{ gitea.event.repository.name }}/manifests:sha-$(git rev-parse --short HEAD) \
-            --tag latest
+            $(echo ${{ steps.meta.outputs.tags }} | sed -e 's/^.*:/--tag /')

.pre-commit-config.yaml

@@ -4,6 +4,7 @@ repos:
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
+      - id: check-yaml
       - id: check-toml
       - id: check-added-large-files
       - id: check-merge-conflict

manifests/kustomization.yaml

@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: lldap
 resources:
+  - ./crds.yaml
   - ./service-account.yaml
   - ./cluster-role.yaml
   - ./cluster-role-binding.yaml