Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🥳 aws-vpc-cni v1.12.0 Automated Release! 🥑 #836

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stable/aws-vpc-cni/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: aws-vpc-cni
version: 1.1.21
appVersion: "v1.11.4"
version: 1.2.0
appVersion: "v1.12.0"
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
Expand Down
7 changes: 3 additions & 4 deletions stable/aws-vpc-cni/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ The following table lists the configurable parameters for this chart and their d
| `env` | List of environment variables. See [here](https://github.com/aws/amazon-vpc-cni-k8s#cni-configuration-variables) for options | (see `values.yaml`) |
| `fullnameOverride` | Override the fullname of the chart | `aws-node` |
| `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
| `image.tag` | Image tag | `v1.11.4` |
| `image.tag` | Image tag | `v1.12.0` |
| `image.account` | ECR repository account number | `602401143452` |
| `image.domain` | ECR repository domain | `amazonaws.com` |
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
| `image.override` | A custom docker image to use | `nil` |
| `imagePullSecrets` | Docker registry pull secret | `[]` |
| `init.image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
| `init.image.tag` | Image tag | `v1.11.4` |
| `init.image.tag` | Image tag | `v1.12.0` |
| `init.image.account` | ECR repository account number | `602401143452` |
| `init.image.domain` | ECR repository domain | `amazonaws.com` |
| `init.image.pullPolicy` | Container pull policy | `IfNotPresent` |
Expand All @@ -63,7 +63,7 @@ The following table lists the configurable parameters for this chart and their d
| `podLabels` | Labels to add to each pod | `{}` |
| `priorityClassName` | Name of the priorityClass | `system-node-critical` |
| `resources` | Resources for the pods | `requests.cpu: 10m` |
| `securityContext` | Container Security context | `capabilities: add: - "NET_ADMIN"` |
| `securityContext` | Container Security context | `capabilities: add: - "NET_ADMIN" - "NET_RAW"` |
| `serviceAccount.name` | The name of the ServiceAccount to use | `nil` |
| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` |
| `serviceAccount.annotations` | Specifies the annotations for ServiceAccount | `{}` |
Expand All @@ -72,7 +72,6 @@ The following table lists the configurable parameters for this chart and their d
| `crd.create` | Specifies whether to create the VPC-CNI CRD | `true` |
| `tolerations` | Optional deployment tolerations | `[]` |
| `updateStrategy` | Optional update strategy | `type: RollingUpdate` |
| `cri.hostPath` | Optional use alternative container runtime | `nil` |

Specify each parameter using the `--set key=value[,key=value]` argument to `helm install` or provide a YAML file containing the values for the above parameters:

Expand Down
16 changes: 0 additions & 16 deletions stable/aws-vpc-cni/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,6 @@ spec:
{{- end }}
- mountPath: /host/var/log/aws-routed-eni
name: log-dir
{{- if .Values.cri.hostPath }}
- mountPath: /var/run/cri.sock
name: cri
{{- else }}
- mountPath: /var/run/dockershim.sock
name: dockershim
{{- end }}
- mountPath: /var/run/aws-node
name: run-dir
- mountPath: /run/xtables.lock
Expand All @@ -124,15 +117,6 @@ spec:
- name: cni-config
configMap:
name: {{ include "aws-vpc-cni.fullname" . }}
{{- end }}
{{- with .Values.cri.hostPath }}
- name: cri
hostPath:
{{- toYaml . | nindent 10 }}
{{- else }}
- name: dockershim
hostPath:
path: /var/run/dockershim.sock
{{- end }}
- name: log-dir
hostPath:
Expand Down
46 changes: 19 additions & 27 deletions stable/aws-vpc-cni/test.yaml
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
# 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.10.2
tag: v1.9.0
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.10.2
account: "602401143452"
domain: "amazonaws.com"
tag: v1.9.0
pullPolicy: Always
# Set to use custom image
# override: "repo/org/image:tag"
Expand All @@ -51,15 +44,12 @@ 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: ""

Expand All @@ -73,12 +63,11 @@ podSecurityContext: {}

podAnnotations: {}

podLabels: {}

securityContext:
capabilities:
add:
- "NET_ADMIN"
- "NET_RAW"

crd:
create: true
Expand All @@ -97,23 +86,15 @@ 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
Expand All @@ -131,6 +112,20 @@ 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
Expand Down Expand Up @@ -165,6 +160,3 @@ eniConfig:
# id: subnet-789
# securityGroups:
# - sg-789

cri:
hostPath: # "/var/run/containerd/containerd.sock"
15 changes: 6 additions & 9 deletions stable/aws-vpc-cni/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ nameOverride: aws-node

init:
image:
tag: v1.11.4
tag: v1.12.0
region: us-west-2
account: "602401143452"
pullPolicy: Always
Expand All @@ -23,7 +23,7 @@ init:

image:
region: us-west-2
tag: v1.11.4
tag: v1.12.0
account: "602401143452"
domain: "amazonaws.com"
pullPolicy: Always
Expand Down Expand Up @@ -79,6 +79,7 @@ securityContext:
capabilities:
add:
- "NET_ADMIN"
- "NET_RAW"

crd:
create: true
Expand Down Expand Up @@ -153,19 +154,15 @@ eniConfig:
subnets:
# Key identifies the AZ
# Value contains the subnet ID and security group IDs within that AZ
# a:
# us-west-2a:
# id: subnet-123
# securityGroups:
# - sg-123
# b:
# us-west-2b:
# id: subnet-456
# securityGroups:
# - sg-456
# c:
# us-west-2c:
# id: subnet-789
# securityGroups:
# - sg-789

cri:
hostPath:
# path: /var/run/containerd/containerd.sock