Fix improperly formatted Calico CRD files

2025-11-03 19:58:17 +00:00 · 2021-05-07 13:43:44 -07:00
parent c224ca7674
commit e22773bc30
15 changed files with 28 additions and 87 deletions
--- a/cluster/addons/calico-policy-controller/bgpconfigurations-crd.yaml
+++ b/cluster/addons/calico-policy-controller/bgpconfigurations-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: bgpconfigurations.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/bgppeers-crd.yaml
+++ b/cluster/addons/calico-policy-controller/bgppeers-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: bgppeers.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/blockaffinity-crd.yaml
+++ b/cluster/addons/calico-policy-controller/blockaffinity-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: blockaffinities.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/clusterinformations-crd.yaml
+++ b/cluster/addons/calico-policy-controller/clusterinformations-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: clusterinformations.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/felixconfigurations-crd.yaml
+++ b/cluster/addons/calico-policy-controller/felixconfigurations-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: felixconfigurations.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/globalnetworkpolicy-crd.yaml
+++ b/cluster/addons/calico-policy-controller/globalnetworkpolicy-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: globalnetworkpolicies.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/globalnetworksets-crd.yaml
+++ b/cluster/addons/calico-policy-controller/globalnetworksets-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: globalnetworksets.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/hostendpoints-crd.yaml
+++ b/cluster/addons/calico-policy-controller/hostendpoints-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: hostendpoints.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/ipamblock-crd.yaml
+++ b/cluster/addons/calico-policy-controller/ipamblock-crd.yaml
@@ -1,25 +1,8 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ipamblocks.crd.projectcalico.org
  labels:
    addonmanager.kubernetes.io/mode: Reconcile
-spec:
-  scope: Cluster
-  group: crd.projectcalico.org
-  version: v1
-  names:
-    kind: IPAMBlock
-    plural: ipamblocks
-    singular: ipamblock
-
---
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
  name: ipamblocks.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/ipamconfig-crd.yaml
+++ b/cluster/addons/calico-policy-controller/ipamconfig-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: ipamconfigs.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/ipamhandle-crd.yaml
+++ b/cluster/addons/calico-policy-controller/ipamhandle-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: ipamhandles.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/ippool-crd.yaml
+++ b/cluster/addons/calico-policy-controller/ippool-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: ippools.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/kubecontrollersconfigurations-crd.yaml
+++ b/cluster/addons/calico-policy-controller/kubecontrollersconfigurations-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/networkpolicies-crd.yaml
+++ b/cluster/addons/calico-policy-controller/networkpolicies-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: networkpolicies.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org
--- a/cluster/addons/calico-policy-controller/networkset-crd.yaml
+++ b/cluster/addons/calico-policy-controller/networkset-crd.yaml
@@ -1,11 +1,8 @@
-
---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
  name: networksets.crd.projectcalico.org
 spec:
  group: crd.projectcalico.org