Sync vpc-cni charts from master branch (aws#659)

vsimon · Dec 18, 2021 · 6c3c045 · 6c3c045
1 parent a78f637
commit 6c3c045
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 38 deletions.
diff --git a/stable/aws-vpc-cni/Chart.yaml b/stable/aws-vpc-cni/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: aws-vpc-cni
-version: 1.1.10
-appVersion: "v1.9.3"
+version: 1.1.12
+appVersion: "v1.10.1"
 description: A Helm chart for the AWS VPC CNI
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 home: https://github.com/aws/amazon-vpc-cni-k8s
@@ -16,4 +16,4 @@ maintainers:
   - name: Jayanth Varavani
     url: https://github.com/jayanthvn
     email: [email protected]
-engine: gotpl
+engine: gotpl
diff --git a/stable/aws-vpc-cni/test.yaml b/stable/aws-vpc-cni/test.yaml
@@ -1,24 +1,31 @@
 # Test values for aws-vpc-cni.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-#
+
+# This default name override is to maintain backwards compatability with
+# existing naming
 nameOverride: aws-node
 
 init:
   image:
-    tag: v1.9.0
+    tag: v1.10.1
     region: us-west-2
+    account: "602401143452"   
     pullPolicy: Always
+    domain: "amazonaws.com"  
     # Set to use custom image
     # override: "repo/org/image:tag"
   env:
     DISABLE_TCP_EARLY_DEMUX: "false"
+    ENABLE_IPv6: "false"
   securityContext:
     privileged: true
 
 image:
   region: us-west-2
-  tag: v1.9.0
+  tag: v1.10.1
+  account: "602401143452"   
+  domain: "amazonaws.com"  
   pullPolicy: Always
   # Set to use custom image
   # override: "repo/org/image:tag"
@@ -44,12 +51,15 @@ env:
   ENABLE_PREFIX_DELEGATION: "false"
   WARM_ENI_TARGET: "1"
   WARM_PREFIX_TARGET: "1"
+  DISABLE_NETWORK_RESOURCE_PROVISIONING: "false"
+  ENABLE_IPv4: "true"
+  ENABLE_IPv6: "false"
 
 # this flag enables you to use the match label that was present in the original daemonset deployed by EKS
 # You can then annotate and label the original aws-node resources and 'adopt' them into a helm release
 originalMatchLabels: false
 
-cniConfig: 
+cniConfig:
   enabled: false
   fileContents: ""
 
@@ -63,6 +73,8 @@ podSecurityContext: {}
 
 podAnnotations: {}
 
+podLabels: {}
+
 securityContext:
   capabilities:
     add:
@@ -85,15 +97,23 @@ livenessProbe:
     command:
       - /app/grpc-health-probe
       - '-addr=:50051'
+      - '-connect-timeout=5s'
+      - '-rpc-timeout=5s'
   initialDelaySeconds: 60
 
+livenessProbeTimeoutSeconds: 10
+
 readinessProbe:
   exec:
     command:
       - /app/grpc-health-probe
       - '-addr=:50051'
+      - '-connect-timeout=5s'
+      - '-rpc-timeout=5s'
   initialDelaySeconds: 1
 
+readinessProbeTimeoutSeconds: 10
+
 resources:
   requests:
     cpu: 10m
@@ -111,20 +131,6 @@ affinity:
   nodeAffinity:
     requiredDuringSchedulingIgnoredDuringExecution:
       nodeSelectorTerms:
-        - matchExpressions:
-            - key: "beta.kubernetes.io/os"
-              operator: In
-              values:
-                - linux
-            - key: "beta.kubernetes.io/arch"
-              operator: In
-              values:
-                - amd64
-                - arm64
-            - key: "eks.amazonaws.com/compute-type"
-              operator: NotIn
-              values:
-                - fargate
         - matchExpressions:
             - key: "kubernetes.io/os"
               operator: In
@@ -159,3 +165,6 @@ eniConfig:
     #   id: subnet-789
     #   securityGroups:
     #   - sg-789
+
+cri:
+  hostPath: # "/var/run/containerd/containerd.sock"
diff --git a/stable/aws-vpc-cni/values.yaml b/stable/aws-vpc-cni/values.yaml
@@ -8,19 +8,24 @@ nameOverride: aws-node
 
 init:
   image:
-    tag: v1.9.3
+    tag: v1.10.1
     region: us-west-2
+    account: "602401143452"   
     pullPolicy: Always
+    domain: "amazonaws.com"  
     # Set to use custom image
     # override: "repo/org/image:tag"
   env:
     DISABLE_TCP_EARLY_DEMUX: "false"
+    ENABLE_IPv6: "false"
   securityContext:
     privileged: true
 
 image:
   region: us-west-2
-  tag: v1.9.3
+  tag: v1.10.1
+  account: "602401143452"   
+  domain: "amazonaws.com"  
   pullPolicy: Always
   # Set to use custom image
   # override: "repo/org/image:tag"
@@ -47,6 +52,8 @@ env:
   WARM_ENI_TARGET: "1"
   WARM_PREFIX_TARGET: "1"
   DISABLE_NETWORK_RESOURCE_PROVISIONING: "false"
+  ENABLE_IPv4: "true"
+  ENABLE_IPv6: "false"
 
 # this flag enables you to use the match label that was present in the original daemonset deployed by EKS
 # You can then annotate and label the original aws-node resources and 'adopt' them into a helm release
@@ -90,15 +97,23 @@ livenessProbe:
     command:
       - /app/grpc-health-probe
       - '-addr=:50051'
+      - '-connect-timeout=5s'
+      - '-rpc-timeout=5s'
   initialDelaySeconds: 60
 
+livenessProbeTimeoutSeconds: 10
+
 readinessProbe:
   exec:
     command:
       - /app/grpc-health-probe
       - '-addr=:50051'
+      - '-connect-timeout=5s'
+      - '-rpc-timeout=5s'
   initialDelaySeconds: 1
 
+readinessProbeTimeoutSeconds: 10
+
 resources:
   requests:
     cpu: 10m
@@ -116,20 +131,6 @@ affinity:
   nodeAffinity:
     requiredDuringSchedulingIgnoredDuringExecution:
       nodeSelectorTerms:
-        - matchExpressions:
-            - key: "beta.kubernetes.io/os"
-              operator: In
-              values:
-                - linux
-            - key: "beta.kubernetes.io/arch"
-              operator: In
-              values:
-                - amd64
-                - arm64
-            - key: "eks.amazonaws.com/compute-type"
-              operator: NotIn
-              values:
-                - fargate
         - matchExpressions:
             - key: "kubernetes.io/os"
               operator: In
@@ -166,4 +167,4 @@ eniConfig:
     #   - sg-789
 
 cri:
-  hostPath: # "/var/run/containerd/containerd.sock"
+  hostPath: # "/var/run/containerd/containerd.sock"