release v1.0.8

- udpates, web,api,kl, and operator

.github/workflows/kl.yml

@@ -3,70 +3,209 @@ on:
   workflow_call:
 
 jobs:
-  docker-build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
+  # docker-build:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Setup Python
+  #       uses: actions/setup-python@v2
+  #       with:
+  #         python-version: '3.x'
+  #
+  #     - name: Create and Set Image Tag
+  #       id: tag_name
+  #       run: |
+  #         import re
+  #         import os
+  #
+  #         ref = os.getenv('GITHUB_REF')
+  #         if ref.startswith('refs/heads/release-'):
+  #             tag = ref.replace('refs/heads/release-', '')
+  #             if not re.search('-nightly$', tag):
+  #                 tag += "-nightly"
+  #         elif ref.startswith('refs/tags/'):
+  #             tag = ref.replace('refs/tags/', '')
+  #         else:
+  #             tag = 'default-tag'  # Adjust this fallback tag as necessary
+  #
+  #         with open(os.getenv('GITHUB_ENV'), 'a') as env_file:
+  #             env_file.write(f"TAG={tag}\n")
+  #
+  #         with open(os.getenv('GITHUB_OUTPUT'), 'a') as env_out:
+  #             env_out.write(f"TAG_NAME={tag}\n")
+  #       shell: python
+  #
+  #     - uses: actions/checkout@v4
+  #       with:
+  #         submodules: recursive
+  #
+  #     - name: Setup Build Environment
+  #       id: setup
+  #       uses: ./.github/actions/setup/
+  #       with:
+  #         github_token: "${{ secrets.GITHUB_TOKEN }}"
+  #         enable_go: false
+  #         enable_task: false
+  #         enable_upx: false
+  #         enable_docker: true
+  #
+  #     - name: Build & Push Image
+  #       if: startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/')
+  #       env:
+  #         IMAGE_TAG: ${{ steps.tag_name.outputs.TAG_NAME }}
+  #         OVERRIDE_PUSHED_IMAGE: "false"
+  #       run: |
+  #         set +e
+  #         image_name="ghcr.io/kloudlite/kl/box"
+  #
+  #         docker manifest inspect $image_name:$IMAGE_TAG
+  #         exit_status=$?
+  #         if [ $exit_status -eq 0 ]; then
+  #           [ "$OVERRIDE_PUSHED_IMAGE" = "false" ] && echo "image ($image_name:$IMAGE_TAG) already exists, and override image is disable, exiting" && exit 0
+  #           echo "image exists, but override pushed image is set to true. proceeding with building image"
+  #         fi
+  #
+  #         set -e
+  #
+  #         docker buildx build --platform linux/amd64,linux/arm64 -t "$image_name:$IMAGE_TAG" --build-arg VERSION=$IMAGE_TAG --build-context project=kl kl/klbox-docker --cache-from="type=registry,ref=$image_name:buildcache" --cache-to="type=registry,ref=$image_name:buildcache,mode=max" --push
+
+  klbox-docker-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [amd64, arm64]
+        include:
+          - arch: amd64
+            runs-on: warp-ubuntu-2404-x64-8x-spot
 
-      - name: Create and Set Image Tag
-        id: tag_name
-        run: |
-          import re
-          import os
+          - arch: arm64
+            runs-on: blacksmith-4vcpu-ubuntu-2204-arm
 
-          ref = os.getenv('GITHUB_REF')
-          if ref.startswith('refs/heads/release-'):
-              tag = ref.replace('refs/heads/release-', '')
-              if not re.search('-nightly$', tag):
-                  tag += "-nightly"
-          elif ref.startswith('refs/tags/'):
-              tag = ref.replace('refs/tags/', '')
-          else:
-              tag = 'default-tag'  # Adjust this fallback tag as necessary
+    permissions:
+      contents: read
+      packages: write
 
-          with open(os.getenv('GITHUB_ENV'), 'a') as env_file:
-              env_file.write(f"TAG={tag}\n")
-
-          with open(os.getenv('GITHUB_OUTPUT'), 'a') as env_out:
-              env_out.write(f"TAG_NAME={tag}\n")
-        shell: python
+    runs-on: ${{ matrix.runs-on }}
 
