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

Merge pull request #5905 from adammw/adammw/update-aws-cni-1.2.0 

Update amazon-vpc-routed-eni to v1.2.1
This commit is contained in:
k8s-ci-robot 2018-11-17 12:32:58 -08:00 committed by GitHub
parent 28d871f965 a737a1be09
commit ea97194f0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 95 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,21 @@
# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/release-1.0/config/v1.0/aws-k8s-cni.yaml # Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.2.0/config/v1.2/aws-k8s-cni.yaml
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: aws-node name: aws-node
rules: rules:
- apiGroups:
- crd.k8s.amazonaws.com
resources:
- "*"
- namespaces
verbs:
- "*"
- apiGroups: [""] - apiGroups: [""]
resources: resources:
- pods - pods
- nodes
- namespaces - namespaces
verbs: ["list", "watch", "get"] verbs: ["list", "watch", "get"]
- apiGroups: ["extensions"] - apiGroups: ["extensions"]
@ -69,7 +77,10 @@ spec:
- key: CriticalAddonsOnly - key: CriticalAddonsOnly
operator: Exists operator: Exists
containers: containers:
- image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.0.0" }}" - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.2.1" }}"
ports:
- containerPort: 60000
name: metrics
name: aws-node name: aws-node
env: env:
- name: AWS_VPC_K8S_CNI_LOGLEVEL - name: AWS_VPC_K8S_CNI_LOGLEVEL
@ -78,6 +89,10 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
resources: resources:
requests: requests:
cpu: 10m cpu: 10m
@ -106,3 +121,17 @@ spec:
hostPath: hostPath:
path: /var/run/docker.sock path: /var/run/docker.sock
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: eniconfigs.crd.k8s.amazonaws.com
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
version: v1alpha1
names:
scope: Cluster
plural: eniconfigs
singuar: eniconfig
kind: ENIConfig

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

@ -1,13 +1,21 @@
# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/release-1.0/config/v1.0/aws-k8s-cni.yaml # Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.2.0/config/v1.2/aws-k8s-cni.yaml
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: aws-node name: aws-node
rules: rules:
- apiGroups:
- crd.k8s.amazonaws.com
resources:
- "*"
- namespaces
verbs:
- "*"
- apiGroups: [""] - apiGroups: [""]
resources: resources:
- pods - pods
- nodes
- namespaces - namespaces
verbs: ["list", "watch", "get"] verbs: ["list", "watch", "get"]
- apiGroups: ["extensions"] - apiGroups: ["extensions"]
@ -69,7 +77,10 @@ spec:
- key: CriticalAddonsOnly - key: CriticalAddonsOnly
operator: Exists operator: Exists
containers: containers:
- image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.0.0" }}" - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.2.1" }}"
ports:
- containerPort: 60000
name: metrics
name: aws-node name: aws-node
env: env:
- name: AWS_VPC_K8S_CNI_LOGLEVEL - name: AWS_VPC_K8S_CNI_LOGLEVEL
@ -78,6 +89,10 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
resources: resources:
requests: requests:
cpu: 10m cpu: 10m
@ -106,6 +121,21 @@ spec:
hostPath: hostPath:
path: /var/run/docker.sock path: /var/run/docker.sock
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: eniconfigs.crd.k8s.amazonaws.com
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
version: v1alpha1
names:
scope: Cluster
plural: eniconfigs
singuar: eniconfig
kind: ENIConfig
--- ---
kind: ClusterRole kind: ClusterRole

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

@ -1,13 +1,21 @@
# Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/release-1.0/config/v1.0/aws-k8s-cni.yaml # Vendored from https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.2.0/config/v1.2/aws-k8s-cni.yaml
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: aws-node name: aws-node
rules: rules:
- apiGroups:
- crd.k8s.amazonaws.com
resources:
- "*"
- namespaces
verbs:
- "*"
- apiGroups: [""] - apiGroups: [""]
resources: resources:
- pods - pods
- nodes
- namespaces - namespaces
verbs: ["list", "watch", "get"] verbs: ["list", "watch", "get"]
- apiGroups: ["extensions"] - apiGroups: ["extensions"]
@ -69,7 +77,10 @@ spec:
- key: CriticalAddonsOnly - key: CriticalAddonsOnly
operator: Exists operator: Exists
containers: containers:
- image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.0.0" }}" - image: "{{- or .Networking.AmazonVPC.ImageName "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.2.1" }}"
ports:
- containerPort: 60000
name: metrics
name: aws-node name: aws-node
env: env:
- name: AWS_VPC_K8S_CNI_LOGLEVEL - name: AWS_VPC_K8S_CNI_LOGLEVEL
@ -78,6 +89,10 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
resources: resources:
requests: requests:
cpu: 10m cpu: 10m
@ -106,6 +121,21 @@ spec:
hostPath: hostPath:
path: /var/run/docker.sock path: /var/run/docker.sock
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: eniconfigs.crd.k8s.amazonaws.com
spec:
scope: Cluster
group: crd.k8s.amazonaws.com
version: v1alpha1
names:
scope: Cluster
plural: eniconfigs
singuar: eniconfig
kind: ENIConfig
--- ---
kind: ClusterRole kind: ClusterRole