Better option

OctopusDeploy · Aug 29, 2023 · 59cea76 · 59cea76
1 parent 9e8e165
commit 59cea76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/source/Calamari/Kubernetes/Commands/Executors/GatherAndApplyRawYamlExecutor.cs b/source/Calamari/Kubernetes/Commands/Executors/GatherAndApplyRawYamlExecutor.cs
@@ -49,20 +49,14 @@ public async Task<bool> Execute(RunningDeployment deployment, Func<ResourceIdent
                 var globs = variables.GetPaths(SpecialVariables.CustomResourceYamlFileName);
                 if (globs.IsNullOrEmpty())
                     return true;
-                var defaultNamespace = variables.Get(SpecialVariables.Namespace, "default");
-                // When the namespace on a target was set and then cleared, it's going to be "" instead of null
-                if (string.IsNullOrEmpty(defaultNamespace))
-                {
-                    defaultNamespace = "default";
-                }
                 var directories = GroupFilesIntoDirectories(deployment, globs, variables);
                 var resources = new HashSet<Resource>();
                 foreach (var directory in directories)
                 {
                     var res = ApplyBatchAndReturnResources(directory).ToList();
                     if (appliedResourcesCallback != null)
                     {
-                        await appliedResourcesCallback(res.Select(r => r.ToResourceIdentifier(defaultNamespace)).ToArray());
+                        await appliedResourcesCallback(res.Select(r => r.ToResourceIdentifier()).ToArray());
                     }
                     resources.UnionWith(res);
                 }
@@ -239,9 +233,9 @@ private class Resource
             public string Kind { get; set; }
             public ResourceMetadata Metadata { get; set; }
 
-            public ResourceIdentifier ToResourceIdentifier(string defaultNamespace = null)
+            public ResourceIdentifier ToResourceIdentifier()
             {
-                return new ResourceIdentifier(Kind, Metadata.Name, Metadata.Namespace ?? defaultNamespace);
+                return new ResourceIdentifier(Kind, Metadata.Name, Metadata.Namespace);
             }
         }
 

diff --git a/source/Calamari/Kubernetes/ResourceStatus/ResourceStatusCheckTask.cs b/source/Calamari/Kubernetes/ResourceStatus/ResourceStatusCheckTask.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Amazon.CloudFormation;
 using Calamari.Kubernetes.Integration;
 using Calamari.Kubernetes.ResourceStatus.Resources;
 using Octopus.CoreUtilities.Extensions;
@@ -74,7 +73,7 @@ public class ResourceStatusCheckTask
 
                     // Filter out cluster-wide resources
                     definedResources = definedResources
-                        .Where(resource => !nonNamespacedDefinedResources.Contains(new ResourceIdentifier(resource.Kind, resource.Name, string.Empty)))
+                        .Where(resource => !string.IsNullOrEmpty(resource.Namespace) && !nonNamespacedDefinedResources.Contains(new ResourceIdentifier(resource.Kind, resource.Name, string.Empty)))
                         .ToArray();
                     
                     var resourceStatuses = definedResourceStatuses