diff --git a/charts/core-dump-handler/README.md b/charts/core-dump-handler/README.md
index 66a06a1..a55ac83 100644
--- a/charts/core-dump-handler/README.md
+++ b/charts/core-dump-handler/README.md
@@ -39,6 +39,9 @@ helm install core-dump-handler . --create-namespace --namespace observe \
| AWS | EKS with IAM roles for service accounts | values.aws.yaml |
+
+ | AWS | EKS with Bottlerocket nodes | values.bottlerocket.yaml |
+
| AWS | ROSA | values.openshift.yaml |
diff --git a/charts/core-dump-handler/templates/daemonset.yaml b/charts/core-dump-handler/templates/daemonset.yaml
index 240a738..b109c67 100644
--- a/charts/core-dump-handler/templates/daemonset.yaml
+++ b/charts/core-dump-handler/templates/daemonset.yaml
@@ -30,6 +30,10 @@ spec:
- name: core-volume
mountPath: {{ .Values.daemonset.coreDirectory }}
mountPropagation: Bidirectional
+ {{- if .Values.daemonset.mountContainerRuntimeEndpoint }}
+ - mountPath: {{ .Values.daemonset.hostContainerRuntimeEndpoint }}
+ name: container-runtime
+ {{- end }}
env:
- name: COMP_FILENAME_TEMPLATE
value: {{ .Values.composer.filenameTemplate | quote }}
@@ -115,3 +119,8 @@ spec:
- name: core-volume
persistentVolumeClaim:
claimName: core-storage-pvc
+ {{- if .Values.daemonset.mountContainerRuntimeEndpoint }}
+ - name: container-runtime
+ hostPath:
+ path: {{ .Values.daemonset.hostContainerRuntimeEndpoint }}
+ {{- end }}
diff --git a/charts/core-dump-handler/values.aws.bottlerocket.yaml b/charts/core-dump-handler/values.aws.bottlerocket.yaml
new file mode 100644
index 0000000..e6e9dc8
--- /dev/null
+++ b/charts/core-dump-handler/values.aws.bottlerocket.yaml
@@ -0,0 +1,16 @@
+# AWS requires a crio client to be copied to the server
+daemonset:
+ includeCrioExe: true
+ deployCrioConfig: true
+ vendor: default
+ # Bottlerocket requires the host containerd socket mounted, it is located here as of 1.8.0
+ # Depending on the outcome of this issue, it may move in the future
+ # https://github.com/bottlerocket-os/bottlerocket/issues/2212
+ crioEndpoint: "unix:///run/dockershim.sock"
+ mountContainerRuntimeEndpoint: true
+ hostContainerRuntimeEndpoint: "/run/dockershim.sock"
+
+serviceAccount:
+ annotations:
+ # See https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html
+ eks.amazonaws.com/role-arn: arn:aws:iam::123456789000:role/iam-role-name-here
diff --git a/charts/core-dump-handler/values.schema.json b/charts/core-dump-handler/values.schema.json
index c13cec5..9b6e7c6 100644
--- a/charts/core-dump-handler/values.schema.json
+++ b/charts/core-dump-handler/values.schema.json
@@ -171,7 +171,19 @@
"s3Secret"
]
}
- }
+ },
+ {
+ "if": {
+ "properties": {
+ "mountContainerRuntimeEndpoint": {
+ "const": true
+ }
+ },
+ "required": [
+ "hostContainerRuntimeEndpoint"
+ ]
+ }
+ }
],
"properties": {
"name": {
@@ -208,6 +220,12 @@
"crioEndpoint": {
"type": "string"
},
+ "mountContainerRuntimeEndpoint": {
+ "type": "boolean"
+ },
+ "hostContainerRuntimeEndpoint": {
+ "type": "string"
+ },
"includeCrioExe": {
"type": "boolean"
},
diff --git a/charts/core-dump-handler/values.yaml b/charts/core-dump-handler/values.yaml
index 92cfe10..1d49483 100644
--- a/charts/core-dump-handler/values.yaml
+++ b/charts/core-dump-handler/values.yaml
@@ -34,6 +34,8 @@ daemonset:
hostDirectory: "/var/mnt/core-dump-handler"
coreDirectory: "/var/mnt/core-dump-handler/cores"
crioEndpoint: "unix:///run/containerd/containerd.sock"
+ mountContainerRuntimeEndpoint: false
+ hostContainerRuntimeEndpoint: "/run/containerd/containerd.sock"
suidDumpable: 2
vendor: default
# interval: 60000