Merge pull request #117 from vincepri/fixup-crds

k8s-ci-robot · web-flow · commit e26ae10b956e · 2019-08-13T01:43:41.000-07:00
Add kubebuilder markers to CRDs for status and namespace
diff --git a/api/v1alpha2/kubeadmbootstrapconfig_types.go b/api/v1alpha2/kubeadmbootstrapconfig_types.go
@@ -49,6 +49,9 @@ type KubeadmConfigStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:path=kubeadmconfigs,scope=Namespaced
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
 
 // KubeadmConfig is the Schema for the kubeadmconfigs API
 type KubeadmConfig struct {
diff --git a/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
@@ -10,7 +10,9 @@ spec:
   names:
     kind: KubeadmConfig
     plural: kubeadmconfigs
-  scope: ""
+  scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: KubeadmConfig is the Schema for the kubeadmconfigs API

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ type KubeadmConfigStatus struct {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`// +kubebuilder:object:root=true`
	`52`	`+// +kubebuilder:resource:path=kubeadmconfigs,scope=Namespaced`
	`53`	`+// +kubebuilder:storageversion`
	`54`	`+// +kubebuilder:subresource:status`
`52`	`55`
`53`	`56`	`// KubeadmConfig is the Schema for the kubeadmconfigs API`
`54`	`57`	`type KubeadmConfig struct {`