backfill dependency status on create + update

michaeljguarino · michaeljguarino · commit c1cb213021f3 · 2025-11-28T15:05:05.000-05:00
diff --git a/charts/console-rapid/charts/controller-0.0.157.tgz b/charts/console-rapid/charts/controller-0.0.157.tgz
diff --git a/charts/console-rapid/charts/controller-0.0.158.tgz b/charts/console-rapid/charts/controller-0.0.158.tgz
diff --git a/charts/console-rapid/charts/kas-0.3.0.tgz b/charts/console-rapid/charts/kas-0.3.0.tgz
diff --git a/charts/console/charts/controller-0.0.157.tgz b/charts/console/charts/controller-0.0.157.tgz
diff --git a/charts/console/charts/controller-0.0.158.tgz b/charts/console/charts/controller-0.0.158.tgz
diff --git a/charts/console/charts/kas-0.3.0.tgz b/charts/console/charts/kas-0.3.0.tgz
diff --git a/charts/controller/crds/deployments.plural.sh_globalservices.yaml b/charts/controller/crds/deployments.plural.sh_globalservices.yaml
@@ -595,7 +595,9 @@ spec:
                           Used for inflating Helm charts.
                         type: boolean
                       path:
-                        description: Path to the kustomization file to use.
+                        description: The folder your base kustomization file lives
+                          within relative to your main git folder path.  It can be
+                          a subdirectory.
                         type: string
                     required:
                     - path
diff --git a/charts/controller/crds/deployments.plural.sh_managednamespaces.yaml b/charts/controller/crds/deployments.plural.sh_managednamespaces.yaml
@@ -471,7 +471,9 @@ spec:
                           Used for inflating Helm charts.
                         type: boolean
                       path:
-                        description: Path to the kustomization file to use.
+                        description: The folder your base kustomization file lives
+                          within relative to your main git folder path.  It can be
+                          a subdirectory.
                         type: string
                     required:
                     - path
diff --git a/charts/controller/crds/deployments.plural.sh_previewenvironmenttemplates.yaml b/charts/controller/crds/deployments.plural.sh_previewenvironmenttemplates.yaml
@@ -525,7 +525,9 @@ spec:
                           Used for inflating Helm charts.
                         type: boolean
                       path:
-                        description: Path to the kustomization file to use.
+                        description: The folder your base kustomization file lives
+                          within relative to your main git folder path.  It can be
+                          a subdirectory.
                         type: string
                     required:
                     - path
diff --git a/charts/controller/crds/deployments.plural.sh_servicedeployments.yaml b/charts/controller/crds/deployments.plural.sh_servicedeployments.yaml
@@ -493,7 +493,8 @@ spec:
                       Used for inflating Helm charts.
                     type: boolean
                   path:
-                    description: Path to the kustomization file to use.
+                    description: The folder your base kustomization file lives within
+                      relative to your main git folder path.  It can be a subdirectory.
                     type: string
                 required:
                 - path
