kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bump aws-cni to 1.13.2

This commit is contained in:
Moshe Vayner 2023-06-20 12:29:32 +03:00
parent d31d498af3
commit 97dd47079d
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template
View File

@ -1,4 +1,4 @@
# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/release-1.12/config/master/aws-k8s-cni.yaml
# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/release-1.13/config/master/aws-k8s-cni.yaml
---
# Source: crds/customresourcedefinition.yaml
apiVersion: apiextensions.k8s.io/v1
@ -33,7 +33,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.12.6"
app.kubernetes.io/version: "v1.13.2"
---
# Source: aws-vpc-cni/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1
@ -44,7 +44,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.12.6"
app.kubernetes.io/version: "v1.13.2"
rules:
- apiGroups:
- crd.k8s.amazonaws.com
@ -88,7 +88,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.12.6"
app.kubernetes.io/version: "v1.13.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
@ -108,7 +108,7 @@ metadata:
app.kubernetes.io/name: aws-node
app.kubernetes.io/instance: aws-vpc-cni
k8s-app: aws-node
app.kubernetes.io/version: "v1.12.6"
app.kubernetes.io/version: "v1.13.2"
spec:
updateStrategy:
rollingUpdate:
@ -129,7 +129,7 @@ spec:
hostNetwork: true
initContainers:
- name: aws-vpc-cni-init
image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.6" }}"
image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.2" }}"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
@ -137,6 +137,9 @@ spec:
value: "{{ IsIPv6Only }}"
securityContext:
privileged: true
resources:
requests:
cpu: 25m
volumeMounts:
- mountPath: /host/opt/cni/bin
name: cni-bin-dir
@ -151,7 +154,7 @@ spec:
{{ end }}
containers:
- name: aws-node
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.6" }}"
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.2" }}"
ports:
- containerPort: 61678
name: metrics
@ -223,7 +226,13 @@ spec:
- name: MY_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
- name: MY_POD_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: "CLUSTER_NAME"
value: "{{ ClusterName }}"
resources: