diff --git a/qa/qa/fixtures/kubernetes_agent/agentk-manifest.yaml.erb b/qa/qa/fixtures/kubernetes_agent/agentk-manifest.yaml.erb index 8eac8419022878dfdbc32aafe02b00586ab2917c..e6ec4528d0d1304269e01c46c299311186e1f368 100644 --- a/qa/qa/fixtures/kubernetes_agent/agentk-manifest.yaml.erb +++ b/qa/qa/fixtures/kubernetes_agent/agentk-manifest.yaml.erb @@ -25,9 +25,26 @@ spec: - --token-file=/config/token - --kas-address - "<%= kas_wss_address %>" + <% if QA::Runtime::Env.qa_cookies.to_s.include?("gitlab_canary=true") %> + - --kas-header + - "Cookie: gitlab_canary=true" + <% end %> volumeMounts: - name: token-volume mountPath: /config + env: + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: SERVICE_ACCOUNT_NAME + valueFrom: + fieldRef: + fieldPath: spec.serviceAccountName volumes: - name: token-volume secret: diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb index 33ef37fcc2e2eeb1335dfe08d829d4e3c7f6b0c3..3d958ecd75b7e1b04405543b83ffe317b06aacac 100644 --- a/qa/qa/runtime/env.rb +++ b/qa/qa/runtime/env.rb @@ -431,7 +431,7 @@ def geo_environment? end def gitlab_agentk_version - ENV.fetch('GITLAB_AGENTK_VERSION', 'v14.5.0') + ENV.fetch('GITLAB_AGENTK_VERSION', 'fe716ea') end def transient_trials