From 2173c028c661b4305011f02a303b568ad244b07e Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 10 Nov 2017 13:06:44 -0800 Subject: [PATCH] corrected component statuses --- io.cattle.management/v1/types.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/io.cattle.management/v1/types.go b/io.cattle.management/v1/types.go index 5bc94bab..24498622 100644 --- a/io.cattle.management/v1/types.go +++ b/io.cattle.management/v1/types.go @@ -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 object’s 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