Skip to content

Fix CI on Windows with containerd 1.7 #26

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

Merged
KlwntSingh merged 2 commits into from
Apr 24, 2024
Merged

Fix CI on Windows with containerd 1.7 #26

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
9bb5ada
Add workdir in Windows DS
KlwntSingh Apr 24, 2024
c594199
Add note in ReadME about CW daemonset on Windows
KlwntSingh Apr 24, 2024
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
3 changes: 3 additions & 0 deletions charts/amazon-cloudwatch-observability/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
## Introduction
This AWS Observability Helm Chart provides easy mechanisms to setup the [Amazon CloudWatch Agent Operator](https://github.com/aws/amazon-cloudwatch-agent-operator) to manage the [CloudWatch Agent](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Install-CloudWatch-Agent.html) on Kubernetes clusters.

## Windows Support
CloudWatch DaemonSet on Windows is officially supported only for containerd runtime.

## Security

See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more information.
Expand Down
5 changes: 5 additions & 0 deletions ...mazon-cloudwatch-observability/crds/cloudwatch.aws.amazon.com_amazoncloudwatchagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7460,6 +7460,11 @@ spec:
type: object
type: array
x-kubernetes-list-type: atomic
workingDir:
description: WorkingDir represents Container's working directory.
If not specified, the container runtime's default will be used,
which might be configured in the container image. Cannot be updated.
type: string
type: object
status:
description: AmazonCloudWatchAgentStatus defines the observed state of
Expand Down
1 change: 1 addition & 0 deletions ...amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ spec:
runAsUserName: "NT AUTHORITY\\System"
hostNetwork: true
image: {{ template "cloudwatch-agent.image" . }}
workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%\\Program Files\\Amazon\\AmazonCloudWatchAgent"
mode: daemonset
serviceAccount: {{ template "cloudwatch-agent.serviceAccountName" . }}
nodeSelector:
Expand Down