added '--wait' option for helm upgrade, so that the deployment will w…

…ait for service restart
ArtStation · Jan 2, 2024 · 7b34419 · 7b34419
1 parent 8bccc3a
commit 7b34419
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/kuber_kit/shell/commands/helm_commands.rb b/lib/kuber_kit/shell/commands/helm_commands.rb
@@ -36,7 +36,12 @@ def install(shell, release_name, chart_path, kubeconfig_path: nil, namespace: ni
     helm_run(shell, "install #{release_name} #{chart_path}", kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
 
-  def upgrade(shell, release_name, chart_path, kubeconfig_path: nil, namespace: nil)
-    helm_run(shell, "upgrade #{release_name} #{chart_path} --install", kubeconfig_path: kubeconfig_path, namespace: namespace)
+  def upgrade(shell, release_name, chart_path, kubeconfig_path: nil, namespace: nil, wait: true)
+    command_parts = [
+      "upgrade #{release_name} #{chart_path}",
+      "--install"
+    ]
+    command_parts << "--wait" if wait
+    helm_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
 end
diff --git a/spec/kuber_kit/shell/commands/helm_commands_spec.rb b/spec/kuber_kit/shell/commands/helm_commands_spec.rb
@@ -11,12 +11,12 @@
 
   context "#upgrade" do
     it do
-      expect(shell).to receive(:exec!).with(%Q{helm upgrade learning-app /path/to/chart --install})
+      expect(shell).to receive(:exec!).with(%Q{helm upgrade learning-app /path/to/chart --install --wait})
       subject.upgrade(shell, "learning-app", "/path/to/chart")
     end
 
     it do
-      expect(shell).to receive(:exec!).with(%Q{KUBECONFIG=/path/to/kube.cfg helm upgrade learning-app /path/to/chart --install})
+      expect(shell).to receive(:exec!).with(%Q{KUBECONFIG=/path/to/kube.cfg helm upgrade learning-app /path/to/chart --install --wait})
       subject.upgrade(shell, "learning-app", "/path/to/chart", kubeconfig_path: "/path/to/kube.cfg")
     end
   end