From d9cd78f0dc02baf7fa07db75e315de0d153747ab Mon Sep 17 00:00:00 2001 From: DanielZhangQD Date: Mon, 13 Apr 2020 18:56:55 +0800 Subject: [PATCH] resolve conflict --- docs/api-references/docs.md | 746 ++---------------- .../pingcap/v1alpha1/openapi_generated.go | 52 +- .../pingcap/v1alpha1/zz_generated.deepcopy.go | 81 +- 3 files changed, 176 insertions(+), 703 deletions(-) diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md index e2ee9cfbc8..189656a5fa 100644 --- a/docs/api-references/docs.md +++ b/docs/api-references/docs.md @@ -2489,19 +2489,6 @@ int64 -flash
- - -Flash - - - - -(Optional) - - - - loger
@@ -3207,92 +3194,6 @@ FlashCluster -

FlashApplication -

-

-(Appears on: -CommonConfig) -

-

-

FlashApplication is the configuration of [application] section.

-

- - - - - - - - - - - - - -
FieldDescription
-runAsDaemon
- -bool - -		 -(Optional) -

Optional: Defaults to true

-
-

FlashCluster -

-

-(Appears on: -Flash) -

-

-

FlashCluster is the configuration of [flash.flash_cluster] section.

-

- - - - - - - - - - - - - - - - - - - - - -
FieldDescription
-refresh_interval
- -int32 - -		 -(Optional) -

Optional: Defaults to 20

-
-update_rule_interval
- -int32 - -		 -(Optional) -

Optional: Defaults to 10

-
-master_ttl
- -int32 - -		 -(Optional) -

Optional: Defaults to 60

-

FlashLogger

@@ -3348,335 +3249,6 @@ int32 -

FlashProfile -

-

-(Appears on: -CommonConfig) -

-

-

FlashProfile is the configuration of [profiles] section.

-

- - - - - - - - - - - - - - - - - -
FieldDescription
-readonly
- - -Profile - - -		 -(Optional) -
-default
- - -Profile - - -		 -(Optional) -
-

FlashProxy -

-

-(Appears on: -Flash) -

-

-

FlashProxy is the configuration of [flash.proxy] section.

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FieldDescription
-addr
- -string - -		 -(Optional) -

Optional: Defaults to 0.0.0.0:20170

-
-advertise-addr
- -string - -		 -(Optional) -
-data-dir
- -string - -		 -(Optional) -

Optional: Defaults to /data/proxy

-
-config
- -string - -		 -(Optional) -

Optional: Defaults to /data/proxy.toml

-
-log-file
- -string - -		 -(Optional) -

Optional: Defaults to /data/logs/proxy.log

-
-

FlashQuota -

-

-(Appears on: -CommonConfig) -

-

-

FlashQuota is the configuration of [quotas] section.

-

- - - - - - - - - - - - - -
FieldDescription
-default
- - -Quota - - -		 -(Optional) -
-

FlashRaft -

-

-(Appears on: -CommonConfig) -

-

-

FlashRaft is the configuration of [raft] section.

-

- - - - - - - - - - - - - - - - - - - - - -
FieldDescription
-pd_addr
- -string - -		 -(Optional) -
-kvstore_path
- -string - -		 -(Optional) -

Optional: Defaults to /data/kvstore

-
-storage_engine
- -string - -		 -(Optional) -

Optional: Defaults to dt

-
-

FlashServerConfig -

-

-(Appears on: -ProxyConfig) -

-

-

FlashServerConfig is the configuration of Proxy server.

-

- - - - - - - - - - - - - - - - - -
FieldDescription
-engine-addr
- -string - -		 -(Optional) -
-TiKVServerConfig
- - -TiKVServerConfig - - -		 -

-(Members of TiKVServerConfig are embedded into this type.) -

-
-

FlashStatus -

-

-(Appears on: -CommonConfig) -

-

-

FlashStatus is the configuration of [status] section.

-

- - - - - - - - - - - - - -
FieldDescription
-metrics_port
- -int32 - -		 -(Optional) -

Optional: Defaults to 8234

-
-

FlashUser -

-

-(Appears on: -CommonConfig) -

-

-

FlashUser is the configuration of [users] section.

-

- - - - - - - - - - - - - - - - - -
FieldDescription
-readonly
- - -User - - -		 -(Optional) -
-default
- - -User - - -		 -

GcsStorageProvider

@@ -4250,6 +3822,40 @@ uint32 +

LogTailerSpec +

+

+(Appears on: +TiFlashSpec) +

+

+

LogTailerSpec represents an optional log tailer sidecar container

+

+ + + + + + + + + + + + + +
FieldDescription
+ResourceRequirements
+ + +Kubernetes core/v1.ResourceRequirements + + +		 +

+(Members of ResourceRequirements are embedded into this type.) +

+

MasterKeyFileConfig

@@ -6721,10 +6327,6 @@ float64

Profile

-(Appears on: -FlashProfile) -

-

Profile is the configuration profiles.

@@ -6848,215 +6450,6 @@ int
-

