From fcee27ee2e3cb93d4d0487cc566f0ea0f383db73 Mon Sep 17 00:00:00 2001 From: pingcap-github-bot Date: Mon, 15 Jun 2020 14:54:24 +0800 Subject: [PATCH] cherry pick #2702 to release-1.1 (#2704) --- docs/api-references/docs.md | 11 +++++++++++ pkg/apis/pingcap/v1alpha1/pd_config.go | 2 ++ pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md index 64d2fcf155..1761f8d905 100644 --- a/docs/api-references/docs.md +++ b/docs/api-references/docs.md @@ -3405,6 +3405,17 @@ string (Optional) + + +internal-proxy
+ +bool + + + +(Optional) + +

DiscoverySpec

diff --git a/pkg/apis/pingcap/v1alpha1/pd_config.go b/pkg/apis/pingcap/v1alpha1/pd_config.go index eb55898454..ee3d61a292 100644 --- a/pkg/apis/pingcap/v1alpha1/pd_config.go +++ b/pkg/apis/pingcap/v1alpha1/pd_config.go @@ -133,6 +133,8 @@ type DashboardConfig struct { TiDBKeyPath *string `toml:"tidb-key-path,omitempty" json:"tidb-key-path,omitempty"` // +optional PublicPathPrefix *string `toml:"public-path-prefix,omitempty" json:"public-path-prefix,omitempty"` + // +optional + InternalProxy *bool `toml:"internal-proxy,omitempty" json:"internal-proxy,omitempty"` } // PDLogConfig serializes log related config in toml/json. diff --git a/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go index 50640a78d1..e679f08cce 100644 --- a/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go @@ -808,6 +808,11 @@ func (in *DashboardConfig) DeepCopyInto(out *DashboardConfig) { *out = new(string) **out = **in } + if in.InternalProxy != nil { + in, out := &in.InternalProxy, &out.InternalProxy + *out = new(bool) + **out = **in + } return }