-      - uses: actions/checkout@v4
+    steps:
+      # - name: Setup Python
+      #   uses: actions/setup-python@v2
+      #   with:
+      #     python-version: '3.x'
+
+      - uses: kloudlite/actions/generate-image-tag@v1
+      # - name: Create and Set Image Tag
+      #   id: tag_name
+      #   run: |
+      #     import re
+      #     import os
+      #
+      #     ref = os.getenv('GITHUB_REF')
+      #     if ref.startswith('refs/heads/release-'):
+      #         tag = ref.replace('refs/heads/release-', '')
+      #         if not re.search('-nightly$', tag):
+      #             tag += "-nightly"
+      #     elif ref.startswith('refs/tags/'):
+      #         tag = ref.replace('refs/tags/', '')
+      #     else:
+      #         tag = 'default-tag'  # Adjust this fallback tag as necessary
+      #
+      #     with open(os.getenv('GITHUB_ENV'), 'a') as env_file:
+      #         env_file.write(f"TAG={tag}\n")
+      #
+      #     with open(os.getenv('GITHUB_OUTPUT'), 'a') as env_out:
+      #         env_out.write(f"TAG_NAME={tag}\n")
+      #   shell: python
+
+      - uses: kloudlite/actions/setup-docker@v1
         with:
-          submodules: recursive
+          docker_registry: ghcr.io
+          docker_username: ${{ github.actor }}
+          docker_password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup Build Environment
-        id: setup
-        uses: ./.github/actions/setup/
-        with:
-          github_token: "${{ secrets.GITHUB_TOKEN }}"
-          enable_go: false
-          enable_task: false
-          enable_upx: false
-          enable_docker: true
+      - uses: actions/checkout@v4
 
       - name: Build & Push Image
-        if: startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/')
+        # if: startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/')
         env:
-          IMAGE_TAG: ${{ steps.tag_name.outputs.TAG_NAME }}
+          # IMAGE_TAG: ${{ steps.tag_name.outputs.TAG_NAME }}
+          KL_VERSION_TAG: ${{ env.IMAGE_TAG }}
           OVERRIDE_PUSHED_IMAGE: "false"
         run: |
           set +e
           image_name="ghcr.io/kloudlite/kl/box"
 
-          docker manifest inspect $image_name:$IMAGE_TAG
-          exit_status=$?
-          if [ $exit_status -eq 0 ]; then
-            [ "$OVERRIDE_PUSHED_IMAGE" = "false" ] && echo "image ($image_name:$IMAGE_TAG) already exists, and override image is disable, exiting" && exit 0
-            echo "image exists, but override pushed image is set to true. proceeding with building image"
-          fi
+          # docker manifest inspect $image_name:$IMAGE_TAG
+          # exit_status=$?
+          # if [ $exit_status -eq 0 ]; then
+          #   [ "$OVERRIDE_PUSHED_IMAGE" = "false" ] && echo "image ($image_name:$IMAGE_TAG) already exists, and override image is disable, exiting" && exit 0
+          #   echo "image exists, but override pushed image is set to true. proceeding with building image"
+          # fi
 
           set -e
 
-          docker buildx build --platform linux/amd64,linux/arm64 -t "$image_name:$IMAGE_TAG" --build-arg VERSION=$IMAGE_TAG --build-context project=kl kl/klbox-docker --cache-from="type=registry,ref=$image_name:buildcache" --cache-to="type=registry,ref=$image_name:buildcache,mode=max" --push
+          docker build --build-arg VERSION=$KL_VERSION_TAG -t ghcr.io/kloudlite/kl/box:$IMAGE_TAG-${{ matrix.arch }} --build-context project=. --output=type=image,compression=zstd,force-compression=true,compression-level=12,push=true ./klbox-docker 
+
+  klbox-docker-multiarch-manifest:
+    needs: klbox-docker-build
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      # - name: Setup Python
+      #   uses: actions/setup-python@v2
+      #   with:
+      #     python-version: '3.x'
+
+      - name: generates image tag
+        uses: kloudlite/actions/generate-image-tag@v1
+      # - name: Create and Set Image Tag
+      #   id: tag_name
+      #   run: |
+      #     import re
+      #     import os
+      #
+      #     ref = os.getenv('GITHUB_REF')
+      #     if ref.startswith('refs/heads/release-'):
+      #         tag = ref.replace('refs/heads/release-', '')
+      #         if not re.search('-nightly$', tag):
+      #             tag += "-nightly"
+      #     elif ref.startswith('refs/tags/'):
+      #         tag = ref.replace('refs/tags/', '')
+      #     else:
+      #         tag = 'default-tag'  # Adjust this fallback tag as necessary
+      #
+      #     with open(os.getenv('GITHUB_ENV'), 'a') as env_file:
+      #         env_file.write(f"TAG={tag}\n")
+      #
+      #     with open(os.getenv('GITHUB_OUTPUT'), 'a') as env_out:
+      #         env_out.write(f"TAG_NAME={tag}\n")
+      #   shell: python
+
+
+      - name: setup docker and github registry
+        uses: kloudlite/actions/setup-docker@v1
+        with:
+          docker_registry: ghcr.io
+          docker_username: ${{ github.actor }}
+          docker_password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: multiarch manifest build
+        env:
+          # IMAGE_TAG: ${{ env.II}}
+          KL_VERSION_TAG: ${{ env.IMAGE_TAG }}
+          # OVERRIDE_PUSHED_IMAGE: "false"
+        shell: bash
+        run: |
+          image_name="ghcr.io/kloudlite/kl/box"
+          docker manifest create ${image_name}:${IMAGE_TAG} ${image_name}:${IMAGE_TAG}-amd64 ${image_name}:${IMAGE_TAG}-arm64
+
+          docker manifest annotate ${image_name}:${IMAGE_TAG} ${image_name}:${IMAGE_TAG}-amd64 --os linux --arch amd64
+          docker manifest annotate ${image_name}:${IMAGE_TAG} ${image_name}:${IMAGE_TAG}-arm64 --os linux --arch arm64
+
+          docker manifest push ${image_name}:${IMAGE_TAG}
 
   build:
     name: Build ${{ matrix.app }}-${{ matrix.platform }}-${{ matrix.arch }}

.github/workflows/release-kloudlite.yml

@@ -95,12 +95,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
+          fetch-depth: 0
 
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: k3s-runner
-          path: k3s-runner-artifacts
+      # - name: Download all artifacts
+      #   uses: actions/download-artifact@v4
+      #   with:
+      #     name: k3s-runner
+      #     path: k3s-runner-artifacts
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -115,7 +116,6 @@ jobs:
           path: k3s
 
       - run: |+
-          ls k3s-runner-artifacts/*
           ls kl-artifacts/*
           ls k3s/*
 
@@ -153,7 +153,6 @@ jobs:
           release_tag: ${{ env.release_tag }}
           github_ref: ${GITHUB_REF}
           files: |+
-            k3s-runner-artifacts/**
             kl-artifacts/**
             k3s/**
 

.github/workflows/web.yml

@@ -42,7 +42,8 @@ jobs:
         if: "!startsWith(github.ref, 'refs/heads/release-') && !startsWith(github.ref, 'refs/tags/')"
         run: |
           image_name="ghcr.io/${{ github.repository }}/web/${{matrix.app}}"
-          docker buildx build --platform linux/amd64,linux/arm64 --build-arg APP=${{matrix.app}} -f web/${{matrix.dockerFile}} web -t "$image_name:test" --cache-from="type=registry,ref=$image_name:buildcache" --cache-to="type=registry,ref=$image_name:buildcache,mode=max"
+          # docker buildx build --platform linux/amd64,linux/arm64 --build-arg APP=${{matrix.app}} -f web/${{matrix.dockerFile}} web -t "$image_name:test" --cache-from="type=registry,ref=$image_name:buildcache" --cache-to="type=registry,ref=$image_name:buildcache,mode=max"
+          docker buildx build --platform linux/amd64 --build-arg APP=${{matrix.app}} -f web/${{matrix.dockerFile}} web -t "$image_name:test" --cache-from="type=registry,ref=$image_name:buildcache" --cache-to="type=registry,ref=$image_name:buildcache,mode=max"
 
       - name: Build & Push Image
         if: startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/')
@@ -62,4 +63,4 @@ jobs:
 
           set -e
           
-          docker buildx build --build-arg APP=${{matrix.app}} -f web/${{matrix.dockerFile}} web -t "$image_name:$IMAGE_TAG" --push --cache-from="type=registry,ref=$image_name:buildcache" --cache-to="type=registry,ref=$image_name:buildcache,mode=max"
+          docker buildx build --platform linux/amd64 --build-arg APP=${{matrix.app}} -f web/${{matrix.dockerFile}} web -t "$image_name:$IMAGE_TAG" --push --cache-from="type=registry,ref=$image_name:buildcache" --cache-to="type=registry,ref=$image_name:buildcache,mode=max"