Merge branch 'main' into dev/K8SPS-377

percona · Aug 12, 2024 · afabeb3 · afabeb3
2 parents 54454cc + f373420
commit afabeb3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -9466,8 +9466,6 @@ spec:
                 type: object
               secretsName:
                 type: string
-              sslInternalSecretName:
-                type: string
               sslSecretName:
                 type: string
               tls: