charts/aws-otel-collector: Upgrade to work with containerd (closes #119)

charts/aws-otel-collector/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 name: aws-otel-collector
 description: A Helm chart to deploy aws-otel-collector project
-version: 0.1.4
-appVersion: "v0.17.0"
+version: 0.2.0
+appVersion: "v0.33.1"
 icon: https://raw.githubusercontent.com/snowplow-devops/helm-charts/master/docs/logo/snowplow.png
 home: https://github.com/snowplow-devops/helm-charts
 sources:

charts/aws-otel-collector/README.md

@@ -39,15 +39,15 @@ helm delete aws-otel-collector --namespace kube-system
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| nameOverride | string | `""` | Overrides the name given to the deployment (default: .Release.Name) |
 | fullnameOverride | string | `""` | Overrides the full-name given to the deployment resources (default: .Release.Name) |
+| image.repository | string | `"public.ecr.aws/aws-observability/aws-otel-collector"` | Image to use for deploying |
+| image.tag | string | `"v0.33.1"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"amazon/aws-otel-collector"` | Image to use for deploying |
-| image.tag | string | `"v0.17.0"` |  |
-| nameOverride | string | `""` | Overrides the name given to the deployment (default: .Release.Name) |
 | resources.limits.cpu | string | `"200m"` |  |
 | resources.limits.memory | string | `"200Mi"` |  |
 | resources.requests.cpu | string | `"200m"` |  |
 | resources.requests.memory | string | `"200Mi"` |  |
-| serviceAccount.annotations | object | `{}` | Optional annotations to be applied to service account |
 | serviceAccount.create | bool | `true` | Whether to create a service account or not |
 | serviceAccount.name | string | `""` | The name of the service account to create or use |
+| serviceAccount.annotations | object | `{}` | Optional annotations to be applied to service account |

charts/aws-otel-collector/templates/clusterrole.yaml

@@ -5,10 +5,10 @@ metadata:
 rules:
 - apiGroups: [""]
   resources: ["pods", "nodes", "endpoints"]
-  verbs: ["list", "watch"]
+  verbs: ["list", "watch", "get"]
 - apiGroups: ["apps"]
   resources: ["replicasets"]
-  verbs: ["list", "watch"]
+  verbs: ["list", "watch", "get"]
 - apiGroups: ["batch"]
   resources: ["jobs"]
   verbs: ["list", "watch"]
@@ -20,5 +20,15 @@ rules:
   verbs: ["create", "get"]
 - apiGroups: [""]
   resources: ["configmaps"]
+  verbs: ["update"]
+- apiGroups: [""]
+  resources: ["configmaps"]
+  resourceNames: ["otel-container-insight-clusterleader"]
+  verbs: ["get","update", "create"]
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["create","get", "update"]
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
   resourceNames: ["otel-container-insight-clusterleader"]
-  verbs: ["get","update"]
+  verbs: ["get","update", "create"]

charts/aws-otel-collector/templates/daemonset.yaml

@@ -48,6 +48,8 @@ spec:
         - name: dockersock
           mountPath: /var/run/docker.sock
           readOnly: true
+        - name: containerdsock
+          mountPath: /run/containerd/containerd.sock
         - name: varlibdocker
           mountPath: /var/lib/docker
           readOnly: true
@@ -79,6 +81,9 @@ spec:
       - name: varlibdocker
         hostPath:
           path: /var/lib/docker
+      - name: containerdsock
+        hostPath:
+          path: /run/containerd/containerd.sock
       - name: sys
         hostPath:
           path: /sys

charts/aws-otel-collector/values.yaml

@@ -5,8 +5,8 @@ fullnameOverride: ""
 
 image:
   # -- Image to use for deploying
-  repository: amazon/aws-otel-collector
-  tag: v0.17.0
+  repository: public.ecr.aws/aws-observability/aws-otel-collector
+  tag: v0.33.1
   pullPolicy: IfNotPresent
 
 resources: