From 43652ec9ccac780853c5461af2857ad403dab4d4e0079ea71ce6858f9497246b Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Thu, 10 Oct 2019 13:46:15 +0000 Subject: [PATCH 1/4] 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 --- flannel.changes | 5 +++ kube-flannel.yaml | 102 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 91 insertions(+), 16 deletions(-) diff --git a/flannel.changes b/flannel.changes index 966873b..069d692 100644 --- a/flannel.changes +++ b/flannel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 10 13:45:11 UTC 2019 - Richard Brown + +- Update flannel manifest to match upstream and support k8s 1.16 API + ------------------------------------------------------------------- Fri Jul 19 10:56:20 CEST 2019 - kukuk@suse.de diff --git a/kube-flannel.yaml b/kube-flannel.yaml index f35580a..1232b1d 100644 --- a/kube-flannel.yaml +++ b/kube-flannel.yaml @@ -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 From 69d40e236a3f395e7888f61d9fd8b618ab0aa3432630d0fbedabf9176623c074 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Thu, 10 Oct 2019 15:03:37 +0000 Subject: [PATCH 2/4] fix typo OBS-URL: https://build.opensuse.org/package/show/devel:kubic/flannel?expand=0&rev=7 --- kube-flannel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kube-flannel.yaml b/kube-flannel.yaml index 1232b1d..6dbd464 100644 --- a/kube-flannel.yaml +++ b/kube-flannel.yaml @@ -131,7 +131,7 @@ data: } } --- -apiVersion: policy/v1beta1 +apiVersion: apps/v1beta1 kind: DaemonSet metadata: name: kube-flannel-ds-amd64 From 2009a2f97dcf6e65d52da856c038e8f2c566fbd672080678dc1c6e1388709119 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Thu, 10 Oct 2019 15:03:52 +0000 Subject: [PATCH 3/4] fix typo OBS-URL: https://build.opensuse.org/package/show/devel:kubic/flannel?expand=0&rev=8 --- flannel.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/flannel.changes b/flannel.changes index 069d692..455c37f 100644 --- a/flannel.changes +++ b/flannel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 10 15:03:40 UTC 2019 - Richard Brown + +- Fix typo in updated flannel manifest + ------------------------------------------------------------------- Thu Oct 10 13:45:11 UTC 2019 - Richard Brown From 6d6666ab6a720bcfdf6406aa041b117c623b6e1bf7ee437fce259ee35eeb145c Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Fri, 11 Oct 2019 08:29:22 +0000 Subject: [PATCH 4/4] Accepting request 737413 from home:favogt:branches:devel:kubic - It's apps/v1, not apps/v1beta1 - Fix some more typos Tested, works. OBS-URL: https://build.opensuse.org/request/show/737413 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/flannel?expand=0&rev=9 --- flannel.changes | 6 ++++++ kube-flannel.yaml | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/flannel.changes b/flannel.changes index 455c37f..d02bb16 100644 --- a/flannel.changes +++ b/flannel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 11 07:46:20 UTC 2019 - Fabian Vogt + +- It's apps/v1, not apps/v1beta1 +- Fix some more typos + ------------------------------------------------------------------- Thu Oct 10 15:03:40 UTC 2019 - Richard Brown diff --git a/kube-flannel.yaml b/kube-flannel.yaml index 6dbd464..e561d8d 100644 --- a/kube-flannel.yaml +++ b/kube-flannel.yaml @@ -131,7 +131,7 @@ data: } } --- -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: kube-flannel-ds-amd64 @@ -225,7 +225,7 @@ spec: configMap: name: kube-flannel-cfg --- -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: kube-flannel-ds-arm64 @@ -243,7 +243,7 @@ spec: tier: node app: flannel spec: - affinity: + affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: @@ -319,7 +319,7 @@ spec: configMap: name: kube-flannel-cfg --- -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: kube-flannel-ds-arm @@ -337,7 +337,7 @@ spec: tier: node app: flannel spec: - affinity: + affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: @@ -413,7 +413,7 @@ spec: configMap: name: kube-flannel-cfg --- -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: kube-flannel-ds-ppc64le @@ -507,7 +507,7 @@ spec: configMap: name: kube-flannel-cfg --- -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: kube-flannel-ds-s390x