From 017df7113ddb88d6d325b2149541491bd4531a4a Mon Sep 17 00:00:00 2001
From: nurekage <egan.merinodonahue@orange.com>
Date: Wed, 1 Jul 2020 17:44:16 +0200
Subject: [PATCH] Patch Calico for V3.14.0 missing CR and CRD (#6276)
---
.../calico/templates/calico-kube-cr.yml.j2 | 16 ++++++++++++++++
.../calico/templates/kdd-crds.yml.j2 | 15 +++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-cr.yml.j2 b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-cr.yml.j2
index 5f5a9586c..47507b9f6 100644
--- a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-cr.yml.j2
+++ b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-cr.yml.j2
@@ -57,6 +57,7 @@ rules:
- blockaffinities
- ipamblocks
- ipamhandles
+ - hostendpoints
verbs:
- get
- list
@@ -72,3 +73,18 @@ rules:
- create
- update
{% endif %}
+{% if calico_version is version('v3.14.0', '>=') %}
+ # KubeControllersConfiguration is where it gets its config
+ - apiGroups: ["crd.projectcalico.org"]
+ resources:
+ - kubecontrollersconfigurations
+ verbs:
+ # read its own config
+ - get
+ # create a default if none exists
+ - create
+ # update status
+ - update
+ # watch for changes
+ - watch
+{% endif %}
diff --git a/roles/network_plugin/calico/templates/kdd-crds.yml.j2 b/roles/network_plugin/calico/templates/kdd-crds.yml.j2
index d4725f828..4eb4a5817 100644
--- a/roles/network_plugin/calico/templates/kdd-crds.yml.j2
+++ b/roles/network_plugin/calico/templates/kdd-crds.yml.j2
@@ -2740,3 +2740,18 @@ spec:
served: true
storage: true
{% endif %}
+{% if calico_version is version('v3.14.0', '>=') %}
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: kubecontrollersconfigurations.crd.projectcalico.org
+spec:
+ scope: Cluster
+ group: crd.projectcalico.org
+ version: v1
+ names:
+ kind: KubeControllersConfiguration
+ plural: kubecontrollersconfigurations
+ singular: kubecontrollersconfiguration
+{% endif %}
--
GitLab