From d588b41e648e04cb9a6a114f5bc365494270aaa7 Mon Sep 17 00:00:00 2001 From: Sergei Lukianov Date: Mon, 9 Dec 2024 11:00:44 -0800 Subject: [PATCH] Fix groups for fabric APIs --- api/agent/v1beta1/agent_types.go | 2 +- api/agent/v1beta1/catalog_types.go | 6 +++--- api/dhcp/v1beta1/dhcpsubnet_types.go | 2 +- api/vpc/v1beta1/ipv4namespace_types.go | 2 +- api/wiring/v1beta1/serverprofile_types.go | 2 +- config/crd/bases/agent.githedgehog.com_agents.yaml | 1 - config/crd/bases/agent.githedgehog.com_catalogs.yaml | 2 ++ config/crd/bases/dhcp.githedgehog.com_dhcpsubnets.yaml | 1 - config/crd/bases/vpc.githedgehog.com_ipv4namespaces.yaml | 1 - config/crd/bases/wiring.githedgehog.com_serverprofiles.yaml | 1 + 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/agent/v1beta1/agent_types.go b/api/agent/v1beta1/agent_types.go index bc6732f5..4d3aa389 100644 --- a/api/agent/v1beta1/agent_types.go +++ b/api/agent/v1beta1/agent_types.go @@ -505,7 +505,7 @@ type SwitchStateCRMStats struct { // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories=hedgehog;fabric,shortName=ag +// +kubebuilder:resource:categories=hedgehog,shortName=ag // +kubebuilder:printcolumn:name="Role",type=string,JSONPath=`.spec.role`,priority=0 // +kubebuilder:printcolumn:name="Descr",type=string,JSONPath=`.spec.description`,priority=0 // +kubebuilder:printcolumn:name="HWSKU",type=string,JSONPath=`.status.state.nos.hwskuVersion`,priority=1 diff --git a/api/agent/v1beta1/catalog_types.go b/api/agent/v1beta1/catalog_types.go index 2b08bb9d..17680b6d 100644 --- a/api/agent/v1beta1/catalog_types.go +++ b/api/agent/v1beta1/catalog_types.go @@ -53,9 +53,9 @@ type CatalogSpec struct { // CatalogStatus defines the observed state of Catalog type CatalogStatus struct{} -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status - +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:resource:categories=hedgehog // Catalog is the Schema for the catalogs API type Catalog struct { metav1.TypeMeta `json:",inline"` diff --git a/api/dhcp/v1beta1/dhcpsubnet_types.go b/api/dhcp/v1beta1/dhcpsubnet_types.go index e5dba353..e9fb1f6b 100644 --- a/api/dhcp/v1beta1/dhcpsubnet_types.go +++ b/api/dhcp/v1beta1/dhcpsubnet_types.go @@ -72,7 +72,7 @@ type DHCPAllocated struct { // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories=hedgehog;fabric,shortName=dhcp +// +kubebuilder:resource:categories=hedgehog,shortName=dhcp // +kubebuilder:printcolumn:name="Subnet",type=string,JSONPath=`.spec.subnet`,priority=0 // +kubebuilder:printcolumn:name="CIDRBlock",type=string,JSONPath=`.spec.cidrBlock`,priority=0 // +kubebuilder:printcolumn:name="Gateway",type=string,JSONPath=`.spec.gateway`,priority=0 diff --git a/api/vpc/v1beta1/ipv4namespace_types.go b/api/vpc/v1beta1/ipv4namespace_types.go index 3f6b34fe..9c619568 100644 --- a/api/vpc/v1beta1/ipv4namespace_types.go +++ b/api/vpc/v1beta1/ipv4namespace_types.go @@ -44,7 +44,7 @@ type IPv4NamespaceStatus struct{} // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories=hedgehog;wiring;fabric,shortName=ipns +// +kubebuilder:resource:categories=hedgehog;fabric,shortName=ipns // +kubebuilder:printcolumn:name="Subnets",type=string,JSONPath=`.spec.subnets`,priority=0 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`,priority=0 // IPv4Namespace represents a namespace for VPC subnets allocation. All VPC subnets within a single IPv4Namespace are diff --git a/api/wiring/v1beta1/serverprofile_types.go b/api/wiring/v1beta1/serverprofile_types.go index 3b64b3a8..a4a14362 100644 --- a/api/wiring/v1beta1/serverprofile_types.go +++ b/api/wiring/v1beta1/serverprofile_types.go @@ -45,7 +45,7 @@ type ServerProfileStatus struct{} //+kubebuilder:object:root=true //+kubebuilder:subresource:status -//+kubebuilder:resource:categories=hedgehog;wiring +//+kubebuilder:resource:categories=hedgehog;wiring;fabric // ServerProfile is currently not used/implemented in the Fabric API type ServerProfile struct { diff --git a/config/crd/bases/agent.githedgehog.com_agents.yaml b/config/crd/bases/agent.githedgehog.com_agents.yaml index 3be89525..50a3df10 100644 --- a/config/crd/bases/agent.githedgehog.com_agents.yaml +++ b/config/crd/bases/agent.githedgehog.com_agents.yaml @@ -10,7 +10,6 @@ spec: names: categories: - hedgehog - - fabric kind: Agent listKind: AgentList plural: agents diff --git a/config/crd/bases/agent.githedgehog.com_catalogs.yaml b/config/crd/bases/agent.githedgehog.com_catalogs.yaml index e3802a95..e7866cf8 100644 --- a/config/crd/bases/agent.githedgehog.com_catalogs.yaml +++ b/config/crd/bases/agent.githedgehog.com_catalogs.yaml @@ -8,6 +8,8 @@ metadata: spec: group: agent.githedgehog.com names: + categories: + - hedgehog kind: Catalog listKind: CatalogList plural: catalogs diff --git a/config/crd/bases/dhcp.githedgehog.com_dhcpsubnets.yaml b/config/crd/bases/dhcp.githedgehog.com_dhcpsubnets.yaml index 5670282c..8001ae7f 100644 --- a/config/crd/bases/dhcp.githedgehog.com_dhcpsubnets.yaml +++ b/config/crd/bases/dhcp.githedgehog.com_dhcpsubnets.yaml @@ -10,7 +10,6 @@ spec: names: categories: - hedgehog - - fabric kind: DHCPSubnet listKind: DHCPSubnetList plural: dhcpsubnets diff --git a/config/crd/bases/vpc.githedgehog.com_ipv4namespaces.yaml b/config/crd/bases/vpc.githedgehog.com_ipv4namespaces.yaml index e6068524..8c513c62 100644 --- a/config/crd/bases/vpc.githedgehog.com_ipv4namespaces.yaml +++ b/config/crd/bases/vpc.githedgehog.com_ipv4namespaces.yaml @@ -10,7 +10,6 @@ spec: names: categories: - hedgehog - - wiring - fabric kind: IPv4Namespace listKind: IPv4NamespaceList diff --git a/config/crd/bases/wiring.githedgehog.com_serverprofiles.yaml b/config/crd/bases/wiring.githedgehog.com_serverprofiles.yaml index d0488f47..b1e3f74d 100644 --- a/config/crd/bases/wiring.githedgehog.com_serverprofiles.yaml +++ b/config/crd/bases/wiring.githedgehog.com_serverprofiles.yaml @@ -11,6 +11,7 @@ spec: categories: - hedgehog - wiring + - fabric kind: ServerProfile listKind: ServerProfileList plural: serverprofiles