From 8cc45f5bc8aa393a2aca3eb5dee1ba467702dbd0 Mon Sep 17 00:00:00 2001 From: aggarwal0009 <127549148+aggarwal0009@users.noreply.github.com> Date: Thu, 24 Aug 2023 00:21:17 +0000 Subject: [PATCH] update swiftv2 crds scope --- crd/multitenancy/api/v1alpha1/multitenantpodnetworkconfig.go | 3 +-- crd/multitenancy/api/v1alpha1/nodeinfo.go | 4 +--- crd/multitenancy/api/v1alpha1/podnetwork.go | 3 +-- crd/multitenancy/api/v1alpha1/podnetworkinstance.go | 3 +-- ...ltitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml | 2 +- .../manifests/multitenancy.acn.azure.com_nodeinfo.yaml | 4 +++- .../multitenancy.acn.azure.com_podnetworkinstances.yaml | 2 +- .../manifests/multitenancy.acn.azure.com_podnetworks.yaml | 2 +- 8 files changed, 10 insertions(+), 13 deletions(-) diff --git a/crd/multitenancy/api/v1alpha1/multitenantpodnetworkconfig.go b/crd/multitenancy/api/v1alpha1/multitenantpodnetworkconfig.go index f3829f1d27..85963a9b4f 100644 --- a/crd/multitenancy/api/v1alpha1/multitenantpodnetworkconfig.go +++ b/crd/multitenancy/api/v1alpha1/multitenantpodnetworkconfig.go @@ -12,8 +12,7 @@ import ( // +kubebuilder:object:root=true // MultitenantPodNetworkConfig is the Schema for the multitenantpodnetworkconfigs API -// +kubebuilder:resource:scope=Namespaced -// +kubebuilder:resource:shortName=mtpnc +// +kubebuilder:resource:shortName=mtpnc,scope=Cluster // +kubebuilder:subresource:status // +kubebuilder:metadata:labels=managed= // +kubebuilder:metadata:labels=owner= diff --git a/crd/multitenancy/api/v1alpha1/nodeinfo.go b/crd/multitenancy/api/v1alpha1/nodeinfo.go index 58701fabf7..7f14ecf3c4 100644 --- a/crd/multitenancy/api/v1alpha1/nodeinfo.go +++ b/crd/multitenancy/api/v1alpha1/nodeinfo.go @@ -12,9 +12,7 @@ import ( // +kubebuilder:object:root=true // NodeInfo is the Schema for the NodeInfo API -// +kubebuilder:resource:scope=Namespaced -// +kubebuilder:resource:shortName=ni -// +kubebuilder:resource:path=nodeinfo +// +kubebuilder:resource:shortName=ni,scope=Cluster,path=nodeinfo // +kubebuilder:printcolumn:name="VMUniqueID",type=string,priority=0,JSONPath=`.spec.vmUniqueID` type NodeInfo struct { metav1.TypeMeta `json:",inline"` diff --git a/crd/multitenancy/api/v1alpha1/podnetwork.go b/crd/multitenancy/api/v1alpha1/podnetwork.go index 273bdfcbc7..ac41d98bfd 100644 --- a/crd/multitenancy/api/v1alpha1/podnetwork.go +++ b/crd/multitenancy/api/v1alpha1/podnetwork.go @@ -12,8 +12,7 @@ import ( // +kubebuilder:object:root=true // PodNetwork is the Schema for the PodNetworks API -// +kubebuilder:resource:scope=Namespaced -// +kubebuilder:resource:shortName=pn +// +kubebuilder:resource:shortName=pn,scope=Cluster // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Status",type=string,priority=1,JSONPath=`.status.status` // +kubebuilder:printcolumn:name="Address Prefixes",type=string,priority=1,JSONPath=`.status.addressPrefixes` diff --git a/crd/multitenancy/api/v1alpha1/podnetworkinstance.go b/crd/multitenancy/api/v1alpha1/podnetworkinstance.go index 1d0edfaa49..9eb9836fc1 100644 --- a/crd/multitenancy/api/v1alpha1/podnetworkinstance.go +++ b/crd/multitenancy/api/v1alpha1/podnetworkinstance.go @@ -12,8 +12,7 @@ import ( // +kubebuilder:object:root=true // PodNetworkInstance is the Schema for the PodNetworkInstances API -// +kubebuilder:resource:scope=Namespaced -// +kubebuilder:resource:shortName=pni +// +kubebuilder:resource:shortName=pni,scope=Cluster // +kubebuilder:subresource:status // +kubebuilder:metadata:labels=managed= // +kubebuilder:metadata:labels=owner= diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml index 81ce36cc91..fe93b0bcbb 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml @@ -17,7 +17,7 @@ spec: shortNames: - mtpnc singular: multitenantpodnetworkconfig - scope: Namespaced + scope: Cluster versions: - additionalPrinterColumns: - jsonPath: .spec.podNetworkInstance diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml index bdbf83b37a..edbacac336 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml @@ -11,8 +11,10 @@ spec: kind: NodeInfo listKind: NodeInfoList plural: nodeinfo + shortNames: + - ni singular: nodeinfo - scope: Namespaced + scope: Cluster versions: - additionalPrinterColumns: - jsonPath: .spec.vmUniqueID diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml index 0c9e7c1112..0b51d7a38e 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml @@ -17,7 +17,7 @@ spec: shortNames: - pni singular: podnetworkinstance - scope: Namespaced + scope: Cluster versions: - additionalPrinterColumns: - jsonPath: .status.podIPAddresses diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml index 4bd40395d2..d8c26d0b22 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml @@ -14,7 +14,7 @@ spec: shortNames: - pn singular: podnetwork - scope: Namespaced + scope: Cluster versions: - additionalPrinterColumns: - jsonPath: .status.status