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.12.5 and align with vendor chart

This commit is contained in:
Moshe Shitrit 2023-03-18 15:53:18 +02:00
parent ffe7402160
commit f34e9482a7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.2"
app.kubernetes.io/version: "v1.12.5"
---
# 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.2"
app.kubernetes.io/version: "v1.12.5"
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.2"
app.kubernetes.io/version: "v1.12.5"
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.2"
app.kubernetes.io/version: "v1.12.5"
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.2" }}"
image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.12.5" }}"
env:
- name: DISABLE_TCP_EARLY_DEMUX
value: "false"
@ -147,7 +147,7 @@ spec:
{}
containers:
- name: aws-node
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.2" }}"
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.12.5" }}"
ports:
- containerPort: 61678
name: metrics
@ -182,8 +182,6 @@ spec:
# value: "true"
# - name: AWS_VPC_ENI_MTU
# value: "9001"
# - name: AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER
# value: "false"
# - name: AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG
# value: "false"
# - name: AWS_VPC_K8S_CNI_EXTERNALSNAT