vidar 1.11.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 986fa6cad5809e6da811c62569da04a2cb84a82ade6185ba1a9c2f4e28650f2c
-  data.tar.gz: 4dc0e96055bf9562fc106b7c75a0cded021eda713d024d7838409b1d60ba3572
+  metadata.gz: 10d86c884b8a88a7211212d537f8fcb2351bb0c32c051900978aa9ad1ed2aa20
+  data.tar.gz: 101da0df09d2d4e04b68cc1f4b9006c7806b14ae693a3f09b2b2aa0d1cc1c69e
 SHA512:
-  metadata.gz: 9b5bf1466a14f5d1c1db96feda71317d64b27e46530cf7b5410b1c0afb81319f35178e781e4ace185b95abbee8ab49bc1d6f505dfe37221ab5facf87c9307b6d
-  data.tar.gz: bb2ba2a926cda73e3315e30345d2f6dcc48f7892435c69b070e761c50105f1daf2cd6a08c6aa11a2d9e05e0a66f18c2adb3b1089972c5a3bcd9b2f3c57b45f07
+  metadata.gz: 5f79b3ff1660292fb00ed3fd85425e4e8c125c0c0cb8be761606de09fb2f5b8b49867a089f7cb5ec5b7c688f5e8af63d9e16ff4c3010c9e397d70e0f668c5b7e
+  data.tar.gz: 5ad12ad3a731169efe9fdb6a69a8b96bd52b9d9360f6a5b997578d928a9c4cce2efa7ef78c8342d41911404ae2acd6b4fe06ccd191a6f481831a390444ab6c84

data/.bundler-version

@@ -1 +1 @@
-2.5.11
+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/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.11.0)
+    vidar (1.12.1)
       colorize
       faraday
       thor (~> 1.0)
@@ -9,8 +9,8 @@ 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.8)
@@ -20,69 +20,62 @@ GEM
       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.2)
     language_server-protocol (3.17.0.3)
+    logger (1.6.0)
     method_source (1.1.0)
     net-http (0.4.1)
       uri
-    parallel (1.24.0)
-    parser (3.3.2.0)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.5)
+    public_suffix (6.0.0)
     racc (1.8.0)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    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.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    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.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.30.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.3)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     strscan (3.1.0)
     thor (1.3.1)
@@ -109,4 +102,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.5.9
+   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"
@@ -163,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
 
@@ -257,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.11.0'.freeze
+  VERSION = '1.12.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -68,6 +68,7 @@ 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.yml"
 - ".github/workflows/ci.yml"
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: K8s deployment tools based on thor