Merge pull request #45 from datum-cloud/fix-e2e-tests

fix: Remove e2e test for domains, fix gateway e2e test

Author: joshlreese

PROJECT

@@ -97,4 +97,13 @@ resources:
   kind: HTTPProxy
   path: go.datum.net/network-services-operator/api/v1alpha
   version: v1alpha
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: datumapis.com
+  group: networking
+  kind: Domain
+  path: go.datum.net/network-services-operator/api/v1alpha
+  version: v1alpha
 version: "3"

config/rbac/role.yaml

@@ -38,32 +38,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - datumapis.com
-  resources:
-  - domains
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - datumapis.com
-  resources:
-  - domains/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - datumapis.com
-  resources:
-  - domains/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - discovery.k8s.io
   resources:
@@ -154,6 +128,7 @@ rules:
 - apiGroups:
   - networking.datumapis.com
   resources:
+  - domains
   - httpproxies
   - networkbindings
   - networkcontexts
@@ -172,6 +147,7 @@ rules:
 - apiGroups:
   - networking.datumapis.com
   resources:
+  - domains/finalizers
   - httpproxies/finalizers
   - networkbindings/finalizers
   - networkcontexts/finalizers
@@ -184,6 +160,7 @@ rules:
 - apiGroups:
   - networking.datumapis.com
   resources:
+  - domains/status
   - httpproxies/status
   - networkbindings/status
   - networkcontexts/status

internal/controller/domain_controller.go

@@ -41,9 +41,9 @@ type DomainReconciler struct {
 	lookupTXT func(ctx context.Context, name string) ([]string, error)
 }
 
-// +kubebuilder:rbac:groups=datumapis.com,resources=domains,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=datumapis.com,resources=domains/status,verbs=get;update;patch
-// +kubebuilder:rbac:groups=datumapis.com,resources=domains/finalizers,verbs=update
+// +kubebuilder:rbac:groups=networking.datumapis.com,resources=domains,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=networking.datumapis.com,resources=domains/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=networking.datumapis.com,resources=domains/finalizers,verbs=update
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.

test/e2e/domain/chainsaw-test.yaml

@@ -138,6 +138,15 @@ spec:
                   name: custom-proxy-config
                   namespace: envoy-gateway-system
 
+        - description: Create namespace for hostname tracking
+          apply:
+            cluster: nso-infra
+            resource:
+              apiVersion: v1
+              kind: Namespace
+              metadata:
+                name: datum-downstream-gateway-hostnames
+
     - name: Create pod and service to serve as a backend for the HTTPRoute
       try:
         - create:
@@ -233,6 +242,27 @@ spec:
                 selector:
                   purpose: backend-pod
 
+    - name: Provision Domain
+      try:
+        - create:
+            cluster: nso-standard
+            resource:
+              apiVersion: networking.datumapis.com/v1alpha
+              kind: Domain
+              metadata:
+                name: test-domain
+              spec:
+                domainName: e2e.env.datum.net
+
+        - description: |
+            Under normal operation, the Domain controller will perform verification
+            via HTTP or DNS, and update the Domain's status.
+          script:
+            content: |
+                kubectl -n $NAMESPACE patch domain test-domain \
+                  --subresource=status --type=merge \
+                  -p '{"status":{"conditions":[{"type": "Verified", "status": "True", "reason": "Test", "message": "test", "lastTransitionTime": "2025-02-24T23:59:09Z"}]}}'
+
     - name: Provision Gateway
       try:
         # Get the target namespace UID