feat: cdk version and vpc cni upgrade

assets/helmCharts/node-problem-detector/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.8.12
+appVersion: v0.8.15
 description: 'This chart installs a [node-problem-detector](https://github.com/kubernetes/node-problem-detector)
   daemonset. This tool aims to make various node problems visible to the upstream
   layers in cluster management stack. It is a daemon which runs on each node, detects
@@ -18,4 +18,4 @@ name: node-problem-detector
 sources:
 - https://github.com/kubernetes/node-problem-detector
 - https://kubernetes.io/docs/concepts/architecture/nodes/#condition
-version: 2.3.2
+version: 2.3.12

assets/helmCharts/node-problem-detector/README.md

@@ -1,6 +1,6 @@
 # node-problem-detector
 
-![Version: 2.3.2](https://img.shields.io/badge/Version-2.3.2-informational?style=flat-square) ![AppVersion: v0.8.12](https://img.shields.io/badge/AppVersion-v0.8.12-informational?style=flat-square)
+![Version: 2.3.12](https://img.shields.io/badge/Version-2.3.12-informational?style=flat-square) ![AppVersion: v0.8.15](https://img.shields.io/badge/AppVersion-v0.8.15-informational?style=flat-square)
 
 This chart installs a [node-problem-detector](https://github.com/kubernetes/node-problem-detector) daemonset. This tool aims to make various node problems visible to the upstream layers in cluster management stack. It is a daemon which runs on each node, detects node problems and reports them to apiserver.
 
@@ -58,8 +58,8 @@ helm install my-release deliveryhero/node-problem-detector -f values.yaml
 | hostPID | bool | `false` |  |
 | image.digest | string | `""` | the image digest. If given it takes precedence over a given tag. |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"k8s.gcr.io/node-problem-detector/node-problem-detector"` |  |
-| image.tag | string | `"v0.8.12"` |  |
+| image.repository | string | `"registry.k8s.io/node-problem-detector/node-problem-detector"` |  |
+| image.tag | string | `"v0.8.15"` |  |
 | imagePullSecrets | list | `[]` |  |
 | labels | object | `{}` |  |
 | logDir.host | string | `"/var/log/"` | log directory on k8s host |
@@ -73,15 +73,19 @@ helm install my-release deliveryhero/node-problem-detector -f values.yaml
 | metrics.prometheusRule.defaultRules.disabled | list | `[]` |  |
 | metrics.prometheusRule.enabled | bool | `false` |  |
 | metrics.serviceMonitor.additionalLabels | object | `{}` |  |
+| metrics.serviceMonitor.additionalRelabelings | list | `[]` |  |
 | metrics.serviceMonitor.enabled | bool | `false` |  |
+| metrics.serviceMonitor.metricRelabelings | list | `[]` |  |
 | nameOverride | string | `""` |  |
 | nodeSelector | object | `{}` |  |
 | priorityClassName | string | `"system-node-critical"` |  |
 | rbac.create | bool | `true` |  |
 | rbac.pspEnabled | bool | `false` |  |
 | resources | object | `{}` |  |
 | securityContext.privileged | bool | `true` |  |
+| serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
+| serviceAccount.labels | object | `{}` |  |
 | serviceAccount.name | string | `nil` |  |
 | settings.custom_monitor_definitions | object | `{}` | Custom plugin monitor config files |
 | settings.custom_plugin_monitors | list | `[]` |  |
@@ -93,6 +97,7 @@ helm install my-release deliveryhero/node-problem-detector -f values.yaml
 | tolerations[0].effect | string | `"NoSchedule"` |  |
 | tolerations[0].operator | string | `"Exists"` |  |
 | updateStrategy | string | `"RollingUpdate"` | Manage the daemonset update strategy |
+| volume.localtime.type | string | `"FileOrCreate"` |  |
 
 ## Maintainers
 

assets/helmCharts/node-problem-detector/templates/daemonset.yaml

@@ -112,10 +112,11 @@ spec:
         - name: localtime
           hostPath:
             path: /etc/localtime
-            type: "FileOrCreate"
+            type: {{ default "FileOrCreate" .Values.volume.localtime.type }}
         - name: custom-config
           configMap:
             name: {{ include "node-problem-detector.customConfig" . }}
+            defaultMode: 493
       {{- if .Values.extraVolumes }}
       {{- toYaml .Values.extraVolumes | nindent 8 }}
       {{- end }}

assets/helmCharts/node-problem-detector/templates/serviceaccount.yaml

@@ -8,5 +8,12 @@ metadata:
     helm.sh/chart: {{ include "node-problem-detector.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+   {{- with .Values.serviceAccount.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   namespace: {{ .Release.Namespace }}
 {{- end -}}

assets/helmCharts/node-problem-detector/templates/servicemonitor.yaml

@@ -32,4 +32,11 @@ spec:
       targetLabel: host_ip
       sourceLabels:
         - __meta_kubernetes_pod_host_ip
+    {{- if .Values.metrics.serviceMonitor.additionalRelabelings }}
+    {{- toYaml .Values.metrics.serviceMonitor.additionalRelabelings | nindent 4 }}
+    {{- end }}
+    {{- if .Values.metrics.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+    {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 4 }}
+    {{- end }}
 {{- end }}

assets/helmCharts/node-problem-detector/values.yaml

@@ -55,8 +55,8 @@ logDir:
   pod: ""
 
 image:
-  repository: k8s.gcr.io/node-problem-detector/node-problem-detector
-  tag: v0.8.12
+  repository: registry.k8s.io/node-problem-detector/node-problem-detector
+  tag: v0.8.15
   # image.digest -- the image digest. If given it takes precedence over a given tag.
   digest: ""
   pullPolicy: IfNotPresent
@@ -76,6 +76,10 @@ rbac:
 hostNetwork: false
 hostPID: false
 
+volume:
+  localtime:
+    type: "FileOrCreate"
+
 priorityClassName: system-node-critical
 
 securityContext:
@@ -94,11 +98,23 @@ tolerations:
 serviceAccount:
   # Specifies whether a ServiceAccount should be created
   create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # Labels to add to the service account
+  labels: {}
   # The name of the ServiceAccount to use.
   # If not set and create is true, a name is generated using the fullname template
   name:
 
-affinity: {}
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+        - matchExpressions:
+          - key: eks.amazonaws.com/compute-type
+            operator: NotIn
+            values:
+              - fargate
 
 nodeSelector: {}
 
@@ -110,6 +126,8 @@ metrics:
   serviceMonitor:
     enabled: false
     additionalLabels: {}
+    additionalRelabelings: []
+    metricRelabelings: []
   prometheusRule:
     enabled: false
     defaultRules: