add deploymentRepositoryRef and scaffoldsRepositoryRef to DeploymentS…

…ettings
pluralsh · Jan 31, 2025 · c174b61 · c174b61
1 parent 70da5fb
commit c174b61
Show file tree

Hide file tree

Showing 7 changed files with 130 additions and 0 deletions.
diff --git a/charts/controller/crds/deployments.plural.sh_deploymentsettings.yaml b/charts/controller/crds/deployments.plural.sh_deploymentsettings.yaml
@@ -465,6 +465,19 @@ spec:
                     format: int64
                     type: integer
                 type: object
+              deploymentRepositoryRef:
+                description: pointer to the deployment GIT repository to use
+                properties:
+                  name:
+                    description: Name is a resource name.
+                    type: string
+                  namespace:
+                    description: Namespace is a resource namespace.
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
               logging:
                 description: Settings for connections to log aggregation datastores
                 properties:
@@ -627,6 +640,19 @@ spec:
                 required:
                 - host
                 type: object
+              scaffoldsRepositoryRef:
+                description: pointer to the Scaffolds GIT repository to use
+                properties:
+                  name:
+                    description: Name is a resource name.
+                    type: string
+                  namespace:
+                    description: Namespace is a resource namespace.
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
               stacks:
                 description: Stacks global configuration for stack execution
                 properties:

diff --git a/go/controller/api/v1alpha1/deploymentsettings_types.go b/go/controller/api/v1alpha1/deploymentsettings_types.go
@@ -108,6 +108,14 @@ type DeploymentSettingsSpec struct {
 	//
 	// +kubebuilder:validation:Optional
 	Cost *CostSettings `json:"cost,omitempty"`
+
+	// pointer to the deployment GIT repository to use
+	// +kubebuilder:validation:Optional
+	DeploymentRepositoryRef *NamespacedName `json:"deploymentRepositoryRef,omitempty"`
+
+	// pointer to the Scaffolds GIT repository to use
+	// +kubebuilder:validation:Optional
+	ScaffoldsRepositoryRef *NamespacedName `json:"scaffoldsRepositoryRef,omitempty"`
 }
 
 type LoggingSettings struct {

diff --git a/go/controller/api/v1alpha1/zz_generated.deepcopy.go b/go/controller/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/go/controller/config/crd/bases/deployments.plural.sh_deploymentsettings.yaml b/go/controller/config/crd/bases/deployments.plural.sh_deploymentsettings.yaml
@@ -465,6 +465,19 @@ spec:
                     format: int64
                     type: integer
                 type: object
+              deploymentRepositoryRef:
+                description: pointer to the deployment GIT repository to use
+                properties:
+                  name:
+                    description: Name is a resource name.
+                    type: string
+                  namespace:
+                    description: Namespace is a resource namespace.
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
               logging:
                 description: Settings for connections to log aggregation datastores
                 properties:
@@ -627,6 +640,19 @@ spec:
                 required:
                 - host
                 type: object
+              scaffoldsRepositoryRef:
+                description: pointer to the Scaffolds GIT repository to use
+                properties:
+                  name:
+                    description: Name is a resource name.
+                    type: string
+                  namespace:
+                    description: Namespace is a resource namespace.
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
               stacks:
                 description: Stacks global configuration for stack execution
                 properties:

diff --git a/go/controller/internal/controller/common.go b/go/controller/internal/controller/common.go
@@ -313,3 +313,11 @@ func defaultErrMessage(err error, defaultMessage string) string {
 func notFoundOrReadyErrorMessage(err error) string {
 	return fmt.Sprintf("Referenced object is either not found or not ready, found error: %s", err.Error())
 }
+
+func getGitRepoID(ctx context.Context, c runtimeclient.Client, namespacedName v1alpha1.NamespacedName) (*string, error) {
+	gitRepo := &v1alpha1.GitRepository{}
+	if err := c.Get(ctx, types.NamespacedName{Name: namespacedName.Name, Namespace: namespacedName.Namespace}, gitRepo); err != nil {
+		return nil, err
+	}
+	return gitRepo.Status.ID, nil
+}
diff --git a/go/controller/internal/controller/deploymentsettings_controller.go b/go/controller/internal/controller/deploymentsettings_controller.go
@@ -211,6 +211,9 @@ func (r *DeploymentSettingsReconciler) genDeploymentSettingsAttr(ctx context.Con
 		if settings.Spec.Stacks.ConnectionRef != nil {
 			connection := &v1alpha1.ScmConnection{}
 			if err := r.Get(ctx, types.NamespacedName{Name: settings.Spec.Stacks.ConnectionRef.Name, Namespace: settings.Spec.Stacks.ConnectionRef.Namespace}, connection); err != nil {
+				if errors.IsNotFound(err) {
+					return nil, operrors.ErrReferenceNotFound
+				}
 				return nil, err
 			}
 			connectionID = connection.Status.ID
@@ -229,6 +232,29 @@ func (r *DeploymentSettingsReconciler) genDeploymentSettingsAttr(ctx context.Con
 		attr.CreateBindings = policyBindings(settings.Spec.Bindings.Create)
 		attr.GitBindings = policyBindings(settings.Spec.Bindings.Git)
 	}
+
+	if settings.Spec.DeploymentRepositoryRef != nil {
+		id, err := getGitRepoID(ctx, r.Client, *settings.Spec.DeploymentRepositoryRef)
+		if err != nil {
+			if errors.IsNotFound(err) {
+				return nil, operrors.ErrReferenceNotFound
+			}
+			return nil, err
+		}
+		attr.DeployerRepositoryID = id
+	}
+
+	if settings.Spec.ScaffoldsRepositoryRef != nil {
+		id, err := getGitRepoID(ctx, r.Client, *settings.Spec.ScaffoldsRepositoryRef)
+		if err != nil {
+			if errors.IsNotFound(err) {
+				return nil, operrors.ErrReferenceNotFound
+			}
+			return nil, err
+		}
+		attr.ArtifactRepositoryID = id
+	}
+
 	return attr, nil
 }
 

diff --git a/plural/helm/console/crds/deployments.plural.sh_deploymentsettings.yaml b/plural/helm/console/crds/deployments.plural.sh_deploymentsettings.yaml
@@ -465,6 +465,19 @@ spec:
                     format: int64
                     type: integer
                 type: object
+              deploymentRepositoryRef:
+                description: pointer to the deployment GIT repository to use
+                properties:
+                  name:
+                    description: Name is a resource name.
+                    type: string
+                  namespace:
+                    description: Namespace is a resource namespace.
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
               logging:
                 description: Settings for connections to log aggregation datastores
                 properties:
@@ -627,6 +640,19 @@ spec:
                 required:
                 - host
                 type: object
+              scaffoldsRepositoryRef:
+                description: pointer to the Scaffolds GIT repository to use
+                properties:
+                  name:
+                    description: Name is a resource name.
+                    type: string
+                  namespace:
+                    description: Namespace is a resource namespace.
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
               stacks:
                 description: Stacks global configuration for stack execution
                 properties: