From 9ad8064db6df498b7ccbd1854778aba11511d32f Mon Sep 17 00:00:00 2001 From: Moto Ishizawa Date: Sun, 15 Mar 2020 22:06:50 +0900 Subject: [PATCH] Split files according to the kubebuilder style --- api/v1alpha1/runner_types.go | 80 +------------------------- api/v1alpha1/runnerdeployment_types.go | 61 ++++++++++++++++++++ api/v1alpha1/runnerreplicaset_types.go | 67 +++++++++++++++++++++ 3 files changed, 129 insertions(+), 79 deletions(-) create mode 100644 api/v1alpha1/runnerdeployment_types.go create mode 100644 api/v1alpha1/runnerreplicaset_types.go diff --git a/api/v1alpha1/runner_types.go b/api/v1alpha1/runner_types.go index 23c174a5..30c35d56 100644 --- a/api/v1alpha1/runner_types.go +++ b/api/v1alpha1/runner_types.go @@ -88,84 +88,6 @@ type RunnerList struct { Items []Runner `json:"items"` } -// +kubebuilder:object:root=true -// +kubebuilder:subresource:status -// +kubebuilder:printcolumn:JSONPath=".spec.replicas",name=Desired,type=number -// +kubebuilder:printcolumn:JSONPath=".status.availableReplicas",name=Current,type=number -// +kubebuilder:printcolumn:JSONPath=".status.readyReplicas",name=Ready,type=number - -// RunnerReplicaSet is the Schema for the runnerreplicasets API -type RunnerReplicaSet struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec RunnerReplicaSetSpec `json:"spec,omitempty"` - Status RunnerReplicaSetStatus `json:"status,omitempty"` -} - -// RunnerReplicaSetSpec defines the desired state of RunnerReplicaSet -type RunnerReplicaSetSpec struct { - Replicas *int `json:"replicas"` - - Template RunnerTemplate `json:"template"` -} - -type RunnerReplicaSetStatus struct { - AvailableReplicas int `json:"availableReplicas"` - ReadyReplicas int `json:"readyReplicas"` -} - -type RunnerTemplate struct { - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec RunnerSpec `json:"spec,omitempty"` -} - -// +kubebuilder:object:root=true - -// RunnerList contains a list of Runner -type RunnerReplicaSetList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []RunnerReplicaSet `json:"items"` -} - -// +kubebuilder:object:root=true -// +kubebuilder:subresource:status -// +kubebuilder:printcolumn:JSONPath=".spec.replicas",name=Desired,type=number -// +kubebuilder:printcolumn:JSONPath=".status.availableReplicas",name=Current,type=number -// +kubebuilder:printcolumn:JSONPath=".status.readyReplicas",name=Ready,type=number - -// RunnerDeployment is the Schema for the runnerdeployments API -type RunnerDeployment struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec RunnerDeploymentSpec `json:"spec,omitempty"` - Status RunnerDeploymentStatus `json:"status,omitempty"` -} - -// RunnerReplicaSetSpec defines the desired state of RunnerDeployment -type RunnerDeploymentSpec struct { - Replicas *int `json:"replicas"` - - Template RunnerTemplate `json:"template"` -} - -type RunnerDeploymentStatus struct { - AvailableReplicas int `json:"availableReplicas"` - ReadyReplicas int `json:"readyReplicas"` -} - -// +kubebuilder:object:root=true - -// RunnerList contains a list of Runner -type RunnerDeploymentList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []RunnerDeployment `json:"items"` -} - func init() { - SchemeBuilder.Register(&Runner{}, &RunnerList{}, &RunnerReplicaSet{}, &RunnerReplicaSetList{}, &RunnerDeployment{}, &RunnerDeploymentList{}) + SchemeBuilder.Register(&Runner{}, &RunnerList{}) } diff --git a/api/v1alpha1/runnerdeployment_types.go b/api/v1alpha1/runnerdeployment_types.go new file mode 100644 index 00000000..4489bb6a --- /dev/null +++ b/api/v1alpha1/runnerdeployment_types.go @@ -0,0 +1,61 @@ +/* +Copyright 2020 The actions-runner-controller authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// RunnerReplicaSetSpec defines the desired state of RunnerDeployment +type RunnerDeploymentSpec struct { + Replicas *int `json:"replicas"` + + Template RunnerTemplate `json:"template"` +} + +type RunnerDeploymentStatus struct { + AvailableReplicas int `json:"availableReplicas"` + ReadyReplicas int `json:"readyReplicas"` +} + +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:printcolumn:JSONPath=".spec.replicas",name=Desired,type=number +// +kubebuilder:printcolumn:JSONPath=".status.availableReplicas",name=Current,type=number +// +kubebuilder:printcolumn:JSONPath=".status.readyReplicas",name=Ready,type=number + +// RunnerDeployment is the Schema for the runnerdeployments API +type RunnerDeployment struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec RunnerDeploymentSpec `json:"spec,omitempty"` + Status RunnerDeploymentStatus `json:"status,omitempty"` +} + +// +kubebuilder:object:root=true + +// RunnerList contains a list of Runner +type RunnerDeploymentList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []RunnerDeployment `json:"items"` +} + +func init() { + SchemeBuilder.Register(&RunnerDeployment{}, &RunnerDeploymentList{}) +} diff --git a/api/v1alpha1/runnerreplicaset_types.go b/api/v1alpha1/runnerreplicaset_types.go new file mode 100644 index 00000000..ffc357fa --- /dev/null +++ b/api/v1alpha1/runnerreplicaset_types.go @@ -0,0 +1,67 @@ +/* +Copyright 2020 The actions-runner-controller authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// RunnerReplicaSetSpec defines the desired state of RunnerReplicaSet +type RunnerReplicaSetSpec struct { + Replicas *int `json:"replicas"` + + Template RunnerTemplate `json:"template"` +} + +type RunnerReplicaSetStatus struct { + AvailableReplicas int `json:"availableReplicas"` + ReadyReplicas int `json:"readyReplicas"` +} + +type RunnerTemplate struct { + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec RunnerSpec `json:"spec,omitempty"` +} + +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:printcolumn:JSONPath=".spec.replicas",name=Desired,type=number +// +kubebuilder:printcolumn:JSONPath=".status.availableReplicas",name=Current,type=number +// +kubebuilder:printcolumn:JSONPath=".status.readyReplicas",name=Ready,type=number + +// RunnerReplicaSet is the Schema for the runnerreplicasets API +type RunnerReplicaSet struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec RunnerReplicaSetSpec `json:"spec,omitempty"` + Status RunnerReplicaSetStatus `json:"status,omitempty"` +} + +// +kubebuilder:object:root=true + +// RunnerList contains a list of Runner +type RunnerReplicaSetList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []RunnerReplicaSet `json:"items"` +} + +func init() { + SchemeBuilder.Register(&RunnerReplicaSet{}, &RunnerReplicaSetList{}) +}