Revert "UDT - Remove Legacy Routing (#8205)" (#8270)

radius-project · Jan 22, 2025 · a665232 · a665232
1 parent bb7f774
commit a665232
Show file tree

Hide file tree

Showing 35 changed files with 328 additions and 512 deletions.
diff --git a/.github/workflows/functional-test-cloud.yaml b/.github/workflows/functional-test-cloud.yaml
@@ -657,49 +657,6 @@ jobs:
             --set global.azureWorkloadIdentity.enabled=true \
             --set global.aws.irsa.enabled=true 
           
-          echo "*** Verify manifests are registered ***"
-          rm -f registermanifest_logs.txt
-          # Find the pod with container "ucp"
-          POD_NAME=$(
-            kubectl get pods -n radius-system \
-              -o jsonpath='{range .items[*]}{.metadata.name}{" "}{.spec.containers[*].name}{"\n"}{end}' \
-            | grep "ucp" \
-            | head -n1 \
-            | cut -d" " -f1
-          )
-          echo "Found ucp pod: $POD_NAME"
-
-          if [ -z "$POD_NAME" ]; then
-            echo "No pod with container 'ucp' found in namespace radius-system."
-            exit 1
-          fi
-
-          # Poll logs for up to  iterations, 30 seconds each (upto 3 minutes total)
-          for i in {1..6}; do
-            kubectl logs "$POD_NAME" -n radius-system | tee registermanifest_logs.txt > /dev/null
-
-            # Exit on error
-            if grep -qi "error" registermanifest_logs.txt; then
-              echo "Error found in ucp logs."
-              exit 1
-            fi
-
-            # Check for success
-            if grep -q "Successfully registered manifests" registermanifest_logs.txt; then
-              echo "Successfully registered manifests - message found."
-              break
-            fi
-
-            echo "Logs not ready, waiting 30 seconds..."
-            sleep 30
-          done
-
-          # Final check to ensure success message was found
-          if ! grep -q "Successfully registered manifests" registermanifest_logs.txt; then
-            echo "Manifests not registered after 3 minutes."
-            exit 1
-          fi
-
           echo "*** Create workspace, group and environment for test ***"
           rad workspace create kubernetes
           rad group create kind-radius

diff --git a/.github/workflows/functional-test-noncloud.yaml b/.github/workflows/functional-test-noncloud.yaml
@@ -290,49 +290,6 @@ jobs:
           echo "*** Installing Radius to Kubernetes ***"
           eval $RAD_COMMAND
 
-          echo "*** Verify manifests are registered ***"
-          rm -f registermanifest_logs.txt
-          # Find the pod with container "ucp"
-          POD_NAME=$(
-            kubectl get pods -n radius-system \
-              -o jsonpath='{range .items[*]}{.metadata.name}{" "}{.spec.containers[*].name}{"\n"}{end}' \
-            | grep "ucp" \
-            | head -n1 \
-            | cut -d" " -f1
-          )
-          echo "Found ucp pod: $POD_NAME"
-
-          if [ -z "$POD_NAME" ]; then
-            echo "No pod with container 'ucp' found in namespace radius-system."
-            exit 1
-          fi
-
-          # Poll logs for up to  iterations, 30 seconds each (upto 3 minutes total)
-          for i in {1..6}; do
-            kubectl logs "$POD_NAME" -n radius-system | tee registermanifest_logs.txt > /dev/null
-            
-            # Exit on error
-            if grep -qi "error" registermanifest_logs.txt; then
-              echo "Error found in ucp logs."
-              exit 1
-            fi
-
-            # Check for success
-            if grep -q "Successfully registered manifests" registermanifest_logs.txt; then
-              echo "Successfully registered manifests - message found."
-              break
-            fi
-
-            echo "Logs not ready, waiting 30 seconds..."
-            sleep 30
-          done
-
-          # Final check to ensure success message was found
-          if ! grep -q "Successfully registered manifests" registermanifest_logs.txt; then
-            echo "Manifests not registered after 3 minutes."
-            exit 1
-          fi
-
           echo "*** Create workspace, group and environment for test ***"
           rad workspace create kubernetes
           rad group create kind-radius

diff --git a/build/docker.mk b/build/docker.mk
@@ -17,7 +17,6 @@
 DOCKER_REGISTRY?=$(shell whoami)
 DOCKER_TAG_VERSION?=latest
 IMAGE_SRC?=https://github.com/radius-project/radius
-MANIFEST_DIR?=deploy/manifest/built-in-providers/self-hosted
 
 ##@ Docker Images
 
@@ -107,17 +106,6 @@ APPS_MAP := ucpd:./deploy/images/ucpd \
 	testrp:./test/testrp \
 	magpiego:./test/magpiego
 
-# copy_manifests copies the manifests to the output directory
-.PHONY: copy-manifests
-copy-manifests:
-	@if [ ! -d "$(MANIFEST_DIR)" ] || [ -z "$$(ls -A $(MANIFEST_DIR))" ]; then \
-		echo "MANIFEST_DIR '$(MANIFEST_DIR)' does not exist or is empty"; \
-		exit 1; \
-	fi
-	@mkdir -p $(OUT_DIR)/manifest/built-in-providers/
-	@echo "Copying manifests from $(MANIFEST_DIR) to $(OUT_DIR)/manifest/built-in-providers/"
-	@cp -v $(MANIFEST_DIR)/* $(OUT_DIR)/manifest/built-in-providers/
-
 # Function to extract the name and the directory of the Dockerfile from the app string
 define parseApp
 $(eval NAME := $(shell echo $(1) | cut -d: -f1))
@@ -144,15 +132,15 @@ DOCKER_PUSH_MULTI_TARGETS := $(foreach APP,$(APPS_MAP),$(eval $(call parseApp,$(
 
 # targets to build development images
 .PHONY: docker-build
-docker-build: copy-manifests $(DOCKER_BUILD_TARGETS) ## Builds all Docker images.
+docker-build: $(DOCKER_BUILD_TARGETS) ## Builds all Docker images.
 
 .PHONY: docker-push
 docker-push: $(DOCKER_PUSH_TARGETS) ## Pushes all Docker images (without building).
 
 # targets to build and push multi arch images. If you run this target in your machine,
 # ensure you have qemu and buildx installed by running make configure-buildx.
 .PHONY: docker-multi-arch-build
-docker-multi-arch-build: copy-manifests $(DOCKER_BUILD_MULTI_TARGETS) ## Builds all docker images for multiple architectures.
+docker-multi-arch-build: $(DOCKER_BUILD_MULTI_TARGETS) ## Builds all docker images for multiple architectures.
 
 .PHONY: docker-multi-arch-push
-docker-multi-arch-push: copy-manifests $(DOCKER_PUSH_MULTI_TARGETS) ## Pushes all docker images for multiple architectures after building.
+docker-multi-arch-push: $(DOCKER_PUSH_MULTI_TARGETS) ## Pushes all docker images for multiple architectures after building.
diff --git a/cmd/ucpd/ucp-dev.yaml b/cmd/ucpd/ucp-dev.yaml
@@ -53,7 +53,7 @@ initialization:
           Microsoft.Resources: "http://localhost:5017"
         kind: "UCPNative"
   # This is the directory location which contains manifests to be registered.
-  manifestDirectory: "manifest/built-in-providers/"      
+  manifestDirectory: ""      
 
 identity:
   authMethod: default

diff --git a/deploy/Chart/templates/ucp/configmaps.yaml b/deploy/Chart/templates/ucp/configmaps.yaml
@@ -50,7 +50,7 @@ data:
         - id: "/planes/aws/aws"
           properties:
             kind: "AWS"
-      manifestDirectory: "/manifest/built-in-providers"      
+      manifestDirectory: ""      
 
     identity:
       authMethod: UCPCredential

diff --git a/deploy/images/ucpd/Dockerfile b/deploy/images/ucpd/Dockerfile
@@ -10,9 +10,6 @@ WORKDIR /
 # Copy the application binary for the specified architecture
 COPY ./linux_${TARGETARCH:-amd64}/release/ucpd /
 
-# Copy the manifest files for the built-in providers
-COPY ./manifest/built-in-providers/ /manifest/built-in-providers/
-
 # Set the user to non-root (65532:65532 is the default non-root user in distroless)
 USER 65532:65532
 

diff --git a/...t-in-providers/dev/applications_core.yaml → ...built-in-providers/applications_core.yaml b/...t-in-providers/dev/applications_core.yaml → ...built-in-providers/applications_core.yaml
@@ -1,40 +1,37 @@
 name: Applications.Core
-location:
-  global:
-    "http://localhost:8080"
 types:
   containers:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: []
   applications:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: []
   environments:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: []
   gateways:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: []
   secretStores:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: []
   extenders:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: ["SupportsRecipes"]
   volumes:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: []
diff --git a/...t-in-providers/dev/applications_dapr.yaml → ...built-in-providers/applications_dapr.yaml b/...t-in-providers/dev/applications_dapr.yaml → ...built-in-providers/applications_dapr.yaml
@@ -1,25 +1,22 @@
 name: Applications.Dapr
-location:
-  global:
-    "http://localhost:8080"
 types:
   configurationStores:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: ["SupportsRecipes"]
   pubSubBrokers:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: ["SupportsRecipes"]
   secretStores:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: ["SupportsRecipes"]
   stateStores:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: ["SupportsRecipes"]
diff --git a/...roviders/dev/applications_datastores.yaml → ...in-providers/applications_datastores.yaml b/...roviders/dev/applications_datastores.yaml → ...in-providers/applications_datastores.yaml
@@ -1,20 +1,17 @@
 name: Applications.Datastores
-location:
-  global:
-    "http://localhost:8080"
 types:
   mongoDatabases:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: ["SupportsRecipes"]
   sqlDatabases:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: ["SupportsRecipes"]
   redisCaches:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: ["SupportsRecipes"]
diff --git a/...providers/dev/applications_messaging.yaml → ...-in-providers/applications_messaging.yaml b/...providers/dev/applications_messaging.yaml → ...-in-providers/applications_messaging.yaml
@@ -1,10 +1,7 @@
 name: Applications.Messaging
-location:
-  global:
-    "http://localhost:8080"
 types:
   rabbitMQQueues:
     apiVersions:
-      "2023-10-01-preview":
+      "2025-01-01-preview":
         schema: {}
     capabilities: ["SupportsRecipes"]
diff --git a/deploy/manifest/built-in-providers/dev/microsoft_resources.yaml b/deploy/manifest/built-in-providers/dev/microsoft_resources.yaml
diff --git a/deploy/manifest/built-in-providers/microsoft_resources.yaml b/deploy/manifest/built-in-providers/microsoft_resources.yaml
@@ -0,0 +1,8 @@
+name: Microsoft.Resources
+types:
+  deployments:
+    apiVersions:
+      "2025-01-01-preview":
+        schema: {}
+    capabilities: []
+
diff --git a/deploy/manifest/built-in-providers/self-hosted/applications_core.yaml b/deploy/manifest/built-in-providers/self-hosted/applications_core.yaml
diff --git a/deploy/manifest/built-in-providers/self-hosted/applications_dapr.yaml b/deploy/manifest/built-in-providers/self-hosted/applications_dapr.yaml
diff --git a/deploy/manifest/built-in-providers/self-hosted/applications_datastores.yaml b/deploy/manifest/built-in-providers/self-hosted/applications_datastores.yaml