Merge pull request karmada-io#4777 from RainbowMango/pr_fix_operator_…

…invalid_kubebuilder_marker Fixe invalid kubebuilder marker, that makes pinned plural name does not work.
whitewindmills · Mar 30, 2024 · 09b69dd · 09b69dd
2 parents c838612 + 8b9d86d
commit 09b69dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/charts/karmada-operator/crds/operator.karmada.io_karmadas.yaml b/charts/karmada-operator/crds/operator.karmada.io_karmadas.yaml
@@ -9,6 +9,8 @@ metadata:
 spec:
   group: operator.karmada.io
   names:
+    categories:
+    - karmada-io
     kind: Karmada
     listKind: KarmadaList
     plural: karmadas

diff --git a/operator/config/crds/operator.karmada.io_karmadas.yaml b/operator/config/crds/operator.karmada.io_karmadas.yaml
@@ -9,6 +9,8 @@ metadata:
 spec:
   group: operator.karmada.io
   names:
+    categories:
+    - karmada-io
     kind: Karmada
     listKind: KarmadaList
     plural: karmadas

diff --git a/operator/pkg/apis/operator/v1alpha1/type.go b/operator/pkg/apis/operator/v1alpha1/type.go
@@ -24,7 +24,7 @@ import (
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:subresource:status
-// +kubebuilder:path=karmadas,scope=Namespaced,categories={karmada-io}
+// +kubebuilder:resource:path=karmadas,scope=Namespaced,categories={karmada-io}
 // +kubebuilder:printcolumn:JSONPath=`.status.conditions[?(@.type=="Ready")].status`,name="Ready",type=string
 // +kubebuilder:printcolumn:JSONPath=`.metadata.creationTimestamp`,name="Age",type=date