Merge remote-tracking branch 'origin/release-v2-dev' into feat/httproutepolicy-status-on-targetref-deleting

Author: dspo

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

@@ -0,0 +1,44 @@
+name: push v2-dev 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

.gitignore

@@ -32,3 +32,5 @@ api7-ingress-controller
 api7-ingress-controller-conformance-report.yaml
 
 *.mdx
+.cursor/
+

Makefile

@@ -164,6 +164,10 @@ linux-build:
 .PHONY: build-image
 build-image: docker-build
 
+.PHONY: build-push-image
+build-push-image: docker-build
+	@docker push ${IMG}
+
 .PHONY: build-multi-arch
 build-multi-arch:
 	@CGO_ENABLED=0 GOARCH=amd64 go build -o bin/api7-ingress-controller_amd64 -ldflags $(GO_LDFLAGS) cmd/main.go
@@ -316,3 +320,9 @@ mv $(1) $(1)-$(3) ;\
 } ;\
 ln -sf $(1)-$(3) $(1)
 endef
+
+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"
+	$(KUSTOMIZE) build config/crd > charts/crds/apisixic-crds.yaml

PROJECT

@@ -13,7 +13,7 @@ resources:
     namespaced: true
   controller: true
   domain: github.com
-  group: gateway.apisix.io
+  group: apisix.apache.org
   kind: Guestbook
   path: github.com/api7/api7-ingress-controller/api/v1alpha1
   version: v1alpha1
@@ -22,15 +22,15 @@ resources:
     namespaced: true
   controller: true
   domain: github.com
-  group: gateway.apisix.io
+  group: apisix.apache.org
   kind: GatewayProxy
   path: github.com/api7/api7-ingress-controller/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   domain: github.com
-  group: gateway.apisix.io
+  group: apisix.apache.org
   kind: HTTPRoutePolicy
   path: github.com/api7/api7-ingress-controller/api/v1alpha1
   version: v1alpha1

api/v1alpha1/groupversion_info.go

@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha1 contains API Schema definitions for the gateway.apisix.io v1alpha1 API group
+// Package v1alpha1 contains API Schema definitions for the apisix.apache.org v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=gateway.apisix.io
+// +groupName=apisix.apache.org
 package v1alpha1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "gateway.apisix.io", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "apisix.apache.org", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}