kustomizer 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 044c4518958413a91c1a8bc0a112220145ecdde5ab3bb043e64afe8bcffdcf40
-  data.tar.gz: a081394dfcd4f5e14055a93cb1561200ce2db26c7580e918a8ca31d30920d807
+  metadata.gz: 9d4194dfeac67756db2018524a29771521143059e7c6b01783e50ef454f5c710
+  data.tar.gz: cf815fc480191d91626c273f925eac81fff5487b859d3b261dddaab6b9b2c594
 SHA512:
-  metadata.gz: 9bb48c3fd80b552860a9f4c3f7e88076678abd0b1bf5c23d94c18fb9b2013dd0e410cbb97201c9717bccda3086f34af3f7f094a7deead4d23b27e20ddf3b97ad
-  data.tar.gz: 3556e7605c02544f12790ab150db65ba2a937216bffa61c93909dd0ca7e0186bc83bf4ef63e7a8d3faf628ea8ce14b228baf6976cb932380cb00fe3394a3f7af
+  metadata.gz: 0edca955dacb8cc04b4d3643008aa4fa9f7a884ff8aa9c3534d15bf8f38ba9a879cc0dceddca03d9c95a743971da98f9342c730f17b5882eaf63e37f6814aecc
+  data.tar.gz: 645696be6aa341742d34fd8f7099fe68d3ea55f0f5548c42641a3452cfb4dc41325fd5b3b59681e1631af4d98dcd8e399091d88e6b71dc53cebc3c58a2d63350

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    kustomizer (0.1.7)
-      accessory (~> 0.1.9)
+    kustomizer (0.1.12)
+      accessory (~> 0.1.11)
       base32-multi
 
 GEM
   remote: https://rubygems.org/
   specs:
-    accessory (0.1.10)
+    accessory (0.1.11)
     base32-multi (0.1.1)
     diff-lcs (1.4.4)
     rake (13.0.3)
@@ -21,18 +21,15 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+    rspec-support (3.10.2)
 
 PLATFORMS
-  x86_64-darwin-20
+  ruby
 
 DEPENDENCIES
   kustomizer!
   rake (~> 13.0)
   rspec (~> 3.0)
-
-BUNDLED WITH
-   2.2.7

data/README.md

@@ -19,8 +19,8 @@ Enough Library to solve our own problems :wink:)
 Status of `kustomization.yaml` feature support:
 
 * [x] `bases`
