Skip to content

Cherry-pick #24912 to 7.x: Kubernetes_secrets provider improvements#24968

Merged
ChrsMark merged 2 commits intoelastic:7.xfrom
ChrsMark:backport_24912_7.x
Apr 7, 2021
Merged

Cherry-pick #24912 to 7.x: Kubernetes_secrets provider improvements#24968
ChrsMark merged 2 commits intoelastic:7.xfrom
ChrsMark:backport_24912_7.x

Conversation

@ChrsMark
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark commented Apr 7, 2021

Cherry-pick of PR #24912 to 7.x branch. Original message:

Minor leftovers from #24789.

  1. Return from Fetch() if k8s client is not initialised. This can happen if the provider failed to get started with Run() cause api can be unreachable. In such cases Fetch() will then panic. We need to skip Fetch() in such cases.
  2. Add the commented out section in Agent's k8s manifests about Secrets api.

Signed-off-by: chrismark <chrismarkou92@gmail.com>
(cherry picked from commit 1cf2366)
@ChrsMark ChrsMark added [zube]: In Review backport Team:Elastic-Agent Label for the Agent team Team:Integrations Label for the Integrations team labels Apr 7, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 7, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/agent (Team:Agent)

@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 7, 2021
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark
Copy link
Copy Markdown
Member Author

ChrsMark commented Apr 7, 2021

This one also adds some missing parts of the manifests that were missed in the original backport #24231.

Both backports are for 7.13 so we are on the safe side here.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 7, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #24968 updated

  • Start Time: 2021-04-07T13:09:21.955+0000

  • Duration: 95 min 41 sec

  • Commit: 78d9ee2

Test stats 🧪

Test Results
Failed 0
Passed 6564
Skipped 24
Total 6588

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6564
Skipped 24
Total 6588

@ChrsMark ChrsMark merged commit 9328bf8 into elastic:7.x Apr 7, 2021
@zube zube Bot removed the [zube]: Done label Jul 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Team:Elastic-Agent Label for the Agent team Team:Integrations Label for the Integrations team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants