1
0
mirror of https://github.com/rancher/types.git synced 2025-06-29 15:06:48 +00:00

Merge pull request #403 from aiwantaozi/improve_logging

add status mapper
This commit is contained in:
Alena Prokharchyk 2018-04-25 22:06:27 -07:00 committed by GitHub
commit 61843eab66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 22 deletions

View File

@ -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{}).

View File

@ -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