From be62d737d35b70e67cd67fca61b3f17b2ae46b81 Mon Sep 17 00:00:00 2001 From: Aiwantaozi Date: Wed, 25 Apr 2018 17:51:20 +0800 Subject: [PATCH 1/2] add status mapper --- apis/management.cattle.io/v3/schema/schema.go | 1 + 1 file changed, 1 insertion(+) diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index ed1585d4..ffc69e3b 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -355,6 +355,7 @@ func projectNetworkPolicyTypes(schema *types.Schemas) *types.Schemas { func logTypes(schema *types.Schemas) *types.Schemas { return schema. AddMapperForType(&Version, v3.ClusterLogging{}, + &m.Embed{Field: "status"}, m.DisplayName{}). AddMapperForType(&Version, v3.ProjectLogging{}, m.DisplayName{}). From 404a7b3023231d5a169fd5275b68ab43d5547835 Mon Sep 17 00:00:00 2001 From: Aiwantaozi Date: Thu, 26 Apr 2018 09:50:41 +0800 Subject: [PATCH 2/2] update vendor --- .../v3/zz_generated_cluster_logging.go | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/client/management/v3/zz_generated_cluster_logging.go b/client/management/v3/zz_generated_cluster_logging.go index af74cdca..1c682c40 100644 --- a/client/management/v3/zz_generated_cluster_logging.go +++ b/client/management/v3/zz_generated_cluster_logging.go @@ -7,7 +7,9 @@ import ( const ( ClusterLoggingType = "clusterLogging" ClusterLoggingFieldAnnotations = "annotations" + ClusterLoggingFieldAppliedSpec = "appliedSpec" ClusterLoggingFieldClusterId = "clusterId" + ClusterLoggingFieldConditions = "conditions" ClusterLoggingFieldCreated = "created" ClusterLoggingFieldCreatorID = "creatorId" ClusterLoggingFieldElasticsearchConfig = "elasticsearchConfig" @@ -22,7 +24,6 @@ const ( ClusterLoggingFieldRemoved = "removed" ClusterLoggingFieldSplunkConfig = "splunkConfig" ClusterLoggingFieldState = "state" - ClusterLoggingFieldStatus = "status" ClusterLoggingFieldSyslogConfig = "syslogConfig" ClusterLoggingFieldTransitioning = "transitioning" ClusterLoggingFieldTransitioningMessage = "transitioningMessage" @@ -31,27 +32,28 @@ const ( type ClusterLogging struct { types.Resource - Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` - ClusterId string `json:"clusterId,omitempty" yaml:"clusterId,omitempty"` - Created string `json:"created,omitempty" yaml:"created,omitempty"` - CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` - ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` - EmbeddedConfig *EmbeddedConfig `json:"embeddedConfig,omitempty" yaml:"embeddedConfig,omitempty"` - KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"` - Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` - Name string `json:"name,omitempty" yaml:"name,omitempty"` - NamespaceId string `json:"namespaceId,omitempty" yaml:"namespaceId,omitempty"` - OutputFlushInterval int64 `json:"outputFlushInterval,omitempty" yaml:"outputFlushInterval,omitempty"` - OutputTags map[string]string `json:"outputTags,omitempty" yaml:"outputTags,omitempty"` - OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` - Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` - SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty" yaml:"splunkConfig,omitempty"` - State string `json:"state,omitempty" yaml:"state,omitempty"` - Status *ClusterLoggingStatus `json:"status,omitempty" yaml:"status,omitempty"` - SyslogConfig *SyslogConfig `json:"syslogConfig,omitempty" yaml:"syslogConfig,omitempty"` - Transitioning string `json:"transitioning,omitempty" yaml:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"` - Uuid string `json:"uuid,omitempty" yaml:"uuid,omitempty"` + Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` + AppliedSpec *ClusterLoggingSpec `json:"appliedSpec,omitempty" yaml:"appliedSpec,omitempty"` + ClusterId string `json:"clusterId,omitempty" yaml:"clusterId,omitempty"` + Conditions []LoggingCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` + Created string `json:"created,omitempty" yaml:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` + EmbeddedConfig *EmbeddedConfig `json:"embeddedConfig,omitempty" yaml:"embeddedConfig,omitempty"` + KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"` + Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` + Name string `json:"name,omitempty" yaml:"name,omitempty"` + NamespaceId string `json:"namespaceId,omitempty" yaml:"namespaceId,omitempty"` + OutputFlushInterval int64 `json:"outputFlushInterval,omitempty" yaml:"outputFlushInterval,omitempty"` + OutputTags map[string]string `json:"outputTags,omitempty" yaml:"outputTags,omitempty"` + OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` + Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` + SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty" yaml:"splunkConfig,omitempty"` + State string `json:"state,omitempty" yaml:"state,omitempty"` + SyslogConfig *SyslogConfig `json:"syslogConfig,omitempty" yaml:"syslogConfig,omitempty"` + Transitioning string `json:"transitioning,omitempty" yaml:"transitioning,omitempty"` + TransitioningMessage string `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"` + Uuid string `json:"uuid,omitempty" yaml:"uuid,omitempty"` } type ClusterLoggingCollection struct { types.Collection