Helm Chart Update

* Updated Helm chart to expose new config interface for vCPU advertisement device-plugin

Author: David Dornseifer

helm/Chart.yaml

@@ -5,3 +5,4 @@ type: application
 version: 0.2.0
 appVersion: "0.2.0"
 sources: ["https://github.com/aws/aws-nitro-enclaves-with-k8s"]
+icon: https://d3g9o9u8re44ak.cloudfront.net/logo/f9feca19-5e84-465f-9d3a-ce348d996b61/3301cc66-e044-48e8-ac9e-1496f4103b01.png

helm/README.md

@@ -25,6 +25,8 @@ $ helm upgrade my-release \
 |-----|------|---------|-------------|
 | awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.containerSecurityContext.allowPrivilegeEscalation | bool | `false` |  |
 | awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` |  |
+| awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.env.enclaveCpuAdvertisement | string | `"true"` |  |
+| awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.env.maxEnclavesPerNode | string | `"4"` |  |
 | awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.image.repository | string | `"public.ecr.aws/aws-nitro-enclaves/aws-nitro-enclaves-k8s-device-plugin"` |  |
 | awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.image.tag | string | `"v0.2"` |  |
 | awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.imagePullPolicy | string | `"Always"` |  |

helm/templates/aws-nitro-enclaves-k8s-ds.yaml

@@ -21,10 +21,17 @@ spec:
     spec:
       containers:
       - env:
+        - name: MAX_ENCLAVES_PER_NODE
+          value: {{ quote .Values.awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.env.maxEnclavesPerNode
+            }}
+        - name: ENCLAVE_CPU_ADVERTISEMENT
+          value: {{ quote .Values.awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.env.enclaveCpuAdvertisement
+            }}
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ quote .Values.kubernetesClusterDomain }}
         image: {{ .Values.awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.image.repository
-          }}:{{ .Values.awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.image.tag }}
+          }}:{{ .Values.awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.image.tag | default
+          .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.awsNitroEnclavesK8SDaemonset.awsNitroEnclavesK8SDp.imagePullPolicy
           }}
         name: aws-nitro-enclaves-k8s-dp

helm/values.yaml

@@ -5,6 +5,9 @@ awsNitroEnclavesK8SDaemonset:
       capabilities:
         drop:
         - ALL
+    env:
+      enclaveCpuAdvertisement: "true"
+      maxEnclavesPerNode: "4"
     image:
       repository: public.ecr.aws/aws-nitro-enclaves/aws-nitro-enclaves-k8s-device-plugin
       tag: v0.2