Skip to content

Implement mTLS resources for CloudWatch Agent client #163

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Implement mTLS resources for CloudWatch Agent client #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b309aa5
set up mtls resources
musa-asad Jan 18, 2025
5a3792e
fix naming
musa-asad Jan 21, 2025
26a5bba
update naming
musa-asad Feb 12, 2025
17e8e2a
Merge branch 'main' into mtls
musa-asad Mar 27, 2025
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
33 changes: 29 additions & 4 deletions charts/amazon-cloudwatch-observability/templates/certmanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
{{- end }}
{{- end }}

{{- if ( .Values.agent.certManager.enabled) }}
{{- if ( .Values.agent.certManager.enabled) }}
---
apiVersion: cert-manager.io/v1
kind: Certificate
Expand Down Expand Up @@ -100,7 +100,25 @@ spec:
issuerRef:
kind: Issuer
name: "agent-ca"
secretName: "amazon-cloudwatch-observability-agent-client-cert"
secretName: "amazon-cloudwatch-observability-agent-client-cert"
usages:
- digital signature
- key encipherment
- cert sign
---
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
labels:
{{- include "amazon-cloudwatch-observability.labels" . | nindent 4 }}
name: "amazon-cloudwatch-observability-agent-ta-client-cert"
namespace: {{ .Release.Namespace }}
spec:
commonName: "agent-ta-client"
issuerRef:
kind: Issuer
name: "agent-ca"
secretName: "amazon-cloudwatch-observability-agent-ta-client-cert"
usages:
- digital signature
- key encipherment
Expand Down Expand Up @@ -143,7 +161,14 @@ kind: Secret
metadata:
labels:
{{- include "amazon-cloudwatch-observability.labels" . | nindent 4 }}
name: "amazon-cloudwatch-observability-agent-client-cert"
name: "amazon-cloudwatch-observability-agent-client-cert"
namespace: {{ .Release.Namespace }}
---
apiVersion: v1
kind: Secret
metadata:
labels:
{{- include "amazon-cloudwatch-observability.labels" . | nindent 4 }}
name: "amazon-cloudwatch-observability-agent-ta-client-cert"
namespace: {{ .Release.Namespace }}
{{- end }}

24 changes: 24 additions & 0 deletions charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{{- $cert := genSignedCert ("agent") nil $altNames ( .Values.admissionWebhooks.autoGenerateCert.expiryDays | int ) $ca -}}
{{- $serverCert := genSignedCert ("agent-server") nil $agentAltNames ( .Values.admissionWebhooks.autoGenerateCert.expiryDays | int ) $ca -}}
{{- $clientCert := genSignedCert ("agent-client") nil nil ( .Values.admissionWebhooks.autoGenerateCert.expiryDays | int ) $ca -}}
{{- $agentTAClientCert := genSignedCert ("agent-ta-client") nil nil ( .Values.admissionWebhooks.autoGenerateCert.expiryDays | int ) $ca -}}
apiVersion: v1
kind: Secret
metadata:
Expand Down Expand Up @@ -45,6 +46,18 @@ data:
tls.crt: {{ $clientCert.Cert | b64enc }}
tls.key: {{ $clientCert.Key | b64enc }}
---
apiVersion: v1
kind: Secret
metadata:
labels:
{{- include "amazon-cloudwatch-observability.labels" . | nindent 4}}
name: "amazon-cloudwatch-observability-agent-ta-client-cert"
namespace: {{ .Release.Namespace }}
data:
ca.crt: {{ $ca.Cert | b64enc }}
tls.crt: {{ $agentTAClientCert.Cert | b64enc }}
tls.key: {{ $agentTAClientCert.Key | b64enc }}
---
{{- end -}}

{{- $clusterName := .Values.clusterName | required ".Values.clusterName is required." -}}
Expand Down Expand Up @@ -142,6 +155,9 @@ spec:
- mountPath: /etc/amazon-cloudwatch-observability-agent-server-cert
name: agentservertls
readOnly: true
- mountPath: /etc/amazon-cloudwatch-observability-agent-ta-client-cert
name: agenttaclienttls
readOnly: true
- mountPath: /var/lib/kubelet/pod-resources
name: kubelet-podresources
{{ if $isROSA }}
Expand Down Expand Up @@ -200,6 +216,14 @@ spec:
path: server.crt
- key: tls.key
path: server.key
- name: agenttaclienttls
secret:
secretName: amazon-cloudwatch-observability-agent-ta-client-cert
items:
- key: tls.crt
path: client.crt
- key: tls.key
path: client.key
{{ if $isROSA }}
- name: kubelet-ca
hostPath:
Expand Down