Accepting request 737038 from home:RBrownSUSE:branches:devel:kubic

- Update flannel manifest to match upstream and support k8s 1.16 API

OBS-URL: https://build.opensuse.org/request/show/737038
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/flannel?expand=0&rev=6
This commit is contained in:
Richard Brown 2019-10-10 13:46:15 +00:00 committed by Git OBS Bridge
parent d6812b2ef2
commit 43652ec9cc
2 changed files with 91 additions and 16 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 10 13:45:11 UTC 2019 - Richard Brown <rbrown@suse.com>
- Update flannel manifest to match upstream and support k8s 1.16 API
-------------------------------------------------------------------
Fri Jul 19 10:56:20 CEST 2019 - kukuk@suse.de

View File

@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: policy/v1beta1
kind: PodSecurityPolicy
metadata:
name: psp.flannel.unprivileged
@ -131,7 +131,7 @@ data:
}
}
---
apiVersion: extensions/v1beta1
apiVersion: policy/v1beta1
kind: DaemonSet
metadata:
name: kube-flannel-ds-amd64
@ -140,15 +140,29 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
app: flannel
template:
metadata:
labels:
tier: node
app: flannel
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: beta.kubernetes.io/os
operator: In
values:
- linux
- key: beta.kubernetes.io/arch
operator: In
values:
- amd64
hostNetwork: true
nodeSelector:
beta.kubernetes.io/arch: amd64
tolerations:
- operator: Exists
effect: NoSchedule
@ -211,7 +225,7 @@ spec:
configMap:
name: kube-flannel-cfg
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1beta1
kind: DaemonSet
metadata:
name: kube-flannel-ds-arm64
@ -220,15 +234,29 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
app: flannel
template:
metadata:
labels:
tier: node
app: flannel
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: beta.kubernetes.io/os
operator: In
values:
- linux
- key: beta.kubernetes.io/arch
operator: In
values:
- arm64
hostNetwork: true
nodeSelector:
beta.kubernetes.io/arch: arm64
tolerations:
- operator: Exists
effect: NoSchedule
@ -291,7 +319,7 @@ spec:
configMap:
name: kube-flannel-cfg
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1beta1
kind: DaemonSet
metadata:
name: kube-flannel-ds-arm
@ -300,15 +328,29 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
app: flannel
template:
metadata:
labels:
tier: node
app: flannel
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: beta.kubernetes.io/os
operator: In
values:
- linux
- key: beta.kubernetes.io/arch
operator: In
values:
- arm
hostNetwork: true
nodeSelector:
beta.kubernetes.io/arch: arm
tolerations:
- operator: Exists
effect: NoSchedule
@ -371,7 +413,7 @@ spec:
configMap:
name: kube-flannel-cfg
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1beta1
kind: DaemonSet
metadata:
name: kube-flannel-ds-ppc64le
@ -380,15 +422,29 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
app: flannel
template:
metadata:
labels:
tier: node
app: flannel
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: beta.kubernetes.io/os
operator: In
values:
- linux
- key: beta.kubernetes.io/arch
operator: In
values:
- ppc64le
hostNetwork: true
nodeSelector:
beta.kubernetes.io/arch: ppc64le
tolerations:
- operator: Exists
effect: NoSchedule
@ -451,7 +507,7 @@ spec:
configMap:
name: kube-flannel-cfg
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1beta1
kind: DaemonSet
metadata:
name: kube-flannel-ds-s390x
@ -460,15 +516,29 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
app: flannel
template:
metadata:
labels:
tier: node
app: flannel
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: beta.kubernetes.io/os
operator: In
values:
- linux
- key: beta.kubernetes.io/arch
operator: In
values:
- s390x
hostNetwork: true
nodeSelector:
beta.kubernetes.io/arch: s390x
tolerations:
- operator: Exists
effect: NoSchedule