Autodeploy conflict: Fix access to logs when multiple pods exist
What does this MR do?
Fixing conflict with auto deploy in !27008 (merged)
This merge request could not automatically be picked into
12-10-auto-deploy-20200318
for12.10.0-ee
and will need manual intervention. You can either:
- Create a new MR targeting the source branch of
12-10-auto-deploy-20200318
, and assign to release managers, or- Solve the conflicts against
12-10-auto-deploy-20200318
, and reassign the Pick into auto-deploy label to this merge request.
Screenshots
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry -
Documentation (if required) -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Availability and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers -
Informed Infrastructure department of a default or new setting change, if applicable per definition of done
Security
If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team