Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
017df711
Unverified
Commit
017df711
authored
4 years ago
by
nurekage
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Patch Calico for V3.14.0 missing CR and CRD (#6276)
parent
00fe3d50
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-cr.yml.j2
+16
-0
16 additions, 0 deletions
.../policy_controller/calico/templates/calico-kube-cr.yml.j2
roles/network_plugin/calico/templates/kdd-crds.yml.j2
+15
-0
15 additions, 0 deletions
roles/network_plugin/calico/templates/kdd-crds.yml.j2
with
31 additions
and
0 deletions
roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-cr.yml.j2
+
16
−
0
View file @
017df711
...
@@ -57,6 +57,7 @@ rules:
...
@@ -57,6 +57,7 @@ rules:
- blockaffinities
- blockaffinities
- ipamblocks
- ipamblocks
- ipamhandles
- ipamhandles
- hostendpoints
verbs:
verbs:
- get
- get
- list
- list
...
@@ -72,3 +73,18 @@ rules:
...
@@ -72,3 +73,18 @@ rules:
- create
- create
- update
- update
{% endif %}
{% 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 %}
This diff is collapsed.
Click to expand it.
roles/network_plugin/calico/templates/kdd-crds.yml.j2
+
15
−
0
View file @
017df711
...
@@ -2740,3 +2740,18 @@ spec:
...
@@ -2740,3 +2740,18 @@ spec:
served: true
served: true
storage: true
storage: true
{% endif %}
{% 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 %}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment