diff --git a/qa/qa/service/cluster_provider/gcloud.rb b/qa/qa/service/cluster_provider/gcloud.rb index 4976a8d8dad68dd2f1dc224acd576963a04b24ee..7993cf4ab4dfc6f1709379f3a2dd5d5caa9c229c 100644 --- a/qa/qa/service/cluster_provider/gcloud.rb +++ b/qa/qa/service/cluster_provider/gcloud.rb @@ -45,7 +45,7 @@ def connect end def install_kubernetes_agent(agent_token:, kas_address:, agent_name: "gitlab-agent") - shell <<~CMD.tr("\n", ' ') + cmd_str = <<~CMD.tr("\n", ' ') helm repo add gitlab https://charts.gitlab.io && helm repo update && helm upgrade --install gitlab-agent gitlab/gitlab-agent @@ -56,6 +56,7 @@ def install_kubernetes_agent(agent_token:, kas_address:, agent_name: "gitlab-age --set config.kasAddress=#{kas_address} --set config.kasHeaders="{Cookie: gitlab_canary=#{target_canary?}}" CMD + shell(cmd_str, mask_secrets: [agent_token]) end def uninstall_kubernetes_agent(agent_name: "gitlab-agent") @@ -78,7 +79,7 @@ def install_ngnix_ingress end def install_gitlab_workspaces_proxy - shell <<~CMD.tr("\n", ' ') + cmd_str = <<~CMD.tr("\n", ' ') helm repo add gitlab-workspaces-proxy \ https://gitlab.com/api/v4/projects/gitlab-org%2fremote-development%2fgitlab-workspaces-proxy/packages/helm/devel && helm repo update && @@ -100,6 +101,8 @@ def install_gitlab_workspaces_proxy --set="ingress.tls.wildcardDomainKey=$(cat #{Runtime::Env.workspaces_wildcard_key})" \ --set="ingress.className=nginx" CMD + + shell(cmd_str, mask_secrets: [Runtime::Env.workspaces_oauth_app_secret, Runtime::Env.workspaces_oauth_signing_key]) end def update_dns(load_balancer_ip)