-* [ ] `commonAnnotations`
-* [ ] `commonLabels`
+* [x] `commonAnnotations`
+* [x] `commonLabels`
 * [ ] `configMapGenerator` and `secretGenerator`
 * [ ] `crds`
 * [x] `generators` (see [Extending Kustomize](https://kubectl.docs.kubernetes.io/guides/extending_kustomize/))

data/kustomizer.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "A pure-ruby implementation of the Kubernetes 'kustomize' command."
   spec.homepage      = "https://github.com/tsutsu/kustomize"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "accessory", "~> 0.1.9"
+  spec.add_runtime_dependency "accessory", "~> 0.1.11"
   spec.add_runtime_dependency "base32-multi"
 end

data/lib/kustomize.rb

@@ -20,7 +20,7 @@ module Kustomize
         raise ArgumentError, "must be a kustomization document or a path to one, instead got: #{rel_path_or_rc.inspect}"
       end
 
-    Kustomize::Emitter::FinalizerEmitter.new(base_emitter)
+    Kustomize::Emitter::FinalizerEmitter.new(base_emitter, session: session)
   end
 
   def self.load_doc(rc, session: Kustomize::Session.new, source_path:)

data/lib/kustomize/emitter/document_emitter/kustomization_document_emitter.rb

@@ -6,6 +6,8 @@ require 'kustomize/emitter/generator_plugins_emitter'
 require 'kustomize/transform/json_6902_patch_transform'
 require 'kustomize/transform/image_transform'
 require 'kustomize/transform/namespace_transform'
+require 'kustomize/transform/common_annotations_transform'
+require 'kustomize/transform/common_labels_transform'
 require 'kustomize/transform/fingerprint_suffix_transform'
 require 'kustomize/transform/ref_fixup_transform'
 require 'kustomize/transform/purge_internal_annotations_transform'
@@ -101,12 +103,30 @@ class Kustomize::Emitter::DocumentEmitter::KustomizationDocumentEmitter < Kustom
     end
   end
 
+  def common_annotations_transforms
+    if new_annots = @doc['commonAnnotations']
+      [Kustomize::Transform::CommonAnnotationsTransform.create(new_annots)]
+    else
+      []
+    end
+  end
+
+  def common_labels_transforms
+    if new_labels = @doc['commonLabels']
+      [Kustomize::Transform::CommonLabelsTransform.create(new_labels)]
+    else
+      []
+    end
+  end
+
   def transforms
     return @transforms if @transforms
 
     @transforms = [
       self.namespace_transforms,
       self.image_transforms,
+      self.common_annotations_transforms,
+      self.common_labels_transforms,
       self.json_6902_patch_transforms,
       self.transformer_plugin_transforms
     ].flatten

data/lib/kustomize/emitter/finalizer_emitter.rb

@@ -2,11 +2,14 @@ require 'kustomize/emitter'
 
 require 'kustomize/transform/fingerprint_suffix_transform'
 require 'kustomize/transform/ref_fixup_transform'
+require 'kustomize/transform/filter_for_session_specified_component_transform'
+require 'kustomize/transform/drop_filtered_documents_transform'
 require 'kustomize/transform/purge_internal_annotations_transform'
 
 class Kustomize::Emitter::FinalizerEmitter < Kustomize::Emitter
-  def initialize(input_emitter)
+  def initialize(input_emitter, session:)
     @input_emitter = input_emitter
+    @session = session
   end
 
   def input_emitters
@@ -16,11 +19,20 @@ class Kustomize::Emitter::FinalizerEmitter < Kustomize::Emitter
   def transforms
     return @transforms if @transforms
 
+    final_filters =
+      if comp = @session.only_emit_component
+        [Kustomize::Transform::FilterForSessionSpecifiedComponentTransform.create(comp)]
+      else
+        []
+      end
+
     @transforms = [
       Kustomize::Transform::FingerprintSuffixTransform.instance,
       Kustomize::Transform::RefFixupTransform.instance,
+      final_filters,
+      Kustomize::Transform::DropFilteredDocumentsTransform.instance,
       Kustomize::Transform::PurgeInternalAnnotationsTransform.instance
-    ].flatten
+    ].flatten.compact
   end
 
   def emit

data/lib/kustomize/json_6902_patch.rb

@@ -17,6 +17,10 @@ class Kustomize::Json6902Patch::Op
       e = e.gsub('~1', '/')
       if e == ":all"
         Accessory::Access.all
+      elsif e == ":first"
+        Accessory::Access.first
+      elsif e == ":last"
+        Accessory::Access.last
       elsif e.match?(/^\d+$/)
         e.to_i
       else

data/lib/kustomize/json_6902_patch/append_op.rb

@@ -0,0 +1,36 @@
+require 'kustomize/json_6902_patch'
+
+class Kustomize::Json6902Patch::AppendOp < Kustomize::Json6902Patch::Op
+  def self.create(patch_spec)
+    elements =
+      if e = patch_spec['element']
+        [e]
+      elsif es = patch_spec['elements']
+        es
+      else
+        raise ArgumentError, "must specify one of 'element' or 'elements' in: #{patch_spec.inspect}"
+      end
+
+    new(
+      array_path: patch_spec['path'],
+      elements: elements
+    )
+  end
+
+  def initialize(array_path:, elements:)
+    @lens = parse_lens(array_path)
+    @new_elements = elements
+  end
+
+  def apply(rc)
+    @lens.update_in(rc) do |orig_arr|
+      new_arr = orig_arr.dup || []
+
+      @new_elements.each do |elem|
+        new_arr.push(elem)
+      end
+
+      [:set, new_arr]
+    end
+  end
+end

data/lib/kustomize/json_6902_patch/gsub_op.rb

@@ -18,6 +18,8 @@ class Kustomize::Json6902Patch::GsubOp < Kustomize::Json6902Patch::Op
   def apply(rc)
     @lenses.inject(rc) do |doc, lens|
       lens.update_in(doc) do |orig_value|
+        next(:keep) unless orig_value.kind_of?(String)
+
         new_value = orig_value.gsub(@pattern, @replacement)
 
         if new_value != orig_value

data/lib/kustomize/session.rb

@@ -3,12 +3,14 @@ module Kustomize; end
 require 'kustomize/plugin_manager'
 
 class Kustomize::Session
-  def initialize(load_paths: [])
+  def initialize(load_paths: [], only_emit_component: nil)
     @load_paths = load_paths
     @plugin_manager = Kustomize::PluginManager.new(session: self)
+    @only_emit_component = only_emit_component
   end
 
   attr_reader :plugin_manager
+  attr_accessor :only_emit_component
 
   def builtin_load_paths
     [Pathname.new(__FILE__).expand_path.parent / 'builtin_plugins']

data/lib/kustomize/transform/common_annotations_transform.rb

@@ -0,0 +1,36 @@
+require 'accessory'
+
+require 'kustomize/transform'
+
+class Kustomize::Transform::CommonAnnotationsTransform < Kustomize::Transform
+  include Accessory
+
+  def initialize(new_annots)
+    @new_annots = new_annots
+  end
+
+  BASE_LENS = Lens["metadata", "annotations"]
+
+  LENS_PREFIXES = [
+    Lens["spec", "template"],
+    Lens["spec", "jobTemplate", "spec", "template"]
+  ]
+
+  def rewrite(rc_doc)
+    rc_doc = BASE_LENS.update_in(rc_doc) do |annots|
+      [:set, (annots || {}).merge(@new_annots)]
+    end
+
+    LENS_PREFIXES.inject(rc_doc) do |doc, prefix|
+      prefix.update_in(rc_doc) do |node|
+        next(:keep) unless node.kind_of?(Hash)
+
+        new_node = BASE_LENS.update_in(node) do |annots|
+          [:set, (annots || {}).merge(@new_annots)]
+        end
+
+        [:set, new_node]
+      end
+    end
+  end
+end

data/lib/kustomize/transform/common_labels_transform.rb

@@ -0,0 +1,41 @@
+require 'accessory'
+
+require 'kustomize/transform'
+
+class Kustomize::Transform::CommonLabelsTransform < Kustomize::Transform
+  include Accessory
+
+  def initialize(new_labels)
+    @new_labels = new_labels
+  end
+
+  LENSES_FOR_ALL = [
+    Lens["metadata", "labels"]
+  ]
+
+  LENSES_FOR_KIND = {
+    "Service" => [
+      Lens["spec", "selector"]
+    ],
+
+    "Deployment" => [
+      Lens["spec", "selector", "matchLabels"]
+    ],
+  }
+
+  def rewrite(rc_doc)
+    rc_kind = rc_doc['kind']
+    use_lenses = LENSES_FOR_ALL
+
+    if lenses_for_doc_kind = LENSES_FOR_KIND[rc_kind]
+      use_lenses += lenses_for_doc_kind
+    end
+
+    use_lenses.inject(rc_doc) do |doc, lens|
+      lens.update_in(doc) do |annots|
+        [:set, (annots || {}).merge(@new_labels)]
+      end
+    end
+  end
+
+end

data/lib/kustomize/transform/drop_filtered_documents_transform.rb

@@ -0,0 +1,25 @@
+require 'singleton'
+require 'set'
+
+require 'accessory'
+
+require 'kustomize/transform'
+
+class Kustomize::Transform::DropFilteredDocumentsTransform < Kustomize::Transform
+  include Accessory
+  include Singleton
+
+  ANNOTS_LENS = Lens['metadata', 'annotations']
+
+  DROP_ON_ANNOTS = Set[
+    'config.kubernetes.io/local-config',
+    'kustomizer.covalenthq.com/drop'
+  ]
+
+  def rewrite_all(rcs)
+    rcs.filter do |rc|
+      annot_keys = (ANNOTS_LENS.get_in(rc) || {}).keys
+      not(annot_keys.find{ |k| DROP_ON_ANNOTS.member?(k) })
+    end
+  end
+end

data/lib/kustomize/transform/filter_for_session_specified_component_transform.rb

@@ -0,0 +1,29 @@
+require 'accessory'
+
+require 'kustomize/transform'
+
+class Kustomize::Transform::FilterForSessionSpecifiedComponentTransform < Kustomize::Transform
+  include Accessory
+
+  def initialize(component_name)
+    @component_name = component_name
+  end
+
+  ANNOTS_LENS = Lens['metadata', 'annotations']
+
+  COMPONENT_ANNOT_NAME = 'kustomizer.covalenthq.com/component-name'
+  DROP_ANNOT_NAME = 'kustomizer.covalenthq.com/drop'
+
+  def rewrite(rc)
+    ANNOTS_LENS.update_in(rc) do |orig_annots|
+      orig_annots ||= {}
+
+      if orig_annots[COMPONENT_ANNOT_NAME] == @component_name
+        :keep
+      else
+        new_annots = orig_annots.merge({DROP_ANNOT_NAME => 'true'})
+        [:set, new_annots]
+      end
+    end
+  end
+end

data/lib/kustomize/transform/fingerprint_suffix_transform.rb

@@ -35,7 +35,13 @@ class Kustomize::Transform::FingerprintSuffixTransform < Kustomize::Transform
     return rc unless APPLICABLE_KINDS.member?(rc_kind)
 
     FINGERPRINT_LENS.update_in(rc) do |orig_value|
-      next(:keep) if orig_value
+      if orig_value
+        if orig_value == ''
+          next(:pop)
+        else
+          next(:keep)
+        end
+      end
 
       content_part = CONTENT_LENS_BY_KIND[rc_kind].get_in(rc)
       content_ser = content_part.to_json
@@ -47,9 +53,11 @@ class Kustomize::Transform::FingerprintSuffixTransform < Kustomize::Transform
     base_name = NAME_LENS.get_in(rc)
     fingerprint = FINGERPRINT_LENS.get_in(rc)
 
-    NAME_LENS.update_in(rc) do |base_name|
-      suffixed_name = [base_name, fingerprint].join(SUFFIX_JOINER)
-      [:set, suffixed_name]
+    if fingerprint
+      NAME_LENS.update_in(rc) do |base_name|
+        suffixed_name = [base_name, fingerprint].join(SUFFIX_JOINER)
+        [:set, suffixed_name]
+      end
     end
 
     rc

data/lib/kustomize/transform/json_6902_patch_transform.rb

@@ -7,6 +7,7 @@ require 'kustomize/json_6902_patch/add_op'
 require 'kustomize/json_6902_patch/replace_op'
 require 'kustomize/json_6902_patch/remove_op'
 require 'kustomize/json_6902_patch/gsub_op'
+require 'kustomize/json_6902_patch/append_op'
 
 class Kustomize::Transform::Json6902PatchTransform < Kustomize::Transform
   def self.create(kustomization_file, op_spec)

data/lib/kustomize/transform/purge_internal_annotations_transform.rb

@@ -8,23 +8,32 @@ class Kustomize::Transform::PurgeInternalAnnotationsTransform < Kustomize::Trans
   include Accessory
   include Singleton
 
-  ANNOTS_LENS = Lens['metadata', 'annotations']
-
-  INTERNAL_ANNOT_PATTERN = /^kustomizer\.covalenthq\.com\//
-
-  def rewrite(rc)
-    ANNOTS_LENS.update_in(rc) do |orig_annots|
-      next(:keep) unless orig_annots and orig_annots.length.nonzero?
-
-      new_annots =
-        orig_annots.reject{ |k, v| INTERNAL_ANNOT_PATTERN.match?(k) }
-
-      if new_annots.length == orig_annots.length
-        :keep
-      elsif new_annots.empty?
-        :pop
-      else
-        [:set, new_annots]
+  LENSES = [
+    Lens['metadata', 'annotations'],
+    Lens['spec', 'template', 'metadata', 'annotations'],
+    Lens['spec', 'jobTemplate', 'spec', 'template', 'metadata', 'annotations']
+  ]
+
+  INTERNAL_ANNOT_PATTERNS = [
+    /^config\.kubernetes\.io\//,
+    /^kustomizer\.covalenthq\.com\//
+  ]
+
+  def rewrite(rc_doc)
+    LENSES.inject(rc_doc) do |doc, lens|
+      lens.update_in(rc_doc) do |orig_annots|
+        next(:keep) unless orig_annots and orig_annots.length.nonzero?
+
+        new_annots =
+          orig_annots.reject{ |k, v| INTERNAL_ANNOT_PATTERNS.any?{ |pat| pat.match?(k) } }
+
+        if new_annots.length == orig_annots.length
+          :keep
+        elsif new_annots.empty?
+          :pop
+        else
+          [:set, new_annots]
+        end
       end
     end
   end

data/lib/kustomize/version.rb

@@ -1,3 +1,3 @@
 module Kustomize
-  VERSION = "0.1.7"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kustomizer
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 platform: ruby
 authors:
 - Levi Aul
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: accessory
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: base32-multi
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,7 @@ files:
 - lib/kustomize/generator_plugin.rb
 - lib/kustomize/json_6902_patch.rb
 - lib/kustomize/json_6902_patch/add_op.rb
+- lib/kustomize/json_6902_patch/append_op.rb
 - lib/kustomize/json_6902_patch/gsub_op.rb
 - lib/kustomize/json_6902_patch/remove_op.rb
 - lib/kustomize/json_6902_patch/replace_op.rb
@@ -78,6 +79,10 @@ files:
 - lib/kustomize/session.rb
 - lib/kustomize/target_spec.rb
 - lib/kustomize/transform.rb
+- lib/kustomize/transform/common_annotations_transform.rb
+- lib/kustomize/transform/common_labels_transform.rb
+- lib/kustomize/transform/drop_filtered_documents_transform.rb
+- lib/kustomize/transform/filter_for_session_specified_component_transform.rb
 - lib/kustomize/transform/fingerprint_suffix_transform.rb
 - lib/kustomize/transform/image_transform.rb
 - lib/kustomize/transform/json_6902_patch_transform.rb
@@ -101,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="