1
0
mirror of https://github.com/rancher/types.git synced 2025-08-28 00:30:31 +00:00

Merge pull request #1 from alena1108/typefix

corrected component statuses
This commit is contained in:
Darren Shepherd 2017-11-10 14:08:06 -07:00 committed by GitHub
commit e5fba2b896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,8 +1,8 @@
package v1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
type ClusterConditionType string
@ -57,7 +57,7 @@ type ClusterStatus struct {
Conditions []ClusterCondition `json:"conditions,omitempty"`
//Component statuses will represent cluster's components (etcd/controller/scheduler) health
// https://kubernetes.io/docs/api-reference/v1.8/#componentstatus-v1-core
ComponentStatuses v1.ComponentStatusList
ComponentStatuses []v1.ComponentStatus
APIEndpoint string `json:"apiEndpoint,omitempty"`
ServiceAccountToken string `json:"serviceAccountToken,omitempty"`
CACert string `json:"caCert,omitempty"`
@ -214,13 +214,6 @@ type ClusterNode struct {
v1.Node
}
type ClusterNodeMetadata struct {
// Standard objects metadata. More info:
// https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
metav1.ObjectMeta `json:"metadata,omitempty"`
ClusterName string `json:"clusterName,omitempty"`
}
type ClusterNodeList struct {
metav1.TypeMeta `json:",inline"`
// Standard list metadata