vidar 1.10.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 837a79fe42926308748fbfeb816fdfd9b65bc4f13baefb499cbca936ac668f8f
-  data.tar.gz: 9bd7ba8776bb814eef39e909464ddf91027cb2c4f9b4b9caea04a247e17aa6cd
+  metadata.gz: 0e21235eabc301414c37258a2b10f6ab8a52a515309b245ae4e5bca95613e8a0
+  data.tar.gz: ee14da413b9ccda05ef4dba37d2acc2ad086551a6c49e69169926fd9f5064ab7
 SHA512:
-  metadata.gz: 153146b937497d0d0f2496f18aa4da97d4437e244a1e68018740366539f20f6543921de10012aa8fb3774251a174be235b10b9e22e83a224cb2ca01b2942449e
-  data.tar.gz: 670e654205cd66abb504d3bcf6cd928a6f3fc7c7ff90f2493b865b075097c47ac5fc94f3af5fd7c4361f9cb8ebad83701dd5f5cff7c6a8d2c5ca70e130dd3802
+  metadata.gz: 052e082e128802d77780433250917a3453480cad166f9286543fb263e4786b23c11bc2e6c3d8680ffbed55857c9e23c57cb844b60af04df0345f5cf45a8f9a3f
+  data.tar.gz: 8e4539f0e20827d8ec3363c6b49bea3b2c2530c261e4605ddc38b91df048fef27c3bf0962bf4100babad1f2e669336d95e3f7da4142e1dda34cf5b4672bceb25

data/.bundler-version

@@ -1 +1 @@
-2.5.6
+2.5.16

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "08:00"
+      timezone: "UTC"
+    commit-message:
+      prefix: "[dependabot]"
+    labels:
+      - "automerge"
+      - "dependencies"

data/.github/workflows/auto-approve.yml

@@ -1,8 +1,9 @@
 name: Auto approve dependency upgrades and hot-fix PRs
 on:
   pull_request_target:
-    types: [labeled, unlabeled, edited, ready_for_review, review_requested, auto_merge_enabled]
-
+    types:
+      - labeled
+      - ready_for_review
 jobs:
   auto-approve:
     runs-on: ubuntu-latest

data/.github/workflows/auto-merge.yml

@@ -6,9 +6,6 @@ on:
   check_suite:
     types:
       - completed
-  label:
-    types:
-      - created
   status: {}
 jobs:
   automerge:

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [3.1, 3.2]
+        ruby-version: [3.2, 3.3]
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.11.0 - 2024-06-04
+
+Add set_image command.
+
+## 1.10.0 - 2024-02-29
+
+Drop ruby 3.0 support and add 3.3 support.
+
 ## 1.9.2 - 2023-12-11
 
 Improves and simplifies how docker layers are cached and used. Adds `build_and_cache_base` command.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.10.0)
+    vidar (1.12.0)
       colorize
       faraday
       thor (~> 1.0)
@@ -9,83 +9,79 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     awesome_print (1.9.2)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
     colorize (1.1.0)
     crack (1.0.0)
       bigdecimal
       rexml
     diff-lcs (1.5.1)
-    faraday (2.9.0)
+    faraday (2.10.0)
       faraday-net_http (>= 2.0, < 3.2)
+      logger
     faraday-net_http (3.1.0)
       net-http
     hashdiff (1.1.0)
-    json (2.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    method_source (1.0.0)
+    logger (1.6.0)
+    method_source (1.1.0)
     net-http (0.4.1)
       uri
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    prism (0.24.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.4)
-    racc (1.7.3)
+    public_suffix (6.0.0)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.2)
+      strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.61.0)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.0)
-      parser (>= 3.3.0.4)
-      prism (>= 0.24.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.26.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.0.3)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
+    strscan (3.1.0)
     thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.0)
-    webmock (3.23.0)
+    webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -106,4 +102,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.5.6
+   2.5.16

data/lib/vidar/cli.rb

@@ -89,9 +89,11 @@ module Vidar
     method_option :destination, required: false, default: "deployments,cronjobs"
     method_option :container, required: false, default: "*"
     method_option :all, required: false, type: :boolean, default: true
+    method_option :max_tries, required: false, default: "30"
     def deploy
       revision = options[:revision] || Config.get!(:revision)
       kubectl_context = options[:kubectl_context] || Config.get!(:kubectl_context)
+      max_tries = options[:max_tries].to_i
       Log.info "Current kubectl context: #{kubectl_context}"
 
       Log.info "Looking for deploy hook..."
@@ -104,14 +106,7 @@ module Vidar
         if template_name.to_s.empty?
           Log.info "No deploy hook found"
         else
