Fix runner readiness logic check

Author: dzirtusss

CHANGELOG.md

@@ -14,6 +14,10 @@ Changes since the last non-beta release.
 
 _Please add entries here for your pull requests that have not yet been released._
 
+### Fixed
+
+- Fixed issue where `run` command could hang indefinitely when updating runner workload. [PR 260](https://github.com/shakacode/control-plane-flow/pull/260) by [Sergey Tarasov](https://github.com/dzirtusss).
+
 ## [4.1.1] - 2025-03-14
 
 

lib/command/run.rb

@@ -97,7 +97,7 @@ class Run < Base # rubocop:disable Metrics/ClassLength
 
     attr_reader :interactive, :detached, :location, :original_workload, :runner_workload,
                 :default_image, :default_cpu, :default_memory, :job_timeout, :job_history_limit,
-                :container, :expected_deployed_version, :job, :replica, :command
+                :container, :job, :replica, :command
 
     def call # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       @interactive = config.options[:interactive] || interactive_command?
@@ -126,10 +126,7 @@ def call # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, M
       end
 
       create_runner_workload if cp.fetch_workload(runner_workload).nil?
-      wait_for_runner_workload_deploy
       update_runner_workload
-      wait_for_runner_workload_update if expected_deployed_version
-
       start_job
       wait_for_replica_for_job
 
@@ -242,24 +239,10 @@ def update_runner_workload # rubocop:disable Metrics/CyclomaticComplexity, Metri
       return unless should_update
 
       step("Updating runner workload '#{runner_workload}'") do
-        # Update runner workload
-        @expected_deployed_version = (cp.cron_workload_deployed_version(runner_workload) || 0) + 1
         cp.apply_hash("kind" => "workload", "name" => runner_workload, "spec" => spec)
       end
     end
 
-    def wait_for_runner_workload_deploy
-      step("Waiting for runner workload '#{runner_workload}' to be deployed", retry_on_failure: true) do
-        !cp.cron_workload_deployed_version(runner_workload).nil?
-      end
-    end
-
-    def wait_for_runner_workload_update
-      step("Waiting for runner workload '#{runner_workload}' to be updated", retry_on_failure: true) do
-        (cp.cron_workload_deployed_version(runner_workload) || 0) >= expected_deployed_version
-      end
-    end
-
     def start_job
       job_start_yaml = build_job_start_yaml
 

lib/core/controlplane.rb

@@ -409,6 +409,7 @@ def apply_template(data) # rubocop:disable Metrics/MethodLength
       f.write(data)
       f.rewind
       cmd = "cpln apply #{gvc_org} --file #{f.path}"
+      cmd += " --ready" unless ENV.fetch("DISABLE_APPLY_READY", nil)
       if Shell.tmp_stderr
         cmd += " 2> #{Shell.tmp_stderr.path}" if Shell.should_hide_output?
 

spec/spec_helper.rb

@@ -4,6 +4,7 @@
 ENV["HIDE_COMMAND_OUTPUT"] = "true"
 ENV["DISABLE_INTERRUPT_TRAP"] = "true"
 ENV["DISABLE_VALIDATIONS"] = "true"
+ENV["DISABLE_APPLY_READY"] = "true"
 
 require "rspec/retry"
 require "simplecov"