mirror of https://github.com/kubernetes/kops.git
bump aws cni to 1.11.13
This commit is contained in:
parent
82ec66a033
commit
a77f9efe24
|
|
@ -10,7 +10,7 @@ metadata:
|
||||||
app.kubernetes.io/name: aws-node
|
app.kubernetes.io/name: aws-node
|
||||||
app.kubernetes.io/instance: aws-vpc-cni
|
app.kubernetes.io/instance: aws-vpc-cni
|
||||||
k8s-app: aws-node
|
k8s-app: aws-node
|
||||||
app.kubernetes.io/version: "v1.11.2"
|
app.kubernetes.io/version: "v1.11.3"
|
||||||
---
|
---
|
||||||
# Source: aws-vpc-cni/templates/customresourcedefinition.yaml
|
# Source: aws-vpc-cni/templates/customresourcedefinition.yaml
|
||||||
apiVersion: apiextensions.k8s.io/v1
|
apiVersion: apiextensions.k8s.io/v1
|
||||||
|
|
@ -21,7 +21,7 @@ metadata:
|
||||||
app.kubernetes.io/name: aws-node
|
app.kubernetes.io/name: aws-node
|
||||||
app.kubernetes.io/instance: aws-vpc-cni
|
app.kubernetes.io/instance: aws-vpc-cni
|
||||||
k8s-app: aws-node
|
k8s-app: aws-node
|
||||||
app.kubernetes.io/version: "v1.11.2"
|
app.kubernetes.io/version: "v1.11.3"
|
||||||
spec:
|
spec:
|
||||||
scope: Cluster
|
scope: Cluster
|
||||||
group: crd.k8s.amazonaws.com
|
group: crd.k8s.amazonaws.com
|
||||||
|
|
@ -48,7 +48,7 @@ metadata:
|
||||||
app.kubernetes.io/name: aws-node
|
app.kubernetes.io/name: aws-node
|
||||||
app.kubernetes.io/instance: aws-vpc-cni
|
app.kubernetes.io/instance: aws-vpc-cni
|
||||||
k8s-app: aws-node
|
k8s-app: aws-node
|
||||||
app.kubernetes.io/version: "v1.11.2"
|
app.kubernetes.io/version: "v1.11.3"
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- crd.k8s.amazonaws.com
|
- crd.k8s.amazonaws.com
|
||||||
|
|
@ -71,6 +71,10 @@ rules:
|
||||||
resources:
|
resources:
|
||||||
- '*'
|
- '*'
|
||||||
verbs: ["list", "watch"]
|
verbs: ["list", "watch"]
|
||||||
|
- apiGroups: ["", "events.k8s.io"]
|
||||||
|
resources:
|
||||||
|
- events
|
||||||
|
verbs: ["create", "patch", "list", "get"]
|
||||||
---
|
---
|
||||||
# Source: aws-vpc-cni/templates/clusterrolebinding.yaml
|
# Source: aws-vpc-cni/templates/clusterrolebinding.yaml
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
|
@ -81,7 +85,7 @@ metadata:
|
||||||
app.kubernetes.io/name: aws-node
|
app.kubernetes.io/name: aws-node
|
||||||
app.kubernetes.io/instance: aws-vpc-cni
|
app.kubernetes.io/instance: aws-vpc-cni
|
||||||
k8s-app: aws-node
|
k8s-app: aws-node
|
||||||
app.kubernetes.io/version: "v1.11.2"
|
app.kubernetes.io/version: "v1.11.3"
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
|
@ -101,7 +105,7 @@ metadata:
|
||||||
app.kubernetes.io/name: aws-node
|
app.kubernetes.io/name: aws-node
|
||||||
app.kubernetes.io/instance: aws-vpc-cni
|
app.kubernetes.io/instance: aws-vpc-cni
|
||||||
k8s-app: aws-node
|
k8s-app: aws-node
|
||||||
app.kubernetes.io/version: "v1.11.2"
|
app.kubernetes.io/version: "v1.11.3"
|
||||||
spec:
|
spec:
|
||||||
updateStrategy:
|
updateStrategy:
|
||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
|
|
@ -122,7 +126,7 @@ spec:
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: aws-vpc-cni-init
|
- name: aws-vpc-cni-init
|
||||||
image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.2" }}"
|
image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.3" }}"
|
||||||
env:
|
env:
|
||||||
- name: DISABLE_TCP_EARLY_DEMUX
|
- name: DISABLE_TCP_EARLY_DEMUX
|
||||||
value: "false"
|
value: "false"
|
||||||
|
|
@ -140,7 +144,7 @@ spec:
|
||||||
{}
|
{}
|
||||||
containers:
|
containers:
|
||||||
- name: aws-node
|
- name: aws-node
|
||||||
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.2" }}"
|
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.3" }}"
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 61678
|
- containerPort: 61678
|
||||||
name: metrics
|
name: metrics
|
||||||
|
|
@ -219,7 +223,7 @@ spec:
|
||||||
value: "{{ ClusterName }}"
|
value: "{{ ClusterName }}"
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 10m
|
cpu: 25m
|
||||||
securityContext:
|
securityContext:
|
||||||
capabilities:
|
capabilities:
|
||||||
add:
|
add:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue