From e22773bc302c53ca7a8df5489a6ba68b0e14a787 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Fri, 7 May 2021 13:43:44 -0700 Subject: [PATCH] Fix improperly formatted Calico CRD files --- .../bgpconfigurations-crd.yaml | 7 ++----- .../calico-policy-controller/bgppeers-crd.yaml | 7 ++----- .../blockaffinity-crd.yaml | 7 ++----- .../clusterinformations-crd.yaml | 7 ++----- .../felixconfigurations-crd.yaml | 7 ++----- .../globalnetworkpolicy-crd.yaml | 7 ++----- .../globalnetworksets-crd.yaml | 7 ++----- .../hostendpoints-crd.yaml | 7 ++----- .../calico-policy-controller/ipamblock-crd.yaml | 17 ----------------- .../ipamconfig-crd.yaml | 7 ++----- .../ipamhandle-crd.yaml | 7 ++----- .../calico-policy-controller/ippool-crd.yaml | 7 ++----- .../kubecontrollersconfigurations-crd.yaml | 7 ++----- .../networkpolicies-crd.yaml | 7 ++----- .../networkset-crd.yaml | 7 ++----- 15 files changed, 28 insertions(+), 87 deletions(-) diff --git a/cluster/addons/calico-policy-controller/bgpconfigurations-crd.yaml b/cluster/addons/calico-policy-controller/bgpconfigurations-crd.yaml index aa5056ab324..5913a885f85 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/bgppeers-crd.yaml b/cluster/addons/calico-policy-controller/bgppeers-crd.yaml index 5553fdcb687..a7db643fb2d 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/blockaffinity-crd.yaml b/cluster/addons/calico-policy-controller/blockaffinity-crd.yaml index 1ae2e1b9287..49cea41819a 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/clusterinformations-crd.yaml b/cluster/addons/calico-policy-controller/clusterinformations-crd.yaml index 37c143db242..d245a38a0aa 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/felixconfigurations-crd.yaml b/cluster/addons/calico-policy-controller/felixconfigurations-crd.yaml index 8ed485f7be0..e2add59f40d 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/globalnetworkpolicy-crd.yaml b/cluster/addons/calico-policy-controller/globalnetworkpolicy-crd.yaml index 750ef675034..54f9fe055e6 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/globalnetworksets-crd.yaml b/cluster/addons/calico-policy-controller/globalnetworksets-crd.yaml index 122f3f3f457..7a700d69a51 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/hostendpoints-crd.yaml b/cluster/addons/calico-policy-controller/hostendpoints-crd.yaml index 3e1fc61777b..b9a1d85b264 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/ipamblock-crd.yaml b/cluster/addons/calico-policy-controller/ipamblock-crd.yaml index 5bd3cb9fdff..18a76b225f9 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/ipamconfig-crd.yaml b/cluster/addons/calico-policy-controller/ipamconfig-crd.yaml index 78c3c6bf274..d51ce6e7f07 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/ipamhandle-crd.yaml b/cluster/addons/calico-policy-controller/ipamhandle-crd.yaml index 935900bf79f..c7663c3b503 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/ippool-crd.yaml b/cluster/addons/calico-policy-controller/ippool-crd.yaml index de322f3f75a..46e24a959a1 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/kubecontrollersconfigurations-crd.yaml b/cluster/addons/calico-policy-controller/kubecontrollersconfigurations-crd.yaml index fd0434fb69c..7609fb8822b 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/networkpolicies-crd.yaml b/cluster/addons/calico-policy-controller/networkpolicies-crd.yaml index 675d2394fba..11fc9ee6932 100644 --- 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 diff --git a/cluster/addons/calico-policy-controller/networkset-crd.yaml b/cluster/addons/calico-policy-controller/networkset-crd.yaml index e5b10803e04..0793a040c84 100644 --- 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