Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

5 files changed, 23 insertions, 23 deletions

diff --git a/lib/gitlab/kubernetes/helm/v2/install_command.rb b/lib/gitlab/kubernetes/helm/v2/install_command.rb
index 10e16723e45..c50db6bf177 100644
--- a/lib/gitlab/kubernetes/helm/v2/install_command.rb
+++ b/lib/gitlab/kubernetes/helm/v2/install_command.rb
@@ -36,13 +36,13 @@ module Gitlab
           # installation and uprade of applications
           def install_command
             command = ['helm', 'upgrade', name, chart] +
-                      install_flag +
-                      rollback_support_flag +
-                      reset_values_flag +
-                      optional_version_flag +
-                      rbac_create_flag +
-                      namespace_flag +
-                      value_flag
+              install_flag +
+              rollback_support_flag +
+              reset_values_flag +
+              optional_version_flag +
+              rbac_create_flag +
+              namespace_flag +
+              value_flag
 
             command.shelljoin
           end
diff --git a/lib/gitlab/kubernetes/helm/v2/patch_command.rb b/lib/gitlab/kubernetes/helm/v2/patch_command.rb
index 2855e6444b1..40e56771e47 100644
--- a/lib/gitlab/kubernetes/helm/v2/patch_command.rb
+++ b/lib/gitlab/kubernetes/helm/v2/patch_command.rb
@@ -37,10 +37,10 @@ module Gitlab
 
           def upgrade_command
             command = ['helm', 'upgrade', name, chart] +
-                      reuse_values_flag +
-                      version_flag +
-                      namespace_flag +
-                      value_flag
+              reuse_values_flag +
+              version_flag +
+              namespace_flag +
+              value_flag
 
             command.shelljoin
           end
diff --git a/lib/gitlab/kubernetes/helm/v3/install_command.rb b/lib/gitlab/kubernetes/helm/v3/install_command.rb
index 20d17f49115..8d521f0dcd4 100644
--- a/lib/gitlab/kubernetes/helm/v3/install_command.rb
+++ b/lib/gitlab/kubernetes/helm/v3/install_command.rb
@@ -33,13 +33,13 @@ module Gitlab
           # installation and uprade of applications
           def install_command
             command = ['helm', 'upgrade', name, chart] +
-                      install_flag +
-                      rollback_support_flag +
-                      reset_values_flag +
-                      optional_version_flag +
-                      rbac_create_flag +
-                      namespace_flag +
-                      value_flag
+              install_flag +
+              rollback_support_flag +
+              reset_values_flag +
+              optional_version_flag +
+              rbac_create_flag +
+              namespace_flag +
+              value_flag
 
             command.shelljoin
           end
diff --git a/lib/gitlab/kubernetes/helm/v3/patch_command.rb b/lib/gitlab/kubernetes/helm/v3/patch_command.rb
index 00f340591e7..1278e524bd2 100644
--- a/lib/gitlab/kubernetes/helm/v3/patch_command.rb
+++ b/lib/gitlab/kubernetes/helm/v3/patch_command.rb
@@ -34,10 +34,10 @@ module Gitlab
 
           def upgrade_command
             command = ['helm', 'upgrade', name, chart] +
-                      reuse_values_flag +
-                      version_flag +
-                      namespace_flag +
-                      value_flag
+              reuse_values_flag +
+              version_flag +
+              namespace_flag +
+              value_flag
 
             command.shelljoin
           end
diff --git a/lib/gitlab/kubernetes/kube_client.rb b/lib/gitlab/kubernetes/kube_client.rb
index 92ffa65fe74..44e53e9ec70 100644
--- a/lib/gitlab/kubernetes/kube_client.rb
+++ b/lib/gitlab/kubernetes/kube_client.rb
@@ -161,7 +161,7 @@ module Gitlab
       def validate_url!
         return if Gitlab::CurrentSettings.allow_local_requests_from_web_hooks_and_services?
 
-        Gitlab::UrlBlocker.validate!(api_prefix, allow_local_network: false)
+        Gitlab::UrlBlocker.validate!(api_prefix, allow_local_network: false, schemes: %w[http https])
       end
 
       def service_account_exists?(resource)