Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix groups for fabric APIs #692

Merged
merged 1 commit into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/agent/v1beta1/agent_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions api/agent/v1beta1/catalog_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion api/dhcp/v1beta1/dhcpsubnet_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/vpc/v1beta1/ipv4namespace_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/wiring/v1beta1/serverprofile_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion config/crd/bases/agent.githedgehog.com_agents.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ spec:
names:
categories:
- hedgehog
- fabric
kind: Agent
listKind: AgentList
plural: agents
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/agent.githedgehog.com_catalogs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ metadata:
spec:
group: agent.githedgehog.com
names:
categories:
- hedgehog
kind: Catalog
listKind: CatalogList
plural: catalogs
Expand Down
1 change: 0 additions & 1 deletion config/crd/bases/dhcp.githedgehog.com_dhcpsubnets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ spec:
names:
categories:
- hedgehog
- fabric
kind: DHCPSubnet
listKind: DHCPSubnetList
plural: dhcpsubnets
Expand Down
1 change: 0 additions & 1 deletion config/crd/bases/vpc.githedgehog.com_ipv4namespaces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ spec:
names:
categories:
- hedgehog
- wiring
- fabric
kind: IPv4Namespace
listKind: IPv4NamespaceList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ spec:
categories:
- hedgehog
- wiring
- fabric
kind: ServerProfile
listKind: ServerProfileList
plural: serverprofiles
Expand Down
Loading