test

Author: AlinsRan

.github/workflows/e2e-test-k8s.yml

@@ -80,9 +80,28 @@ jobs:
         run: |
           make kind-up
 
+      - name: Build images
+        env:
+          TAG: dev
+          ARCH: amd64
+          ENABLE_PROXY: "false"
+          BASE_IMAGE_TAG: "debug"
+        run: |
+          echo "building images..."
+          make build-image
+
+      - name: Extract adc binary
+        run: |
+          echo "Extracting adc binary..."
+          docker create --name adc-temp api7/api7-ingress-controller:dev
+          docker cp adc-temp:/bin/adc /usr/local/bin/adc
+          docker rm adc-temp
+          chmod +x /usr/local/bin/adc
+          echo "ADC binary extracted to /usr/local/bin/adc"
+
       - name: Install v2 CRDs
         run: |
-          kubectl apply -f config/crd-nocel
+          make install-crds-nocel
 
       - name: Download API7EE3 Chart
         run: |

Makefile

@@ -301,6 +301,10 @@ uninstall-gateway-api: ## Uninstall Gateway API CRDs from the K8s cluster specif
 install: manifests kustomize install-gateway-api ## Install CRDs into the K8s cluster specified in ~/.kube/config.
 	$(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f -
 
+.PHONY: install-crds-nocel
+install-crds-nocel:
+	kubectl apply -f config/crd-nocel
+
 .PHONY: uninstall
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
 	$(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -

internal/manager/controllers.go

@@ -98,49 +98,58 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
 		return nil, err
 	}
 	return []Controller{
-		&controller.GatewayClassReconciler{
-			Client:  mgr.GetClient(),
-			Scheme:  mgr.GetScheme(),
-			Log:     ctrl.LoggerFrom(ctx).WithName("controllers").WithName("GatewayClass"),
-			Updater: updater,
-		},
-		&controller.GatewayReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("Gateway"),
-			Provider: pro,
-			Updater:  updater,
-		},
-		&controller.HTTPRouteReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("HTTPRoute"),
-			Provider: pro,
-			Updater:  updater,
-			Readier:  readier,
-		},
-		&controller.IngressReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("Ingress"),
-			Provider: pro,
-			Updater:  updater,
-			Readier:  readier,
-		},
-		&controller.ConsumerReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("Consumer"),
-			Provider: pro,
-			Updater:  updater,
-			Readier:  readier,
-		},
-		&controller.IngressClassReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("IngressClass"),
-			Provider: pro,
-		},
+		/*
+			&controller.GatewayClassReconciler{
+				Client:  mgr.GetClient(),
+				Scheme:  mgr.GetScheme(),
+				Log:     ctrl.LoggerFrom(ctx).WithName("controllers").WithName("GatewayClass"),
+				Updater: updater,
+			},
+		*/
+		/*
+			&controller.GatewayReconciler{
+				Client:   mgr.GetClient(),
+				Scheme:   mgr.GetScheme(),
+				Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("Gateway"),
+				Provider: pro,
+				Updater:  updater,
+			},
+		*/
+		/*
+			&controller.HTTPRouteReconciler{
+				Client:   mgr.GetClient(),
+				Scheme:   mgr.GetScheme(),
+				Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("HTTPRoute"),
+				Provider: pro,
+				Updater:  updater,
+				Readier:  readier,
+			},
+		*/
+		/*
+				&controller.IngressReconciler{
+					Client:   mgr.GetClient(),
+					Scheme:   mgr.GetScheme(),
+					Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("Ingress"),
+					Provider: pro,
+					Updater:  updater,
+					Readier:  readier,
+				},
+
+			&controller.ConsumerReconciler{
+				Client:   mgr.GetClient(),
+				Scheme:   mgr.GetScheme(),
+				Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("Consumer"),
+				Provider: pro,
+				Updater:  updater,
+				Readier:  readier,
+			},
+			&controller.IngressClassReconciler{
+				Client:   mgr.GetClient(),
+				Scheme:   mgr.GetScheme(),
+				Log:      ctrl.LoggerFrom(ctx).WithName("controllers").WithName("IngressClass"),
+				Provider: pro,
+			},
+		*/
 		&controller.ApisixGlobalRuleReconciler{
 			Client:   mgr.GetClient(),
 			Scheme:   mgr.GetScheme(),