1 files changed, 50 insertions, 34 deletions
diff --git a/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
index 82ed4d47857..db76d5d207e 100644
--- a/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
@@ -21,6 +21,15 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
     )
   end
 
+  let(:tls_flags) do
+    <<~EOS.squish
+    --tls
+    --tls-ca-cert /data/helm/app-name/config/ca.pem
+    --tls-cert /data/helm/app-name/config/cert.pem
+    --tls-key /data/helm/app-name/config/key.pem
+    EOS
+  end
+
   subject { install_command }
 
   it_behaves_like 'helm commands' do
@@ -36,12 +45,10 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
 
     let(:helm_install_comand) do
       <<~EOS.squish
-      helm install chart-name
-        --name app-name
-        --tls
-        --tls-ca-cert /data/helm/app-name/config/ca.pem
-        --tls-cert /data/helm/app-name/config/cert.pem
-        --tls-key /data/helm/app-name/config/key.pem
+      helm upgrade app-name chart-name
+        --install
+        --reset-values
+        #{tls_flags}
         --version 1.2.3
         --set rbac.create\\=false,rbac.enabled\\=false
         --namespace gitlab-managed-apps
@@ -66,12 +73,10 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
 
       let(:helm_install_command) do
         <<~EOS.squish
-        helm install chart-name
-          --name app-name
-          --tls
-          --tls-ca-cert /data/helm/app-name/config/ca.pem
-          --tls-cert /data/helm/app-name/config/cert.pem
-          --tls-key /data/helm/app-name/config/key.pem
+        helm upgrade app-name chart-name
+          --install
+          --reset-values
+          #{tls_flags}
           --version 1.2.3
           --set rbac.create\\=true,rbac.enabled\\=true
           --namespace gitlab-managed-apps
@@ -95,12 +100,10 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
 
       let(:helm_install_command) do
         <<~EOS.squish
-        helm install chart-name
-          --name app-name
-          --tls
-          --tls-ca-cert /data/helm/app-name/config/ca.pem
-          --tls-cert /data/helm/app-name/config/cert.pem
-          --tls-key /data/helm/app-name/config/key.pem
+        helm upgrade app-name chart-name
+          --install
+          --reset-values
+          #{tls_flags}
           --version 1.2.3
           --set rbac.create\\=false,rbac.enabled\\=false
           --namespace gitlab-managed-apps
@@ -120,15 +123,22 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
         for i in $(seq 1 30); do helm version && break; sleep 1s; echo "Retrying ($i)..."; done
         helm repo add app-name https://repository.example.com
         helm repo update
+        /bin/date
+        /bin/true
         #{helm_install_command}
         EOS
       end
 
       let(:helm_install_command) do
-        <<~EOS.strip
-        /bin/date
-        /bin/true
-        helm install chart-name --name app-name --tls --tls-ca-cert /data/helm/app-name/config/ca.pem --tls-cert /data/helm/app-name/config/cert.pem --tls-key /data/helm/app-name/config/key.pem --version 1.2.3 --set rbac.create\\=false,rbac.enabled\\=false --namespace gitlab-managed-apps -f /data/helm/app-name/config/values.yaml
+        <<~EOS.squish
+        helm upgrade app-name chart-name
+          --install
+          --reset-values
+          #{tls_flags}
+          --version 1.2.3
+          --set rbac.create\\=false,rbac.enabled\\=false
+          --namespace gitlab-managed-apps
+          -f /data/helm/app-name/config/values.yaml
         EOS
       end
     end
@@ -145,14 +155,21 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
         helm repo add app-name https://repository.example.com
         helm repo update
         #{helm_install_command}
+        /bin/date
+        /bin/false
         EOS
       end
 
       let(:helm_install_command) do
-        <<~EOS.strip
-        helm install chart-name --name app-name --tls --tls-ca-cert /data/helm/app-name/config/ca.pem --tls-cert /data/helm/app-name/config/cert.pem --tls-key /data/helm/app-name/config/key.pem --version 1.2.3 --set rbac.create\\=false,rbac.enabled\\=false --namespace gitlab-managed-apps -f /data/helm/app-name/config/values.yaml
-        /bin/date
-        /bin/false
+        <<~EOS.squish
+        helm upgrade app-name chart-name
+          --install
+          --reset-values
+          #{tls_flags}
+          --version 1.2.3
+          --set rbac.create\\=false,rbac.enabled\\=false
+          --namespace gitlab-managed-apps
+          -f /data/helm/app-name/config/values.yaml
         EOS
       end
     end
@@ -174,8 +191,9 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
 
       let(:helm_install_command) do
         <<~EOS.squish
-        helm install chart-name
-           --name app-name
+        helm upgrade app-name chart-name
+           --install
+           --reset-values
            --version 1.2.3
            --set rbac.create\\=false,rbac.enabled\\=false
            --namespace gitlab-managed-apps
@@ -201,12 +219,10 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
 
       let(:helm_install_command) do
         <<~EOS.squish
-        helm install chart-name
-          --name app-name
-          --tls
-          --tls-ca-cert /data/helm/app-name/config/ca.pem
-          --tls-cert /data/helm/app-name/config/cert.pem
-          --tls-key /data/helm/app-name/config/key.pem
+        helm upgrade app-name chart-name
+          --install
+          --reset-values
+          #{tls_flags}
           --set rbac.create\\=false,rbac.enabled\\=false
           --namespace gitlab-managed-apps
           -f /data/helm/app-name/config/values.yaml