mirror of https://github.com/kubernetes/kops.git
bump aws cni to 1.13.4
This commit is contained in:
parent
fc30975eba
commit
6be49cb697
|
@ -33,7 +33,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.13.2"
|
app.kubernetes.io/version: "v1.13.4"
|
||||||
---
|
---
|
||||||
# Source: aws-vpc-cni/templates/clusterrole.yaml
|
# Source: aws-vpc-cni/templates/clusterrole.yaml
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
@ -44,7 +44,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.13.2"
|
app.kubernetes.io/version: "v1.13.4"
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- crd.k8s.amazonaws.com
|
- crd.k8s.amazonaws.com
|
||||||
|
@ -70,10 +70,6 @@ rules:
|
||||||
resources:
|
resources:
|
||||||
- nodes
|
- nodes
|
||||||
verbs: ["list", "watch", "get", "update"]
|
verbs: ["list", "watch", "get", "update"]
|
||||||
- apiGroups: ["extensions"]
|
|
||||||
resources:
|
|
||||||
- '*'
|
|
||||||
verbs: ["list", "watch"]
|
|
||||||
- apiGroups: ["", "events.k8s.io"]
|
- apiGroups: ["", "events.k8s.io"]
|
||||||
resources:
|
resources:
|
||||||
- events
|
- events
|
||||||
|
@ -88,7 +84,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.13.2"
|
app.kubernetes.io/version: "v1.13.4"
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
@ -108,7 +104,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.13.2"
|
app.kubernetes.io/version: "v1.13.4"
|
||||||
spec:
|
spec:
|
||||||
updateStrategy:
|
updateStrategy:
|
||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
|
@ -129,7 +125,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.13.2" }}"
|
image: "{{- or .Networking.AmazonVPC.InitImage "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.13.4" }}"
|
||||||
env:
|
env:
|
||||||
- name: DISABLE_TCP_EARLY_DEMUX
|
- name: DISABLE_TCP_EARLY_DEMUX
|
||||||
value: "false"
|
value: "false"
|
||||||
|
@ -154,7 +150,7 @@ spec:
|
||||||
{{ end }}
|
{{ end }}
|
||||||
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.13.2" }}"
|
image: "{{- or .Networking.AmazonVPC.Image "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.13.4" }}"
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 61678
|
- containerPort: 61678
|
||||||
name: metrics
|
name: metrics
|
||||||
|
|
Loading…
Reference in New Issue