-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8541 from hakman/automated-cherry-pick-of-#8538-u…
…pstream-release-1.16 Automated cherry pick of #8538: Update amazon-vpc-cni-k8s to v1.6.0
- Loading branch information
Showing
9 changed files
with
376 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
167 changes: 167 additions & 0 deletions
167
upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| # Vendored from https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/master/config/v1.6/aws-k8s-cni.yaml | ||
|
|
||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| name: aws-node | ||
| rules: | ||
| - apiGroups: | ||
| - crd.k8s.amazonaws.com | ||
| resources: | ||
| - "*" | ||
| - namespaces | ||
| verbs: | ||
| - "*" | ||
| - apiGroups: [""] | ||
| resources: | ||
| - pods | ||
| - nodes | ||
| - namespaces | ||
| verbs: ["list", "watch", "get"] | ||
| - apiGroups: ["extensions"] | ||
| resources: | ||
| - daemonsets | ||
| verbs: ["list", "watch"] | ||
|
|
||
| --- | ||
| apiVersion: v1 | ||
| kind: ServiceAccount | ||
| metadata: | ||
| name: aws-node | ||
| namespace: kube-system | ||
|
|
||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRoleBinding | ||
| metadata: | ||
| name: aws-node | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: ClusterRole | ||
| name: aws-node | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: aws-node | ||
| namespace: kube-system | ||
|
|
||
| --- | ||
| kind: DaemonSet | ||
| apiVersion: apps/v1 | ||
| metadata: | ||
| name: aws-node | ||
| namespace: kube-system | ||
| labels: | ||
| k8s-app: aws-node | ||
| spec: | ||
| updateStrategy: | ||
| type: RollingUpdate | ||
| rollingUpdate: | ||
| maxUnavailable: "10%" | ||
| selector: | ||
| matchLabels: | ||
| k8s-app: aws-node | ||
| template: | ||
| metadata: | ||
| labels: | ||
| k8s-app: aws-node | ||
| spec: | ||
| priorityClassName: system-node-critical | ||
| affinity: | ||
| nodeAffinity: | ||
| requiredDuringSchedulingIgnoredDuringExecution: | ||
| nodeSelectorTerms: | ||
| - matchExpressions: | ||
| - key: "beta.kubernetes.io/os" | ||
| operator: In | ||
| values: | ||
| - linux | ||
| - key: "beta.kubernetes.io/arch" | ||
| operator: In | ||
| values: | ||
| - amd64 | ||
| - key: eks.amazonaws.com/compute-type | ||
| operator: NotIn | ||
| values: | ||
| - fargate | ||
| serviceAccountName: aws-node | ||
| hostNetwork: true | ||
| tolerations: | ||
| - operator: Exists | ||
| containers: | ||
| - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.0" }}" | ||
| imagePullPolicy: Always | ||
| ports: | ||
| - containerPort: 61678 | ||
| name: metrics | ||
| name: aws-node | ||
| readinessProbe: | ||
| exec: | ||
| command: ["/app/grpc-health-probe", "-addr=:50051"] | ||
| initialDelaySeconds: 35 | ||
| livenessProbe: | ||
| exec: | ||
| command: ["/app/grpc-health-probe", "-addr=:50051"] | ||
| initialDelaySeconds: 35 | ||
| env: | ||
| - name: CLUSTER_NAME | ||
| value: {{ ClusterName }} | ||
| - name: AWS_VPC_K8S_CNI_LOGLEVEL | ||
| value: DEBUG | ||
| - name: AWS_VPC_K8S_CNI_VETHPREFIX | ||
| value: eni | ||
| - name: AWS_VPC_ENI_MTU | ||
| value: "9001" | ||
| - name: MY_NODE_NAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: spec.nodeName | ||
| resources: | ||
| requests: | ||
| cpu: 10m | ||
| securityContext: | ||
| privileged: true | ||
| volumeMounts: | ||
| - mountPath: /host/opt/cni/bin | ||
| name: cni-bin-dir | ||
| - mountPath: /host/etc/cni/net.d | ||
| name: cni-net-dir | ||
| - mountPath: /host/var/log | ||
| name: log-dir | ||
| - mountPath: /var/run/docker.sock | ||
| name: dockersock | ||
| - mountPath: /var/run/dockershim.sock | ||
| name: dockershim | ||
| volumes: | ||
| - name: cni-bin-dir | ||
| hostPath: | ||
| path: /opt/cni/bin | ||
| - name: cni-net-dir | ||
| hostPath: | ||
| path: /etc/cni/net.d | ||
| - name: log-dir | ||
| hostPath: | ||
| path: /var/log | ||
| - name: dockersock | ||
| hostPath: | ||
| path: /var/run/docker.sock | ||
| - name: dockershim | ||
| hostPath: | ||
| path: /var/run/dockershim.sock | ||
|
|
||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: eniconfigs.crd.k8s.amazonaws.com | ||
| spec: | ||
| scope: Cluster | ||
| group: crd.k8s.amazonaws.com | ||
| versions: | ||
| - name: v1alpha1 | ||
| served: true | ||
| storage: true | ||
| names: | ||
| plural: eniconfigs | ||
| singular: eniconfig | ||
| kind: ENIConfig |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.