-          Log.info "Executing deploy hook #{template_name.strip!}..."
-          Run.kubectl "delete job deploy-hook --ignore-not-found=true"
-          Run.kubectl "set image cronjobs/deploy-hook-template deploy-hook-template=#{Config.get!(:image)}:#{revision} --all"
-          Run.kubectl "create job deploy-hook --from=#{template_name}"
-
-          deploy_status = Vidar::DeployStatus.new(namespace: Config.get!(:namespace), filter: "deploy-hook")
-          deploy_status.wait_until_up
-          deploy_status.wait_until_completed
+          deploy_status = run_deploy_hook(template_name:, revision:, max_tries:)
 
           unless deploy_status.success?
             Run.kubectl "describe job deploy-hook"
@@ -135,6 +130,24 @@ module Vidar
       Run.kubectl "set image #{destination} #{container}=#{Config.get!(:image)}:#{revision} #{all ? '--all' : ''}"
     end
 
+    desc "set_image", "Set image for k8s deployment"
+    method_option :revision, required: false
+    method_option :kubectl_context, required: false
+    method_option :destination, required: false, default: "deployments,cronjobs"
+    method_option :container, required: false, default: "*"
+    method_option :all, required: false, type: :boolean, default: true
+    def set_image
+      revision = options[:revision] || Config.get!(:revision)
+      kubectl_context = options[:kubectl_context] || Config.get!(:kubectl_context)
+      Log.info "Current kubectl context: #{kubectl_context}"
+
+      destination = options[:destination]
+      container = options[:container]
+      all = options[:all]
+      Log.info "Set kubectl image for #{all ? 'all ' : ''}#{destination} container=#{container}..."
+      Run.kubectl "set image #{destination} #{container}=#{Config.get!(:image)}:#{revision} #{all ? '--all' : ''}"
+    end
+
     desc "release", "Build and publish docker images"
     def release
       Log.info "Build and release #{Config.get!(:image)}:#{Config.get!(:revision)}"
@@ -145,14 +158,17 @@ module Vidar
     end
 
     desc "monitor_deploy_status", "Check is deployment has finished and sends post-deploy notification"
+    method_option :max_tries, required: false, default: "30"
     def monitor_deploy_status
+      max_tries = options[:max_tries].to_i
+
       Log.info "Current kubectl context: #{Config.get!(:kubectl_context)}"
-      Log.info "Checking if all containers in #{Config.get!(:namespace)} namespace(s) are ready..."
+      Log.info "Checking if all containers in #{Config.get!(:namespace)} namespace(s) are ready (#{max_tries} tries)..."
 
       slack_notification = SlackNotification.get
       honeycomb_notification = HoneycombNotification.get
 
-      deploy_status = Vidar::DeployStatus.new(namespace: Config.get!(:namespace))
+      deploy_status = Vidar::DeployStatus.new(namespace: Config.get!(:namespace), max_tries:)
 
       deploy_status.wait_until_completed
 
@@ -239,5 +255,19 @@ module Vidar
 
       slack_notification.deliver(message: options[:message]) if slack_notification.configured?
     end
+
+    private
+
+    def run_deploy_hook(template_name:, revision:, max_tries:)
+      Log.info "Executing deploy hook #{template_name.strip!} (#{max_tries} tries)..."
+      Run.kubectl "delete job deploy-hook --ignore-not-found=true"
+      Run.kubectl "set image cronjobs/deploy-hook-template deploy-hook-template=#{Config.get!(:image)}:#{revision} --all"
+      Run.kubectl "create job deploy-hook --from=#{template_name}"
+
+      deploy_status = Vidar::DeployStatus.new(namespace: Config.get!(:namespace), filter: "deploy-hook", max_tries:)
+      deploy_status.wait_until_up
+      deploy_status.wait_until_completed
+      deploy_status
+    end
   end
 end

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '1.10.0'.freeze
+  VERSION = '1.12.0'.freeze
 end

data/vidar.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata['changelog_uri'] = 'https://github.com/RenoFi/vidar/blob/master/CHANGELOG.md'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.2.0')
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -68,8 +68,8 @@ files:
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/ISSUE_TEMPLATE/story.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/dependabot.yml"
 - ".github/workflows/auto-approve.yml"
-- ".github/workflows/auto-merge-dependencies.yml"
 - ".github/workflows/auto-merge.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
@@ -112,14 +112,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: K8s deployment tools based on thor

data/.github/workflows/auto-merge-dependencies.yml

@@ -1,24 +0,0 @@
-name: automerge-dependencies
-on:
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  label:
-    types:
-      - created
-  status: {}
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - name: automerge-dependencies
-        uses: pascalgn/automerge-action@v0.16.2
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_METHOD: squash
-          MERGE_DELETE_BRANCH: true
-          MERGE_LABELS: "dependencies,!automerge blocked"
-          MERGE_REMOVE_LABELS: ""