diff --git a/go/controller/api/v1alpha1/servicedeployment_types.go b/go/controller/api/v1alpha1/servicedeployment_types.go
@@ -21,7 +21,7 @@ type ComponentState string
 const ComponentStateRunning ComponentState = "RUNNING"
 
 type ServiceKustomize struct {
-	// Path to the kustomization file to use.
+	// The folder your base kustomization file lives within relative to your main git folder path.  It can be a subdirectory.
 	Path string `json:"path"`
 
 	// EnableHelm indicates whether to enable Helm for this Kustomize deployment.
diff --git a/go/controller/config/crd/bases/deployments.plural.sh_globalservices.yaml b/go/controller/config/crd/bases/deployments.plural.sh_globalservices.yaml
@@ -595,7 +595,9 @@ spec:
                           Used for inflating Helm charts.
                         type: boolean
                       path:
-                        description: Path to the kustomization file to use.
+                        description: The folder your base kustomization file lives
+                          within relative to your main git folder path.  It can be
+                          a subdirectory.
                         type: string
                     required:
                     - path
diff --git a/go/controller/config/crd/bases/deployments.plural.sh_managednamespaces.yaml b/go/controller/config/crd/bases/deployments.plural.sh_managednamespaces.yaml
@@ -471,7 +471,9 @@ spec:
                           Used for inflating Helm charts.
                         type: boolean
                       path:
-                        description: Path to the kustomization file to use.
+                        description: The folder your base kustomization file lives
+                          within relative to your main git folder path.  It can be
+                          a subdirectory.
                         type: string
                     required:
                     - path
diff --git a/go/controller/config/crd/bases/deployments.plural.sh_previewenvironmenttemplates.yaml b/go/controller/config/crd/bases/deployments.plural.sh_previewenvironmenttemplates.yaml
@@ -525,7 +525,9 @@ spec:
                           Used for inflating Helm charts.
                         type: boolean
                       path:
-                        description: Path to the kustomization file to use.
+                        description: The folder your base kustomization file lives
+                          within relative to your main git folder path.  It can be
+                          a subdirectory.
                         type: string
                     required:
                     - path
diff --git a/go/controller/config/crd/bases/deployments.plural.sh_servicedeployments.yaml b/go/controller/config/crd/bases/deployments.plural.sh_servicedeployments.yaml
@@ -493,7 +493,8 @@ spec:
                       Used for inflating Helm charts.
                     type: boolean
                   path:
-                    description: Path to the kustomization file to use.
+                    description: The folder your base kustomization file lives within
+                      relative to your main git folder path.  It can be a subdirectory.
                     type: string
                 required:
                 - path
diff --git a/go/controller/docs/api.md b/go/controller/docs/api.md
@@ -4225,7 +4225,7 @@ _Appears in:_
 
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
-| `path` _string_ | Path to the kustomization file to use. |  |  |
+| `path` _string_ | The folder your base kustomization file lives within relative to your main git folder path.  It can be a subdirectory. |  |  |
 | `enableHelm` _boolean_ | EnableHelm indicates whether to enable Helm for this Kustomize deployment.<br />Used for inflating Helm charts. |  | Optional: \{\} <br /> |
 
 
diff --git a/lib/console/deployments/services.ex b/lib/console/deployments/services.ex
@@ -281,8 +281,12 @@ defmodule Console.Deployments.Services do
       end
     end)
     |> add_operation(:base, fn _ ->
-      %Service{cluster_id: cluster_id}
-      |> Service.changeset(add_version(attrs, "0.0.1"))
+      svc = %Service{cluster_id: cluster_id}
+
+      Service.changeset(svc,
+        add_version(attrs, "0.0.1")
+        |> backfill_dependencies(svc)
+      )
       |> Console.Repo.insert()
     end)
     |> add_operation(:check_repo, fn
@@ -297,6 +301,33 @@ defmodule Console.Deployments.Services do
     |> notify(:create, user)
   end
 
+  defp backfill_dependencies(%{dependencies: [_ | _] = deps} = attrs, %Service{cluster_id: cluster_id} = svc) do
+    existing = deps(svc) |> Enum.map(& &1.name)
+
+    Enum.filter(deps, & !Enum.member?(existing, &1[:name]))
+    |> Enum.map(& &1[:name])
+    |> Enum.filter(& &1)
+    |> case do
+      [_ | _] = names ->
+        svcs  = Service.for_cluster(cluster_id)
+                |> Service.for_names(names)
+                |> Repo.all()
+                |> Map.new(& {&1.name, &1})
+
+        Map.put(attrs, :dependencies, Enum.map(deps, fn %{name: name} = dep ->
+          case Map.get(svcs, name) do
+            %Service{} = svc -> Map.merge(dep, %{status: svc.status})
+            nil -> dep
+          end
+        end))
+      _ -> attrs
+    end
+  end
+  defp backfill_dependencies(attrs, _), do: attrs
+
+  defp deps(%Service{dependencies: [_ | _] = deps}), do: deps
+  defp deps(_), do: []
+
   @doc """
   modifies rbac settings for this service
   """
@@ -602,6 +633,7 @@ defmodule Console.Deployments.Services do
       |> Service.changeset(
         stabilize_deps(attrs, svc)
         |> stabilize_contexts(svc)
+        |> backfill_dependencies(svc)
       )
       |> Service.update_changeset()
       |> Console.Repo.update()
diff --git a/lib/console/schema/service.ex b/lib/console/schema/service.ex
@@ -307,6 +307,10 @@ defmodule Console.Schema.Service do
     )
   end
 
+  def for_names(query \\ __MODULE__, names) do
+    from(s in query, where: s.name in ^names)
+  end
+
   def for_owner(query \\ __MODULE__, owner_id) do
     from(s in query, where: s.owner_id == ^owner_id)
   end
diff --git a/plural/helm/console/charts/controller-0.0.157.tgz b/plural/helm/console/charts/controller-0.0.157.tgz
diff --git a/plural/helm/console/crds/deployments.plural.sh_globalservices.yaml b/plural/helm/console/crds/deployments.plural.sh_globalservices.yaml
@@ -595,7 +595,9 @@ spec:
                           Used for inflating Helm charts.
                         type: boolean
                       path:
-                        description: Path to the kustomization file to use.
+                        description: The folder your base kustomization file lives
+                          within relative to your main git folder path.  It can be
+                          a subdirectory.
                         type: string
                     required:
                     - path
diff --git a/plural/helm/console/crds/deployments.plural.sh_managednamespaces.yaml b/plural/helm/console/crds/deployments.plural.sh_managednamespaces.yaml
@@ -471,7 +471,9 @@ spec:
                           Used for inflating Helm charts.
                         type: boolean
                       path:
-                        description: Path to the kustomization file to use.
+                        description: The folder your base kustomization file lives
+                          within relative to your main git folder path.  It can be
+                          a subdirectory.
                         type: string
                     required:
                     - path
diff --git a/plural/helm/console/crds/deployments.plural.sh_previewenvironmenttemplates.yaml b/plural/helm/console/crds/deployments.plural.sh_previewenvironmenttemplates.yaml
@@ -525,7 +525,9 @@ spec:
                           Used for inflating Helm charts.
                         type: boolean
                       path:
-                        description: Path to the kustomization file to use.
+                        description: The folder your base kustomization file lives
+                          within relative to your main git folder path.  It can be
+                          a subdirectory.
                         type: string
                     required:
                     - path
diff --git a/plural/helm/console/crds/deployments.plural.sh_servicedeployments.yaml b/plural/helm/console/crds/deployments.plural.sh_servicedeployments.yaml
@@ -493,7 +493,8 @@ spec:
                       Used for inflating Helm charts.
                     type: boolean
                   path:
-                    description: Path to the kustomization file to use.
+                    description: The folder your base kustomization file lives within
+                      relative to your main git folder path.  It can be a subdirectory.
                     type: string
                 required:
                 - path
