vidar 1.13.4 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c96a6938608186988d95fbfc35484c3277591ada026983b454bf18f371edc69
-  data.tar.gz: e6505546c3a9609c0b2443d469460f2f36194679d4b906601b9dab5c2ded4eca
+  metadata.gz: 0c01018404cc849be395df92d01c21d2de70673edc6ae4d58a6283e1b8bf6987
+  data.tar.gz: f341847d26d3a47ea72247259a00285d6642f09fcdb82a637eed791562909937
 SHA512:
-  metadata.gz: 9d0659e94c7c009057d0d752f79eb1fadc1fc993e4de0f9b24975d77771f0192efafe9ea1a7def905178d7027c3a42b1eb0e60ef708c0583a45e3fc4e5c0c1e6
-  data.tar.gz: d0a1042e63335f76e87b61b6a899d9df704d35fe34aec8f0494bc9b571672c50b2724f4881b442e534b9207ec8123c4279fa1df03febe02316c980898849a0ae
+  metadata.gz: 4a80eb75d78c8686764010f4f224941355041ac51211efeaf9d75772f234d818623e0aa41623821ca77c76df8300ce984c96ae3323f8dc26bb3d3bad3d76d6ed
+  data.tar.gz: c03c0acb76ec876031f094819af6c13a70f0e601087df1c065c734811ca102cbd366b06763beddeec0e8330398a8d0357ac76a94d83e86b9d07d434f6f108c92

data/.bundler-version

@@ -1 +1,2 @@
-2.5.17
+2.6.9
+

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -2,5 +2,5 @@
 <!--- Describe your changes in detail -->
 <!--- Why is this change required? What problem does it solve? -->
 
-## Related issue(s) or PR(s)
-<!--- GH issue number -->
+## Related tickets(s), PR(s) or slack message:
+<!--- Ticket/Issue/PR number or URL -->

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

@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: hmarr/auto-approve-action@v3
-        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(github.event.pull_request.labels.*.name, 'HOTFIX-AUTO-APPROVE') || contains(github.event.pull_request.labels.*.name, 'dependencies')
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(github.event.pull_request.labels.*.name, 'HOTFIX-AUTO-APPROVE') || contains(github.event.pull_request.labels.*.name, 'self-approve') || contains(github.event.pull_request.labels.*.name, 'dependencies')
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

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

@@ -1,5 +1,8 @@
 name: automerge
 on:
+  pull_request_target:
+    types:
+      - labeled
   pull_request_review:
     types:
       - submitted
@@ -12,8 +15,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: pascalgn/automerge-action@v0.16.2
+        uses: pascalgn/automerge-action@v0.16.4
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: squash
+          MERGE_DELETE_BRANCH: true
+          MERGE_LABELS: "automerge,!automerge blocked"
+      - name: automerge-dependencies
+        uses: pascalgn/automerge-action@v0.16.4
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash
           MERGE_DELETE_BRANCH: true
+          MERGE_LABELS: "dependencies,!automerge blocked"
+          MERGE_REMOVE_LABELS: ""

data/.github/workflows/ci.yml

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

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.15.0 - 2025-06-23
+
+Don't stop watining and mark deployment as failed, when any container is still in a waiting state
+
+## 1.14.0 - 2025-02-05
+
+Ruby 3.4 support. Drop ruby 3.2 support.
+
 ## 1.13.0 - 2024-07-23
 
 Make docker compose command configurable and use `docker compose` instead `docker-compose` by default

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.13.4)
+    vidar (1.15.0)
       colorize
       faraday
       thor (~> 1.0)
@@ -11,77 +11,83 @@ GEM
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.2)
+    ast (2.4.3)
     awesome_print (1.9.2)
-    bigdecimal (3.1.8)
+    bigdecimal (3.2.2)
     coderay (1.1.3)
     colorize (1.1.0)
     crack (1.0.0)
       bigdecimal
       rexml
-    diff-lcs (1.5.1)
-    faraday (2.10.1)
-      faraday-net_http (>= 2.0, < 3.2)
+    diff-lcs (1.6.2)
+    faraday (2.13.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
       logger
-    faraday-net_http (3.1.1)
-      net-http
-    hashdiff (1.1.0)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
-    logger (1.6.0)
+    faraday-net_http (3.4.1)
+      net-http (>= 0.5.0)
+    hashdiff (1.2.0)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
     method_source (1.1.0)
-    net-http (0.4.1)
+    net-http (0.6.0)
       uri
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
+    prism (1.4.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.9.2)
-    rexml (3.3.4)
-      strscan
-    rspec (3.13.0)
+    rake (13.3.0)
+    regexp_parser (2.10.0)
+    rexml (3.4.1)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.4)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.65.1)
+    rspec-support (3.13.4)
+    rubocop (1.77.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.45.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-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (3.0.3)
-      rubocop (~> 1.61)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     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.1)
+    thor (1.3.2)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -102,4 +108,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.5.16
+   2.6.3

data/lib/vidar/cli.rb

@@ -24,12 +24,14 @@ module Vidar
       Log.info "Pulling #{Config.get!(:image)} tags"
       Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:current_branch)} 2> /dev/null || true"
 
-      docker_images = `docker images --format "{{.Repository}}:{{.Tag}}"`.split("\n")
+      image_names = `docker images --format "{{.Repository}}:{{.Tag}}"`.split("\n")
       base_image = "#{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:default_branch)}"
-      Run.docker "pull #{base_image} 2> /dev/null || true" unless docker_images.include?(base_image)
+      Run.docker "pull #{base_image} 2> /dev/null || true" unless image_names.include?(base_image)
 
       Log.info "Docker images:"
-      Log.info docker_images.join("\n")
+      image_names.each do |image_name|
+        puts image_name
+      end
     end
 
     desc "build_and_cache_base", "Build and caches base stage"
@@ -126,8 +128,8 @@ module Vidar
       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' : ''}"
+      Log.info "Set kubectl image for #{'all ' if all}#{destination} container=#{container}..."
+      Run.kubectl "set image #{destination} #{container}=#{Config.get!(:image)}:#{revision} #{'--all' if all}"
     end
 
     desc "set_image", "Set image for k8s deployment"
@@ -144,8 +146,8 @@ module Vidar
       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' : ''}"
+      Log.info "Set kubectl image for #{'all ' if all}#{destination} container=#{container}..."
+      Run.kubectl "set image #{destination} #{container}=#{Config.get!(:image)}:#{revision} #{'--all' if all}"
     end
 
     desc "release", "Build and publish docker images"

data/lib/vidar/deploy_status.rb

@@ -34,7 +34,7 @@ module Vidar
       until pod_set.deployed?
         tries += 1
         sleep(SLEEP)
-        if tries > max_tries
+        if tries > max_tries && !pod_set.waiting?
           break
         end
       end

data/lib/vidar/k8s/pod_set.rb

@@ -10,6 +10,10 @@ module Vidar
         containers.any?
       end
 
+      def waiting?
+        containers.any?(&:waiting?)
+      end
+
       def deployed?
         if items.empty?
           Log.error "Could not fetch pod list"

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '1.13.4'.freeze
+  VERSION = '1.15.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.2.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.3.0')
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.15.0
 platform: ruby
 authors:
 - Krzysztof Knapik
 - RenoFi Engineering Team
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -53,7 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description:
 email:
 - knapo@knapo.net
 - engineering@renofi.com
@@ -104,7 +102,6 @@ metadata:
   source_code_uri: https://github.com/RenoFi/vidar
   changelog_uri: https://github.com/RenoFi/vidar/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,15 +109,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: K8s deployment tools based on thor
 test_files: []