Add DeploymentTemplate controller for GitOps support

cmd/rad/cmd/bicep.go

@@ -22,8 +22,8 @@ import (
 
 var bicepCmd = &cobra.Command{
 	Use:   "bicep",
-	Short: "Manage bicep compiler",
-	Long:  `Manage bicep compiler used by Radius`,
+	Short: "Handle bicep-specific tasks for Radius",
+	Long:  `Handle bicep-specific tasks for Radius`,
 }
 
 func init() {

cmd/rad/cmd/root.go

@@ -35,6 +35,7 @@ import (
 	app_list "github.com/radius-project/radius/pkg/cli/cmd/app/list"
 	app_show "github.com/radius-project/radius/pkg/cli/cmd/app/show"
 	app_status "github.com/radius-project/radius/pkg/cli/cmd/app/status"
+	bicep_generate_kubernetes_manifest "github.com/radius-project/radius/pkg/cli/cmd/bicep/generatekubernetesmanifest"
 	bicep_publish "github.com/radius-project/radius/pkg/cli/cmd/bicep/publish"
 	bicep_publishextension "github.com/radius-project/radius/pkg/cli/cmd/bicep/publishextension"
 	credential "github.com/radius-project/radius/pkg/cli/cmd/credential"
@@ -349,6 +350,9 @@ func initSubCommands() {
 	bicepPublishCmd, _ := bicep_publish.NewCommand(framework)
 	bicepCmd.AddCommand(bicepPublishCmd)
 
+	bicepGenerateKubernetesManifestCmd, _ := bicep_generate_kubernetes_manifest.NewCommand(framework)
+	bicepCmd.AddCommand(bicepGenerateKubernetesManifestCmd)
+
 	bicepPublishExtensionCmd, _ := bicep_publishextension.NewCommand(framework)
 	bicepCmd.AddCommand(bicepPublishExtensionCmd)
 

deploy/Chart/crds/radius/radapp.io_deploymentresources.yaml

@@ -0,0 +1,93 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.0
+  name: deploymentresources.radapp.io
+spec:
+  group: radapp.io
+  names:
+    categories:
+    - all
+    - radius
+    kind: DeploymentResource
+    listKind: DeploymentResourceList
+    plural: deploymentresources
+    singular: deploymentresource
+  scope: Namespaced
+  versions:
+  - name: v1alpha3
+    schema:
+      openAPIV3Schema:
+        description: DeploymentResource is the Schema for the DeploymentResources
+          API
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: DeploymentResourceSpec defines the desired state of DeploymentResource
+            properties:
+              id:
+                description: Id is the resource Id.
+                type: string
+              providerConfig:
+                description: ProviderConfig specifies the scope for resources
+                type: string
+            type: object
+          status:
+            description: DeploymentResourceStatus defines the observed state of DeploymentResource
+            properties:
+              id:
+                description: Id is the resource Id.
+                type: string
+              message:
+                description: Message is a human-readable description of the status
+                  of the Deployment Resource.
+                type: string
+              observedGeneration:
+                description: ObservedGeneration is the most recent generation observed
+                  for this DeploymentResource.
+                format: int64
+                type: integer
+              operation:
+                description: Operation tracks the status of an in-progress provisioning
+                  operation.
+                properties:
+                  operationKind:
+                    description: OperationKind describes the type of operation being
+                      performed.
+                    type: string
+                  resumeToken:
+                    description: ResumeToken is a token that can be used to resume
+                      an in-progress provisioning operation.
+                    type: string
+                type: object
+              phrase:
+                description: Phrase indicates the current status of the Deployment
+                  Resource.
+                type: string
+              providerConfig:
+                description: ProviderConfig specifies the scope for resources
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

deploy/Chart/crds/radius/radapp.io_deploymenttemplates.yaml

@@ -0,0 +1,105 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.0
+  name: deploymenttemplates.radapp.io
+spec:
+  group: radapp.io
+  names:
+    categories:
+    - all
+    - radius
+    kind: DeploymentTemplate
+    listKind: DeploymentTemplateList
+    plural: deploymenttemplates
+    singular: deploymenttemplate
+  scope: Namespaced
+  versions:
+  - name: v1alpha3
+    schema:
+      openAPIV3Schema:
+        description: DeploymentTemplate is the Schema for the deploymenttemplates
+          API
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: DeploymentTemplateSpec defines the desired state of DeploymentTemplate
+            properties:
+              parameters:
+                additionalProperties:
+                  type: string
+                description: Parameters is the ARM JSON parameters for the template.
+                type: object
+              providerConfig:
+                description: ProviderConfig specifies the scope for resources
+                type: string
+              template:
+                description: Template is the ARM JSON manifest that defines the resources
+                  to deploy.
+                type: string
+            type: object
+          status:
+            description: DeploymentTemplateStatus defines the observed state of DeploymentTemplate
+            properties:
+              message:
+                description: Message is a human-readable description of the status
+                  of the Deployment Template.
+                type: string
+              observedGeneration:
+                description: ObservedGeneration is the most recent generation observed
+                  for this DeploymentTemplate.
+                format: int64
+                type: integer
+              operation:
+                description: Operation tracks the status of an in-progress provisioning
+                  operation.
+                properties:
+                  operationKind:
+                    description: OperationKind describes the type of operation being
+                      performed.
+                    type: string
+                  resumeToken:
+                    description: ResumeToken is a token that can be used to resume
+                      an in-progress provisioning operation.
+                    type: string
+                type: object
+              outputResources:
+                description: OutputResources is a list of the resourceIDs that were
+                  created by the template on the last deployment.
+                items:
+                  type: string
+                type: array
+              phrase:
+                description: Phrase indicates the current status of the Deployment
+                  Template.
+                type: string
+              resource:
+                description: Resource is the resource id of the deployment.
+                type: string
+              statusHash:
+                description: StatusHash is a hash of the DeploymentTemplate's status.
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

deploy/Chart/templates/controller/rbac.yaml

@@ -38,6 +38,10 @@ rules:
   resources:
   - recipes
   - recipes/status
+  - deploymenttemplates
+  - deploymenttemplates/status
+  - deploymentresources
+  - deploymentresources/status
   verbs:
   - create
   - delete

pkg/cli/bicep/deployment_parameters.go

@@ -19,32 +19,22 @@ package bicep
 import (
 	"encoding/json"
 	"fmt"
-	"io/fs"
-	"os"
 	"strings"
 
 	"github.com/radius-project/radius/pkg/cli/clients"
+	"github.com/radius-project/radius/pkg/cli/filesystem"
 )
 
 // ParameterParser is used to parse the parameters as part of the `rad deploy` command. See the docs for `rad deploy` for examples
 // of what we need to support here.
 type ParameterParser struct {
-	FileSystem fs.FS
-}
-
-type OSFileSystem struct {
+	FileSystem filesystem.FileSystem
 }
 
 type ParameterFile struct {
 	Parameters clients.DeploymentParameters `json:"parameters"`
 }
 
-// The Open function opens the file specified by the name parameter and returns a file object and an error if the file
-// cannot be opened.
-func (OSFileSystem) Open(name string) (fs.File, error) {
-	return os.Open(name)
-}
-
 // ParseFileContents takes in a map of strings and any type and returns a DeploymentParameters object and
 // an error if one occurs during the process.
 func (pp ParameterParser) ParseFileContents(input map[string]any) (clients.DeploymentParameters, error) {
@@ -90,7 +80,7 @@ func (pp ParameterParser) parseSingle(input string, output clients.DeploymentPar
 	if strings.HasPrefix(input, "@") {
 		// input is a file that declares multiple parameters
 		filePath := strings.TrimPrefix(input, "@")
-		b, err := fs.ReadFile(pp.FileSystem, filePath)
+		b, err := pp.FileSystem.ReadFile(filePath)
 		if err != nil {
 			return err
 		}
@@ -111,7 +101,7 @@ func (pp ParameterParser) parseSingle(input string, output clients.DeploymentPar
 	if strings.HasPrefix(parameterValue, "@") {
 		// input is a file that declares a single parameter
 		filePath := strings.TrimPrefix(parameterValue, "@")
-		b, err := fs.ReadFile(pp.FileSystem, filePath)
+		b, err := pp.FileSystem.ReadFile(filePath)
 		if err != nil {
 			return err
 		}

pkg/cli/bicep/deployment_parameters_test.go

@@ -24,6 +24,7 @@ import (
 	"testing/fstest"
 
 	"github.com/radius-project/radius/pkg/cli/clients"
+	"github.com/radius-project/radius/pkg/cli/filesystem"
 	"github.com/stretchr/testify/require"
 )
 
@@ -36,7 +37,7 @@ func Test_Parameters_Invalid(t *testing.T) {
 	}
 
 	parser := ParameterParser{
-		FileSystem: fstest.MapFS{},
+		FileSystem: filesystem.NewMemMapFileSystem(),
 	}
 
 	for _, input := range inputs {
@@ -56,13 +57,16 @@ func Test_ParseParameters_Overwrite(t *testing.T) {
 		"key3=value3",
 	}
 
+	// Initialize the ParameterParser with the in-memory filesystem
 	parser := ParameterParser{
-		FileSystem: fstest.MapFS{
-			"many.json": {
-				Data: []byte(`{ "parameters": { "key1": { "value": { "someValue": true } }, "key2": { "value": "overridden-value" } } }`),
-			},
-			"single.json": {
-				Data: []byte(`{ "someValue": "another-value" }`),
+		FileSystem: filesystem.MemMapFileSystem{
+			InternalFileSystem: fstest.MapFS{
+				"many.json": {
+					Data: []byte(`{ "parameters": { "key1": { "value": { "someValue": true } }, "key2": { "value": "overridden-value" } } }`),
+				},
+				"single.json": {
+					Data: []byte(`{ "someValue": "another-value" }`),
+				},
 			},
 		},
 	}
@@ -91,7 +95,7 @@ func Test_ParseParameters_Overwrite(t *testing.T) {
 
 func Test_ParseParameters_File(t *testing.T) {
 	parser := ParameterParser{
-		FileSystem: fstest.MapFS{},
+		FileSystem: filesystem.NewMemMapFileSystem(),
 	}
 
 	input, err := os.ReadFile(filepath.Join("testdata", "test-parameters.json"))