From f373420d65597bfc8d0cfcde0877c6022716005b Mon Sep 17 00:00:00 2001 From: Inel Pandzic Date: Mon, 12 Aug 2024 10:44:49 +0200 Subject: [PATCH] Remove SSLInternalSecretName option. (#724) --- api/v1alpha1/perconaservermysql_types.go | 35 +++++++++---------- .../ps.percona.com_perconaservermysqls.yaml | 2 -- deploy/bundle.yaml | 2 -- deploy/crd.yaml | 2 -- deploy/cw-bundle.yaml | 2 -- 5 files changed, 17 insertions(+), 26 deletions(-) diff --git a/api/v1alpha1/perconaservermysql_types.go b/api/v1alpha1/perconaservermysql_types.go index 7d9ee26b9..414480e5e 100644 --- a/api/v1alpha1/perconaservermysql_types.go +++ b/api/v1alpha1/perconaservermysql_types.go @@ -44,24 +44,23 @@ import ( // PerconaServerMySQLSpec defines the desired state of PerconaServerMySQL type PerconaServerMySQLSpec struct { - CRVersion string `json:"crVersion,omitempty"` - Pause bool `json:"pause,omitempty"` - SecretsName string `json:"secretsName,omitempty"` - SSLSecretName string `json:"sslSecretName,omitempty"` - SSLInternalSecretName string `json:"sslInternalSecretName,omitempty"` - Unsafe UnsafeFlags `json:"unsafeFlags,omitempty"` - InitImage string `json:"initImage,omitempty"` - IgnoreAnnotations []string `json:"ignoreAnnotations,omitempty"` - IgnoreLabels []string `json:"ignoreLabels,omitempty"` - MySQL MySQLSpec `json:"mysql,omitempty"` - Orchestrator OrchestratorSpec `json:"orchestrator,omitempty"` - PMM *PMMSpec `json:"pmm,omitempty"` - Backup *BackupSpec `json:"backup,omitempty"` - Proxy ProxySpec `json:"proxy,omitempty"` - TLS *TLSSpec `json:"tls,omitempty"` - Toolkit *ToolkitSpec `json:"toolkit,omitempty"` - UpgradeOptions UpgradeOptions `json:"upgradeOptions,omitempty"` - UpdateStrategy appsv1.StatefulSetUpdateStrategyType `json:"updateStrategy,omitempty"` + CRVersion string `json:"crVersion,omitempty"` + Pause bool `json:"pause,omitempty"` + SecretsName string `json:"secretsName,omitempty"` + SSLSecretName string `json:"sslSecretName,omitempty"` + Unsafe UnsafeFlags `json:"unsafeFlags,omitempty"` + InitImage string `json:"initImage,omitempty"` + IgnoreAnnotations []string `json:"ignoreAnnotations,omitempty"` + IgnoreLabels []string `json:"ignoreLabels,omitempty"` + MySQL MySQLSpec `json:"mysql,omitempty"` + Orchestrator OrchestratorSpec `json:"orchestrator,omitempty"` + PMM *PMMSpec `json:"pmm,omitempty"` + Backup *BackupSpec `json:"backup,omitempty"` + Proxy ProxySpec `json:"proxy,omitempty"` + TLS *TLSSpec `json:"tls,omitempty"` + Toolkit *ToolkitSpec `json:"toolkit,omitempty"` + UpgradeOptions UpgradeOptions `json:"upgradeOptions,omitempty"` + UpdateStrategy appsv1.StatefulSetUpdateStrategyType `json:"updateStrategy,omitempty"` } type UnsafeFlags struct { diff --git a/config/crd/bases/ps.percona.com_perconaservermysqls.yaml b/config/crd/bases/ps.percona.com_perconaservermysqls.yaml index 5e053c724..d50d86e25 100644 --- a/config/crd/bases/ps.percona.com_perconaservermysqls.yaml +++ b/config/crd/bases/ps.percona.com_perconaservermysqls.yaml @@ -7570,8 +7570,6 @@ spec: type: object secretsName: type: string - sslInternalSecretName: - type: string sslSecretName: type: string tls: diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 0f7e26367..b80686269 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -9466,8 +9466,6 @@ spec: type: object secretsName: type: string - sslInternalSecretName: - type: string sslSecretName: type: string tls: diff --git a/deploy/crd.yaml b/deploy/crd.yaml index 59f6b1a17..a229ed219 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -9466,8 +9466,6 @@ spec: type: object secretsName: type: string - sslInternalSecretName: - type: string sslSecretName: type: string tls: diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 88502a0c3..d83d41d18 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -9466,8 +9466,6 @@ spec: type: object secretsName: type: string - sslInternalSecretName: - type: string sslSecretName: type: string tls: