remove useless

Author: dspo

.github/workflows/push-docker-v2-dev.yaml

@@ -0,0 +1,44 @@
+name: push on dockerhub
+on:
+  release:
+    types: [ published ]
+  push:
+    branches:
+    - release-v2-dev
+  workflow_dispatch:
+jobs:
+  docker:
+    runs-on: buildjet-2vcpu-ubuntu-2204
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Setup Go Env
+      uses: actions/setup-go@v4
+      with:
+        go-version: "1.22"
+
+#    - name: Set up QEMU
+#      uses: docker/setup-qemu-action@v3
+#
+#    - name: Set up Docker Buildx
+#      uses: docker/setup-buildx-action@v3
+
+    - name: Login to Registry
+      uses: docker/login-action@v1
+      with:
+        registry: ${{ secrets.DOCKER_REGISTRY }}
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Build push image
+      env:
+        TAG: dev
+        ARCH: amd64
+        ENABLE_PROXY: "false"
+        BASE_IMAGE_TAG: "debug"
+      run: |
+        echo "building images..."
+        make build-push-image

.github/workflows/push-docker.yaml

@@ -1,45 +1,35 @@
 name: push on dockerhub
-on:
+on: 
   release:
-    types: [ published ]
-  push:
-    branches:
-    - release-v2-dev
-    - chore/helm
-  workflow_dispatch:
+    types: [published]
+      
 jobs:
   docker:
-    runs-on: buildjet-2vcpu-ubuntu-2204
+    runs-on: ubuntu-20.04
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Setup Go Env
-      uses: actions/setup-go@v4
-      with:
-        go-version: "1.22"
-
-#    - name: Set up QEMU
-#      uses: docker/setup-qemu-action@v3
-#
-#    - name: Set up Docker Buildx
-#      uses: docker/setup-buildx-action@v3
-
-    - name: Login to Registry
-      uses: docker/login-action@v1
-      with:
-        registry: ${{ secrets.DOCKER_REGISTRY }}
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Build push image
-      env:
-        TAG: dev
-        ARCH: amd64
-        ENABLE_PROXY: "false"
-        BASE_IMAGE_TAG: "debug"
-      run: |
-        echo "building images..."
-        make build-push-image
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref }}  # Use the reference to the release
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ secrets.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: '${{ github.event.release.tag_name }}'  # Use the release tag as the image tag

Makefile

@@ -321,7 +321,7 @@ mv $(1) $(1)-$(3) ;\
 ln -sf $(1)-$(3) $(1)
 endef
 
-charts-crds:
+helm-build-crds:
 	@echo "build gateway-api standard crds"
 	$(KUSTOMIZE) build github.com/kubernetes-sigs/gateway-api/config/crd\?ref=${GATEAY_API_VERSION} > charts/crds/gwapi-crds.yaml
 	@echo "build apisix ic crds"

charts/Chart.yaml

@@ -19,11 +19,3 @@ maintainers:
 # ref: https://artifacthub.io/docs/topics/annotations/helm/
 annotations:
   artifacthub.io/prerelease: "true"
-
-dependencies:
-- name: api7ee3
-  version: ">= 0.17.12"
-  repository: "https://charts.api7.ai"
-- name: gateway
-  version: ">= 0.2.14"
-  repository: "https://charts.api7.ai"