ProxyConfig -

-

-(Appears on: -TiFlashConfig) -

-

-

ProxyConfig is the configuration of TiFlash proxy process. -All the configurations are same with those of TiKV except adding engine-addr in the TiKVServerConfig

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FieldDescription
-log-level
- -string - -		 -(Optional) -

Optional: Defaults to info

-
-log-file
- -string - -		 -(Optional) -
-log-rotation-timespan
- -string - -		 -(Optional) -

Optional: Defaults to 24h

-
-panic-when-unexpected-key-or-data
- -bool - -		 -(Optional) -
-server
- - -FlashServerConfig - - -		 -(Optional) -
-storage
- - -TiKVStorageConfig - - -		 -(Optional) -
-raftstore
- - -TiKVRaftstoreConfig - - -		 -(Optional) -
-rocksdb
- - -TiKVDbConfig - - -		 -(Optional) -
-coprocessor
- - -TiKVCoprocessorConfig - - -		 -(Optional) -
-readpool
- - -TiKVReadPoolConfig - - -		 -(Optional) -
-raftdb
- - -TiKVRaftDBConfig - - -		 -(Optional) -
-import
- - -TiKVImportConfig - - -		 -(Optional) -
-gc
- - -TiKVGCConfig - - -		 -(Optional) -
-pd
- - -TiKVPDConfig - - -		 -(Optional) -
-security
- - -TiKVSecurityConfig - - -		 -(Optional) -

ProxyProtocol

@@ -7102,32 +6495,6 @@ uint -

ProxyServer -

-

-

ProxyServer is the configuration of TiFlash proxy server.

-

- - - - - - - - - - - - - -
FieldDescription
-engine-addr
- -string - -		 -(Optional) -

PumpSpec

@@ -7287,10 +6654,6 @@ Kubernetes apps/v1.StatefulSetStatus

Quota

-(Appears on: -FlashQuota) -

-

Quota is the configuration of [quotas.default] section.

@@ -9599,6 +8962,20 @@ TiFlashConfig

Config is the Configuration of TiFlash

+ + + +
+logTailer
+ + +LogTailerSpec + + +		 +(Optional) +

LogTailer is the configurations of the log tailers for TiFlash

+

TiKVBlockCacheConfig @@ -10488,7 +9865,6 @@ TiKVEncryptionConfig

(Appears on: -ProxyConfig, TiKVConfig)

@@ -10698,7 +10074,6 @@ string

(Appears on: -ProxyConfig, TiKVConfig)

@@ -11180,7 +10555,6 @@ Kubernetes meta/v1.Time

(Appears on: -ProxyConfig, TiKVConfig)

@@ -11222,7 +10596,6 @@ string

(Appears on: -ProxyConfig, TiKVConfig)

@@ -11405,7 +10778,6 @@ If the type set to kms, this config should be filled

(Appears on: -ProxyConfig, TiKVConfig)

@@ -11480,7 +10852,6 @@ Optional: Defaults to 10

(Appears on: -ProxyConfig, TiKVConfig)

@@ -11765,7 +11136,6 @@ TiKVCfConfig

(Appears on: -ProxyConfig, TiKVConfig)

@@ -12356,7 +11726,6 @@ bool

(Appears on: -ProxyConfig, TiKVConfig)

@@ -12401,7 +11770,6 @@ TiKVStorageReadPoolConfig

(Appears on: -ProxyConfig, TiKVConfig)

@@ -12487,7 +11855,6 @@ string

(Appears on: -FlashServerConfig, TiKVConfig)

@@ -13011,7 +12378,6 @@ string

(Appears on: -ProxyConfig, TiKVConfig)

@@ -14052,6 +13418,18 @@ PumpStatus + + +tiflash
+ + +TiFlashStatus + + + + + +

TidbInitializerSpec @@ -14593,10 +13971,6 @@ Kubernetes meta/v1.Time

User

-(Appears on: -FlashUser) -

-

User is the configuration of users.

