Filter non-namespaced resources

OctopusDeploy · Aug 29, 2023 · 62627c8 · 62627c8
1 parent 59cea76
commit 62627c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/source/Calamari/Kubernetes/ResourceStatus/KubectlGet.cs b/source/Calamari/Kubernetes/ResourceStatus/KubectlGet.cs
@@ -16,15 +16,15 @@ public string Resource(string kind, string name, string @namespace, IKubectl kub
         {
             return kubectl.ExecuteCommandAndReturnOutput(new[]
             {
-                "get", kind, name, "-o json", $"-n {@namespace}"
+                "get", kind, name, "-o json", string.IsNullOrEmpty(@namespace) ? "" : $"-n {@namespace}"
             }).Output.InfoLogs.Join(string.Empty);
         }
 
         public string AllResources(string kind, string @namespace, IKubectl kubectl)
         {
             return kubectl.ExecuteCommandAndReturnOutput(new[]
             {
-                "get", kind, "-o json", $"-n {@namespace}"
+                "get", kind, "-o json", string.IsNullOrEmpty(@namespace) ? "" : $"-n {@namespace}"
             }).Output.InfoLogs.Join(string.Empty);
         }
     }

diff --git a/source/Calamari/Kubernetes/ResourceStatus/ResourceStatusCheckTask.cs b/source/Calamari/Kubernetes/ResourceStatus/ResourceStatusCheckTask.cs
@@ -78,9 +78,10 @@ public class ResourceStatusCheckTask
                     
                     var resourceStatuses = definedResourceStatuses
                                            .SelectMany(IterateResourceTree)
+                                           .Where(resource => resource.Namespaced)
                                            .ToDictionary(resource => resource.Uid, resource => resource);
 
-                    var deploymentStatus = GetDeploymentStatus(definedResourceStatuses, definedResources);
+                    var deploymentStatus = GetDeploymentStatus(definedResourceStatuses.Where(resource => resource.Namespaced).ToArray(), definedResources);
 
                     reporter.ReportUpdatedResources(result.ResourceStatuses, resourceStatuses, ++checkCount);