github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #64897 from caseydavenport/fix-calico-crds

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 64889, 64897). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Don't specify a description for Calico CRDs

**What this PR does / why we need it**:

CRDs have lost the "description" field, so as it stands these won't validate. This is needed to allow Calico to function again. 

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-06-07 20:18:11 -07:00 committed by GitHub
commit a7a081b541
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/addons/calico-policy-controller/globalbgpconfig-crd.yaml
View File

@ -1,5 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
description: Calico Global BGP Configuration
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: globalbgpconfigs.crd.projectcalico.org name: globalbgpconfigs.crd.projectcalico.org

1
cluster/addons/calico-policy-controller/globalfelixconfig-crd.yaml
View File

@ -1,5 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
description: Calico Global Felix Configuration
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: globalfelixconfigs.crd.projectcalico.org name: globalfelixconfigs.crd.projectcalico.org

1
cluster/addons/calico-policy-controller/globalnetworkpolicy-crd.yaml
View File

@ -1,5 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
description: Calico Global Network Policies
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: globalnetworkpolicies.crd.projectcalico.org name: globalnetworkpolicies.crd.projectcalico.org

1
cluster/addons/calico-policy-controller/ippool-crd.yaml
View File

@ -1,5 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1beta1
description: Calico IP Pools
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: ippools.crd.projectcalico.org name: ippools.crd.projectcalico.org