From 8f1fcd32923a95fdaeea1ec60e3b4736054349f5 Mon Sep 17 00:00:00 2001 From: Michal Fojtik Date: Wed, 27 Nov 2019 13:29:07 +0100 Subject: [PATCH 1/2] operator: add description for spec and status --- operator/v1/types_kubeapiserver.go | 3 +++ operator/v1/types_kubecontrollermanager.go | 3 +++ operator/v1/types_scheduler.go | 3 +++ 3 files changed, 9 insertions(+) diff --git a/operator/v1/types_kubeapiserver.go b/operator/v1/types_kubeapiserver.go index d2c4ae04d75..cd657c55424 100644 --- a/operator/v1/types_kubeapiserver.go +++ b/operator/v1/types_kubeapiserver.go @@ -13,9 +13,12 @@ type KubeAPIServer struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` + // spec is the specification of the desired behavior of the Kubernetes API Server // +kubebuilder:validation:Required // +required Spec KubeAPIServerSpec `json:"spec"` + + // status is the most recently observed status of the Kubernetes API Server // +optional Status KubeAPIServerStatus `json:"status"` } diff --git a/operator/v1/types_kubecontrollermanager.go b/operator/v1/types_kubecontrollermanager.go index ee5c66cadb6..c20ae30ccd7 100644 --- a/operator/v1/types_kubecontrollermanager.go +++ b/operator/v1/types_kubecontrollermanager.go @@ -13,9 +13,12 @@ type KubeControllerManager struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` + // spec is the specification of the desired behavior of the Kubernetes Controller Manager // +kubebuilder:validation:Required // +required Spec KubeControllerManagerSpec `json:"spec"` + + // status is the most recently observed status of the Kubernetes Controller Manager // +optional Status KubeControllerManagerStatus `json:"status"` } diff --git a/operator/v1/types_scheduler.go b/operator/v1/types_scheduler.go index 20d5f759a56..f8a542082c0 100644 --- a/operator/v1/types_scheduler.go +++ b/operator/v1/types_scheduler.go @@ -13,9 +13,12 @@ type KubeScheduler struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata"` + // spec is the specification of the desired behavior of the Kubernetes Scheduler // +kubebuilder:validation:Required // +required Spec KubeSchedulerSpec `json:"spec"` + + // status is the most recently observed status of the Kubernetes Scheduler // +optional Status KubeSchedulerStatus `json:"status"` } From f03b88bb67cc18989ce5834288889025a333ec70 Mon Sep 17 00:00:00 2001 From: Michal Fojtik Date: Wed, 27 Nov 2019 13:31:09 +0100 Subject: [PATCH 2/2] update generated --- ...000_20_kube-apiserver-operator_01_config.crd.yaml | 4 ++++ ...be-controller-manager-operator_01_config.crd.yaml | 4 ++++ ...000_25_kube-scheduler-operator_01_config.crd.yaml | 4 ++++ operator/v1/zz_generated.swagger_doc_generated.go | 12 +++++++++--- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml b/operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml index aaf3c7d4208..83d5a5a39df 100644 --- a/operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml +++ b/operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml @@ -30,6 +30,8 @@ spec: metadata: type: object spec: + description: spec is the specification of the desired behavior of the Kubernetes + API Server properties: failedRevisionLimit: description: failedRevisionLimit is the number of failed static pod @@ -84,6 +86,8 @@ spec: x-kubernetes-preserve-unknown-fields: true type: object status: + description: status is the most recently observed status of the Kubernetes + API Server properties: conditions: description: conditions is a list of conditions and their status diff --git a/operator/v1/0000_25_kube-controller-manager-operator_01_config.crd.yaml b/operator/v1/0000_25_kube-controller-manager-operator_01_config.crd.yaml index aa3e21e8a27..257620128ca 100644 --- a/operator/v1/0000_25_kube-controller-manager-operator_01_config.crd.yaml +++ b/operator/v1/0000_25_kube-controller-manager-operator_01_config.crd.yaml @@ -32,6 +32,8 @@ spec: metadata: type: object spec: + description: spec is the specification of the desired behavior of the Kubernetes + Controller Manager properties: failedRevisionLimit: description: failedRevisionLimit is the number of failed static pod @@ -86,6 +88,8 @@ spec: x-kubernetes-preserve-unknown-fields: true type: object status: + description: status is the most recently observed status of the Kubernetes + Controller Manager properties: conditions: description: conditions is a list of conditions and their status diff --git a/operator/v1/0000_25_kube-scheduler-operator_01_config.crd.yaml b/operator/v1/0000_25_kube-scheduler-operator_01_config.crd.yaml index 4d18f044fd2..7d7ac277d50 100644 --- a/operator/v1/0000_25_kube-scheduler-operator_01_config.crd.yaml +++ b/operator/v1/0000_25_kube-scheduler-operator_01_config.crd.yaml @@ -32,6 +32,8 @@ spec: metadata: type: object spec: + description: spec is the specification of the desired behavior of the Kubernetes + Scheduler properties: failedRevisionLimit: description: failedRevisionLimit is the number of failed static pod @@ -86,6 +88,8 @@ spec: x-kubernetes-preserve-unknown-fields: true type: object status: + description: status is the most recently observed status of the Kubernetes + Scheduler properties: conditions: description: conditions is a list of conditions and their status diff --git a/operator/v1/zz_generated.swagger_doc_generated.go b/operator/v1/zz_generated.swagger_doc_generated.go index 8c0fca8d12a..ff803952d01 100644 --- a/operator/v1/zz_generated.swagger_doc_generated.go +++ b/operator/v1/zz_generated.swagger_doc_generated.go @@ -345,7 +345,9 @@ func (PrivateStrategy) SwaggerDoc() map[string]string { } var map_KubeAPIServer = map[string]string{ - "": "KubeAPIServer provides information to configure an operator to manage kube-apiserver.", + "": "KubeAPIServer provides information to configure an operator to manage kube-apiserver.", + "spec": "spec is the specification of the desired behavior of the Kubernetes API Server", + "status": "status is the most recently observed status of the Kubernetes API Server", } func (KubeAPIServer) SwaggerDoc() map[string]string { @@ -362,7 +364,9 @@ func (KubeAPIServerList) SwaggerDoc() map[string]string { } var map_KubeControllerManager = map[string]string{ - "": "KubeControllerManager provides information to configure an operator to manage kube-controller-manager.", + "": "KubeControllerManager provides information to configure an operator to manage kube-controller-manager.", + "spec": "spec is the specification of the desired behavior of the Kubernetes Controller Manager", + "status": "status is the most recently observed status of the Kubernetes Controller Manager", } func (KubeControllerManager) SwaggerDoc() map[string]string { @@ -635,7 +639,9 @@ func (OpenShiftControllerManagerList) SwaggerDoc() map[string]string { } var map_KubeScheduler = map[string]string{ - "": "KubeScheduler provides information to configure an operator to manage scheduler.", + "": "KubeScheduler provides information to configure an operator to manage scheduler.", + "spec": "spec is the specification of the desired behavior of the Kubernetes Scheduler", + "status": "status is the most recently observed status of the Kubernetes Scheduler", } func (KubeScheduler) SwaggerDoc() map[string]string {