Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[aws-cloudwatch-metrics] Updated cw agent image to version 1.247350.0b251780 and introduced bottlerocket support #706

Merged
merged 2 commits into from
Apr 4, 2022

Conversation

codeJack
Copy link
Contributor

@codeJack codeJack commented Mar 9, 2022

Issue

N/A

Description of changes

The purpose of this PR is mainly to align the chart with the latest version of the aws samples manifest as well as providing bottlrocket support.

  • Updated cw agent image to version 1.247350.0b251780
  • Introduced bottlerocket support

Checklist

  • Added/modified documentation as required (such as the README.md for modified charts)
  • Incremented the chart version in Chart.yaml for the modified chart(s)
  • Manually tested. Describe what testing was done in the testing section below
  • Make sure the title of the PR is a good description that can go into the release notes

Testing

The chart rendering has been tested locally, also it has been installed against an EKS cluster to make sure ContainerInsights is working as expected.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

…b251780 and introduced bottlerocket support
Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@codeJack sorry for the delayed review. You mention in the PR summary that you tested manually with an EKS cluster. Did you test an EKS cluster using bottlerocket images for the worker nodes?

@codeJack
Copy link
Contributor Author

codeJack commented Apr 4, 2022

@jaypipes
yes sure, the cluster had bottlerocket nodes.

Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@codeJack small request inline...

@@ -69,6 +72,14 @@ spec:
- name: varlibdocker
hostPath:
path: /var/lib/docker
- name: containerdsock
hostPath:
{{- if .Values.bottlerocket }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that this would solve the immediate problem at hand. However, this value name of bottlerocket is a one-way door for a couple reasons:

  1. What happens if Bottlerocket decides to change their containerd sock path again?
  2. What happens if there is another host OS we want to target in the future that has a different sock path?

For this reason, I think it would be better to have a containerdSockPath value name and make it a string, defaulted to /run/containerd/containerd.sock with a comment informing the user to set this to /run/dockershim.sock when using Bottlerrocket as a host OS.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bottlerocket rejoined the fold in 1.23 and is planning to backport

bottlerocket-os/bottlerocket#2212

Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @codeJack!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants