From 9d6ec1b52edaf060c800a470e32d78523ef31c46 Mon Sep 17 00:00:00 2001 From: tennix Date: Tue, 27 Aug 2024 16:02:20 +0800 Subject: [PATCH] Address comment --- docs/api-references/docs.md | 4 +++- pkg/apis/pingcap/v1alpha1/openapi_generated.go | 2 +- pkg/apis/pingcap/v1alpha1/types.go | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md index 9b6fcae502..6a96a6bbcc 100644 --- a/docs/api-references/docs.md +++ b/docs/api-references/docs.md @@ -3400,7 +3400,9 @@ string -

StorageAccount is the storage account of the azure blob storage

+

StorageAccount is the storage account of the azure blob storage +If this field is set, then use this to set backup-manager env +Otherwise retrieve the storage account from secret

diff --git a/pkg/apis/pingcap/v1alpha1/openapi_generated.go b/pkg/apis/pingcap/v1alpha1/openapi_generated.go index ca34b428e8..85c0ec1246 100644 --- a/pkg/apis/pingcap/v1alpha1/openapi_generated.go +++ b/pkg/apis/pingcap/v1alpha1/openapi_generated.go @@ -582,7 +582,7 @@ func schema_pkg_apis_pingcap_v1alpha1_AzblobStorageProvider(ref common.Reference }, "storageAccount": { SchemaProps: spec.SchemaProps{ - Description: "StorageAccount is the storage account of the azure blob storage", + Description: "StorageAccount is the storage account of the azure blob storage If this field is set, then use this to set backup-manager env Otherwise retrieve the storage account from secret", Type: []string{"string"}, Format: "", }, diff --git a/pkg/apis/pingcap/v1alpha1/types.go b/pkg/apis/pingcap/v1alpha1/types.go index bfe6535060..7839858e30 100644 --- a/pkg/apis/pingcap/v1alpha1/types.go +++ b/pkg/apis/pingcap/v1alpha1/types.go @@ -2013,6 +2013,8 @@ type AzblobStorageProvider struct { // azblob service account credentials. SecretName string `json:"secretName,omitempty"` // StorageAccount is the storage account of the azure blob storage + // If this field is set, then use this to set backup-manager env + // Otherwise retrieve the storage account from secret StorageAccount string `json:"storageAccount,omitempty"` // SasToken is the sas token of the storage account SasToken string `json:"sasToken,omitempty"`