Make the calico daemonset manifest pass validation in k8s 1.11
@@ -439,9 +439,8 @@ spec:
# Create all the CustomResourceDefinitions needed for
# Calico policy-only mode.
---
-
+# Calico Felix Configuration
apiVersion: apiextensions.k8s.io/v1beta1
-description: Calico Felix Configuration
kind: CustomResourceDefinition
metadata:
name: felixconfigurations.crd.projectcalico.org
@@ -457,9 +456,8 @@ spec:
singular: felixconfiguration
---
-
+# Calico BGP Configuration
apiVersion: apiextensions.k8s.io/v1beta1
-description: Calico BGP Configuration
kind: CustomResourceDefinition
metadata:
name: bgpconfigurations.crd.projectcalico.org
@@ -475,9 +473,8 @@ spec:
singular: bgpconfiguration
---
-
+# Calico IP Pools
apiVersion: apiextensions.k8s.io/v1beta1
-description: Calico IP Pools
kind: CustomResourceDefinition
metadata:
name: ippools.crd.projectcalico.org
@@ -493,9 +490,8 @@ spec:
singular: ippool
---
-
+# Calico Host Endpoints
apiVersion: apiextensions.k8s.io/v1beta1
-description: Calico Host Endpoints
kind: CustomResourceDefinition
metadata:
name: hostendpoints.crd.projectcalico.org
@@ -511,9 +507,8 @@ spec:
singular: hostendpoint
---
-
+# Calico Cluster Information
apiVersion: apiextensions.k8s.io/v1beta1
-description: Calico Cluster Information
kind: CustomResourceDefinition
metadata:
name: clusterinformations.crd.projectcalico.org
@@ -529,9 +524,8 @@ spec:
singular: clusterinformation
---
-
+# Calico Global Network Policies
apiVersion: apiextensions.k8s.io/v1beta1
-description: Calico Global Network Policies
kind: CustomResourceDefinition
metadata:
name: globalnetworkpolicies.crd.projectcalico.org
@@ -547,9 +541,8 @@ spec:
singular: globalnetworkpolicy
---
-
+# Calico Global Network Sets
apiVersion: apiextensions.k8s.io/v1beta1
-description: Calico Global Network Sets
kind: CustomResourceDefinition
metadata:
name: globalnetworksets.crd.projectcalico.org
@@ -565,9 +558,8 @@ spec:
singular: globalnetworkset
---
-
+# Calico Network Policies
apiVersion: apiextensions.k8s.io/v1beta1
-description: Calico Network Policies
kind: CustomResourceDefinition
metadata:
name: networkpolicies.crd.projectcalico.org
