Fix namespacing

dudo · Nov 12, 2019 · 23bd523 · 23bd523
1 parent dc7bfb1
commit 23bd523
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifest.rb b/manifest.rb
@@ -87,7 +87,7 @@ def create_supporting_manifests(svc) # rubocop:disable Metrics/AbcSize
 
     @templates << Templates::Ingress.new(service: svc, namespace: namespace, hosts: base_ingress_hosts(svc)) if include_ingress?(svc)
     @templates << Templates::Service.new(service: svc, namespace: namespace) if include_service?(svc)
-    @templates << Templates::Kustomization.new(service: svc, namespace: namespace, templates: @templates, svc: true)
+    @templates << Templates::Kustomization.new(service: svc, namespace: namespace, templates: @templates, primary: false)
   end
 
   def commit_overlay_to_github # rubocop:disable Metrics/AbcSize

diff --git a/templates/kustomization.rb b/templates/kustomization.rb
@@ -25,13 +25,13 @@ def manifest
 
     def resources
       [].tap do |array|
-        array.push("#{Templates::Namespace::NAME}.yaml") if options[:templates].any?(&:namespace?)
+        array.push("#{Templates::Namespace::NAME}.yaml") if options[:primary] && options[:templates].any?(&:namespace?)
       end
     end
 
     def patches
       [].tap do |array|
-        array.push("#{Templates::Service::NAME}.yaml") if options[:svc]
+        array.push("#{Templates::Service::NAME}.yaml") unless options[:primary]
       end
     end