kube_deploy_tools 3.0.5 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f4077fc4d8fce7c7d5e9ea6f664f7be3f19b1c9e41ef8a1fa909685f195550d
-  data.tar.gz: 33e8aeebd5a2235e23111c36dcef8b228c0754b45b9a1af03cd2054437649ccc
+  metadata.gz: 647bca1b43df72e42a02b1177678afd9f05c1c14f923a924ae62a573080928fa
+  data.tar.gz: 98d5c912c3890ad176b2b57035ff63b677cf44728bce05b34b7e9853ba8a21fb
 SHA512:
-  metadata.gz: aeca489af252fafbc3e493197765b3bbbd8db09ff21ef0372d07d87f53317f00bd3d55e3efdc27fec2d0f7ad9555ead6a5adbff73486cdea45ad3e45efb294c1
-  data.tar.gz: c5be546497348d309048bcefd55f0d255c50f2fd2a21405f091a9042089984d6e118b59024a4f60c47af7c3a3aa401c900482c250c31244af35a827062dc342e
+  metadata.gz: d5d4d909e52925fcda3b36878f8ab9540efe2675814214e5ec8e5b5c0536fc2be629122b704c3a9bd009d8d612853f3ee22c9f37e91c51cdd77d713da8341dcb
+  data.tar.gz: a63cda5c818c5e0930745adcd67747c8d46ab4635ebd9adbbb1b84306fb24067bdc4a5633c34f06b3f91099008593c46fb4c709fac7ed6901e6d50875d603650

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/kube_deploy_tools.svg)](https://badge.fury.io/rb/kube_deploy_tools)
+
 # kube_deploy_tools (kdt)
 
 `kube_deploy_tools` (kdt) is a tool to simplify kubernetes manifest generation
@@ -28,6 +30,7 @@ a complete production lifecycle, they are also designed to be used
 individually.
 
 [Helm]: https://helm.sh
+[ERB]: https://ruby-doc.org/stdlib-2.7.1/libdoc/erb/rdoc/ERB.html
 
 # Getting Started
 
@@ -103,7 +106,7 @@ To explore further,
 * Run `kdt deploy -f build/kubernetes/prod_default --context my-kube-context` to send your generated
   manifests to a Kubernetes API server.
 
-[complete description]: XXX
+[complete description]: schemas/v2.schema.json
 
 # FAQ
 
@@ -118,19 +121,6 @@ For breaking changes, new features, and new fixes, see
 
 # Contribute
 
-```bash
-# Install ruby w/ Homebrew
-brew install ruby
-
-# Or install ruby w/ rbenv
-brew install rbenv ruby-build
-rbenv install 2.3.0
-rbenv global 2.3.0
-
-# Install gem
-gem install bundler
-```
-
 ```bash
 bundle install --with development
 
@@ -140,3 +130,11 @@ bundle exec rake test
 # Exec a binary in bin/
 bundle exec kdt generate
 ```
+
+We accept [pull requests]. They will be reviewed by a member of the LiveRamp development team as soon as possible.
+Once the PR is merged, GitHub will auto-draft the release. Be sure to
+add the same version as a tag (vX.Y.Z) and then publish it.
+[GitHub Workflow] will then publish the gems.
+
+[GitHub Workflow]: https://github.com/LiveRamp/kube_deploy_tools/blob/master/.github/workflows/release.yml
+[pull requests]: https://github.com/LiveRamp/kube_deploy_tools/pulls

data/lib/kube_deploy_tools/artifact_registry/driver_gcs.rb

@@ -29,12 +29,21 @@ module KubeDeployTools
       local_artifact_path
     end
 
+    def get_registry_build_path(project:)
+      # NOTE: If the naming format changes, it represents a breaking change
+      # where all past clients will not be able to list/download new builds
+      # and new clients will not be able to list/download old builds. Change
+      # with caution.
+      #
+      "#{@bucket}/project/#{project}/build"
+    end
+
     def get_registry_artifact_path(name:, flavor:, project:, build_number:)
       # NOTE(joshk): If the naming format changes, it represents a breaking
       # change where all past clients will not be able to download new builds and
       # new clients will not be able to download old builds. Change with caution.
       #
-      "#{@bucket}/project/#{project}/build/#{build_number}/artifact/#{get_artifact_name(name: name, flavor: flavor)}"
+      "#{get_registry_build_path(project: project)}/#{build_number}/artifact/#{get_artifact_name(name: name, flavor: flavor)}"
     end
 
     def get_artifact_name(name:, flavor:)
@@ -84,6 +93,18 @@ module KubeDeployTools
       output_path
     end
 
+    def get_latest_build_number(project)
+      out = Shellrunner.check_call('gsutil', 'ls', get_registry_build_path(project: project))
+
+      # pick out the build numbers from the list
+      build_regex = /([0-9]+)\/$/
+      build_entries = out.scan(build_regex)
+
+      build_entries.
+      map { |x| x[0].to_s.to_i }.
+      max.to_s
+    end
+
     def upload(local_dir:, name:, flavor:, project:, build_number:)
       # Pack up contents of each flavor_dir to a correctly named artifact.
       flavor_dir = File.join(local_dir, "#{name}_#{flavor}")

data/lib/kube_deploy_tools/deploy/options.rb

@@ -2,6 +2,9 @@ require 'optparse'
 
 require 'kube_deploy_tools/object'
 
+# As of kubernetes 1.23 valid dry-run options are: none, client, server.
+VALID_DRY_RUN_VALUES = %w[none client server].freeze
+
 module KubeDeployTools
   class Deploy::Optparser
     class Options
@@ -21,7 +24,7 @@ module KubeDeployTools
       def initialize
         self.project = File.basename(`git config remote.origin.url`.chomp, '.git')
         self.flavor = 'default'
-        self.dry_run = true
+        self.dry_run = 'client'
         self.glob_files = []
       end
 
@@ -54,8 +57,19 @@ module KubeDeployTools
           self.build_number = p
         end
 
-        parser.on('--dry-run DRY_RUN', TrueClass, "If true, will only dry-run apply Kubernetes manifests without sending them to the apiserver. Default is dry-run mode: #{dry_run}.") do |p|
-          self.dry_run = p
+        # As of kubernetes 1.23 valid dry-run options are: none, client, server.
+        # Legacy values map accordingly: true => client, false => none
+        parser.on('--dry-run DRY_RUN', "Will only dry-run apply Kubernetes manifests without sending them to the apiserver. Default is dry-run mode: #{dry_run}. Must be '#{VALID_DRY_RUN_VALUES}'") do |p|
+          legacy_mapping = { 'true' => 'client', 'false' => 'none' }
+
+          if legacy_mapping.include?(p) then
+            self.dry_run = legacy_mapping[p]
+            Logger.warn("#{p} is no longer a supported dry-run value. Setting to value '#{self.dry_run}'.")
+          elsif VALID_DRY_RUN_VALUES.include?(p)
+            self.dry_run = p
+          else
+            raise ArgumentError, "#{p} is not a valid dry-run value. Expect one of '#{VALID_DRY_RUN_VALUES.join(', ')}'"
+          end
         end
 
         parser.on('--include INCLUDE', "Include glob pattern. Example: --include=**/* will include every file. Default is ''.") do |p|

data/lib/kube_deploy_tools/deploy.rb

@@ -64,10 +64,9 @@ module KubeDeployTools
     end
 
     def do_deploy(dry_run)
-      success = false
       Logger.reset
       Logger.phase_heading('Initializing deploy')
-      Logger.warn('Running in dry-run mode') if dry_run
+      Logger.warn('Running in dry-run mode') if dry_run != 'none'
 
       if !@namespace.nil? && @namespace != 'default'
         Logger.warn("Deploying to non-default Namespace: #{@namespace}")
@@ -98,7 +97,7 @@ module KubeDeployTools
       success
     end
 
-    def run(dry_run: true)
+    def run(dry_run: 'client')
       do_deploy(dry_run)
     end
 
@@ -161,7 +160,7 @@ module KubeDeployTools
       raise FatalDeploymentError, "Template '#{filepath}' cannot be parsed"
     end
 
-    def kubectl_apply(resources, dry_run: true)
+    def kubectl_apply(resources, dry_run: 'client')
       resources.each do |resource|
         @max_retries.times do |try|
           args = ['apply', '-f', resource.filepath, "--dry-run=#{dry_run}"]

data/lib/kube_deploy_tools/deploy_config_file/util.rb

@@ -1,3 +1,4 @@
+require 'tempfile'
 
 module KubeDeployTools
   module DeployConfigFileUtil

data/lib/kube_deploy_tools/deploy_config_file.rb

@@ -248,6 +248,10 @@ module KubeDeployTools
       # the 'other' hash wins.
       @image_registries = other.image_registries.merge(@image_registries)
 
+      @artifact_registries = other.artifact_registries.merge(@artifact_registries)
+
+      @artifact_registry = other.artifact_registry if @artifact_registry.empty?
+
       # Same behavior as above for #default_flags.
       @default_flags = other.default_flags.merge(@default_flags)
 

data/lib/kube_deploy_tools/version.rb

@@ -1,3 +1,3 @@
 module KubeDeployTools
-  VERSION = '3.0.5'
+  VERSION = '3.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kube_deploy_tools
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.9
 platform: ruby
 authors:
 - Fabien Goncalves
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Kubernetes Deploy Tools