Restore workaround for kustomize bug

This commit is contained in:
Stefan Reimer 2020-07-02 16:51:51 +01:00
parent a4f49d3b06
commit 6579c4668d
4 changed files with 3812 additions and 7 deletions

View File

@ -1,5 +1,11 @@
# Calico CNI
## Known issues
Due to a bug in Kustomize V2 vs. V3 we have to remove all namespaces from the base resources.
The kube-system namespace will be applied by kustomize.
See eg: `https://github.com/kubernetes-sigs/kustomize/issues/1351`
## Upgrade
See: https://docs.projectcalico.org/maintenance/kubernetes-upgrade
`wget https://docs.projectcalico.org/manifests/canal.yaml`
`curl https://docs.projectcalico.org/manifests/canal.yaml -O && patch < remove-namespace.patch`

View File

@ -5,7 +5,6 @@ kind: ConfigMap
apiVersion: v1
metadata:
name: canal-config
namespace: kube-system
data:
# Typha is disabled.
typha_service_name: "none"
@ -3438,7 +3437,6 @@ kind: DaemonSet
apiVersion: apps/v1
metadata:
name: canal
namespace: kube-system
labels:
k8s-app: canal
spec:
@ -3683,7 +3681,6 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: canal
namespace: kube-system
---
# Source: calico/templates/calico-kube-controllers.yaml
@ -3692,7 +3689,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: calico-kube-controllers
namespace: kube-system
labels:
k8s-app: calico-kube-controllers
spec:
@ -3706,7 +3702,6 @@ spec:
template:
metadata:
name: calico-kube-controllers
namespace: kube-system
labels:
k8s-app: calico-kube-controllers
spec:
@ -3741,7 +3736,6 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: calico-kube-controllers
namespace: kube-system
---
# Source: calico/templates/calico-etcd-secrets.yaml

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,50 @@
--- canal.yaml.orig 2020-06-03 15:39:41.972295775 +0100
+++ canal.yaml 2020-06-03 15:39:59.718477177 +0100
@@ -5,7 +5,6 @@
apiVersion: v1
metadata:
name: canal-config
- namespace: kube-system
data:
# Typha is disabled.
typha_service_name: "none"
@@ -536,7 +535,6 @@
apiVersion: apps/v1
metadata:
name: canal
- namespace: kube-system
labels:
k8s-app: canal
spec:
@@ -781,7 +779,6 @@
kind: ServiceAccount
metadata:
name: canal
- namespace: kube-system
---
# Source: calico/templates/calico-kube-controllers.yaml
@@ -790,7 +787,6 @@
kind: Deployment
metadata:
name: calico-kube-controllers
- namespace: kube-system
labels:
k8s-app: calico-kube-controllers
spec:
@@ -804,7 +800,6 @@
template:
metadata:
name: calico-kube-controllers
- namespace: kube-system
labels:
k8s-app: calico-kube-controllers
annotations:
@@ -841,7 +836,6 @@
kind: ServiceAccount
metadata:
name: calico-kube-controllers
- namespace: kube-system
---
# Source: calico/templates/calico-etcd-secrets.yaml