diff --git a/pkg/apis/pingcap/v1alpha1/openapi_generated.go b/pkg/apis/pingcap/v1alpha1/openapi_generated.go index 6dc513a64e..18c0663c61 100644 --- a/pkg/apis/pingcap/v1alpha1/openapi_generated.go +++ b/pkg/apis/pingcap/v1alpha1/openapi_generated.go @@ -47,6 +47,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.HelperSpec": schema_pkg_apis_pingcap_v1alpha1_HelperSpec(ref), "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.IsolationRead": schema_pkg_apis_pingcap_v1alpha1_IsolationRead(ref), "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.Log": schema_pkg_apis_pingcap_v1alpha1_Log(ref), + "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.LogTailerSpec": schema_pkg_apis_pingcap_v1alpha1_LogTailerSpec(ref), "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.MasterKeyFileConfig": schema_pkg_apis_pingcap_v1alpha1_MasterKeyFileConfig(ref), "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.MasterKeyKMSConfig": schema_pkg_apis_pingcap_v1alpha1_MasterKeyKMSConfig(ref), "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.MonitorContainer": schema_pkg_apis_pingcap_v1alpha1_MonitorContainer(ref), @@ -1486,6 +1487,49 @@ func schema_pkg_apis_pingcap_v1alpha1_Log(ref common.ReferenceCallback) common.O } } +func schema_pkg_apis_pingcap_v1alpha1_LogTailerSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "LogTailerSpec represents an optional log tailer sidecar container", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "limits": { + SchemaProps: spec.SchemaProps{ + Description: "Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/", + Type: []string{"object"}, + AdditionalProperties: &spec.SchemaOrBool{ + Allows: true, + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/api/resource.Quantity"), + }, + }, + }, + }, + }, + "requests": { + SchemaProps: spec.SchemaProps{ + Description: "Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/", + Type: []string{"object"}, + AdditionalProperties: &spec.SchemaOrBool{ + Allows: true, + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/api/resource.Quantity"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "k8s.io/apimachinery/pkg/api/resource.Quantity"}, + } +} + func schema_pkg_apis_pingcap_v1alpha1_MasterKeyFileConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -4416,12 +4460,18 @@ func schema_pkg_apis_pingcap_v1alpha1_TiFlashSpec(ref common.ReferenceCallback) Ref: ref("github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.TiFlashConfig"), }, }, + "logTailer": { + SchemaProps: spec.SchemaProps{ + Description: "LogTailer is the configurations of the log tailers for TiFlash", + Ref: ref("github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.LogTailerSpec"), + }, + }, }, Required: []string{"replicas", "storageClaims"}, }, }, Dependencies: []string{ - "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.StorageClaim", "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.TiFlashConfig", "k8s.io/api/core/v1.Affinity", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.PodSecurityContext", "k8s.io/api/core/v1.Toleration", "k8s.io/apimachinery/pkg/api/resource.Quantity"}, + "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.LogTailerSpec", "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.StorageClaim", "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1.TiFlashConfig", "k8s.io/api/core/v1.Affinity", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.PodSecurityContext", "k8s.io/api/core/v1.Toleration", "k8s.io/apimachinery/pkg/api/resource.Quantity"}, } } diff --git a/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go index d2be3759ea..4d30fc65f6 100644 --- a/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go @@ -1308,6 +1308,23 @@ func (in *Log) DeepCopy() *Log { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *LogTailerSpec) DeepCopyInto(out *LogTailerSpec) { + *out = *in + in.ResourceRequirements.DeepCopyInto(&out.ResourceRequirements) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LogTailerSpec. +func (in *LogTailerSpec) DeepCopy() *LogTailerSpec { + if in == nil { + return nil + } + out := new(LogTailerSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MasterKeyFileConfig) DeepCopyInto(out *MasterKeyFileConfig) { *out = *in @@ -2500,22 +2517,6 @@ func (in *ProxyProtocol) DeepCopy() *ProxyProtocol { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ProxyServer) DeepCopyInto(out *ProxyServer) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxyServer. -func (in *ProxyServer) DeepCopy() *ProxyServer { - if in == nil { - return nil - } - out := new(ProxyServer) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PumpSpec) DeepCopyInto(out *PumpSpec) { *out = *in @@ -3497,6 +3498,11 @@ func (in *TiFlashSpec) DeepCopyInto(out *TiFlashSpec) { *out = new(TiFlashConfig) (*in).DeepCopyInto(*out) } + if in.LogTailer != nil { + in, out := &in.LogTailer, &out.LogTailer + *out = new(LogTailerSpec) + (*in).DeepCopyInto(*out) + } return } @@ -3510,6 +3516,48 @@ func (in *TiFlashSpec) DeepCopy() *TiFlashSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TiFlashStatus) DeepCopyInto(out *TiFlashStatus) { + *out = *in + if in.StatefulSet != nil { + in, out := &in.StatefulSet, &out.StatefulSet + *out = new(appsv1.StatefulSetStatus) + (*in).DeepCopyInto(*out) + } + if in.Stores != nil { + in, out := &in.Stores, &out.Stores + *out = make(map[string]TiKVStore, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() + } + } + if in.TombstoneStores != nil { + in, out := &in.TombstoneStores, &out.TombstoneStores + *out = make(map[string]TiKVStore, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() + } + } + if in.FailureStores != nil { + in, out := &in.FailureStores, &out.FailureStores + *out = make(map[string]TiKVFailureStore, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TiFlashStatus. +func (in *TiFlashStatus) DeepCopy() *TiFlashStatus { + if in == nil { + return nil + } + out := new(TiFlashStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TiKVBlockCacheConfig) DeepCopyInto(out *TiKVBlockCacheConfig) { *out = *in @@ -5045,6 +5093,7 @@ func (in *TidbClusterStatus) DeepCopyInto(out *TidbClusterStatus) { in.TiKV.DeepCopyInto(&out.TiKV) in.TiDB.DeepCopyInto(&out.TiDB) in.Pump.DeepCopyInto(&out.Pump) + in.TiFlash.DeepCopyInto(&out.TiFlash) return }