Merge pull request #6860 from jabellard/external-etcd-dep

Remove deprecated external etcd fields

Author: karmada-bot

charts/karmada-operator/crds/operator.karmada.io_karmadas.yaml

@@ -61,32 +61,11 @@ spec:
                           External describes how to connect to an external etcd cluster
                           Local and External are mutually exclusive
                         properties:
-                          caData:
-                            description: |-
-                              CAData is an SSL Certificate Authority file used to secure etcd communication.
-                              Required if using a TLS connection.
-                              Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
-                            format: byte
-                            type: string
-                          certData:
-                            description: |-
-                              CertData is an SSL certification file used to secure etcd communication.
-                              Required if using a TLS connection.
-                              Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
-                            format: byte
-                            type: string
                           endpoints:
                             description: Endpoints of etcd members. Required for ExternalEtcd.
                             items:
                               type: string
                             type: array
-                          keyData:
-                            description: |-
-                              KeyData is an SSL key file used to secure etcd communication.
-                              Required if using a TLS connection.
-                              Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
-                            format: byte
-                            type: string
                           secretRef:
                             description: |-
                               SecretRef references a Kubernetes secret containing the etcd connection credentials.

operator/config/crds/operator.karmada.io_karmadas.yaml

@@ -61,32 +61,11 @@ spec:
                           External describes how to connect to an external etcd cluster
                           Local and External are mutually exclusive
                         properties:
-                          caData:
-                            description: |-
-                              CAData is an SSL Certificate Authority file used to secure etcd communication.
-                              Required if using a TLS connection.
-                              Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
-                            format: byte
-                            type: string
-                          certData:
-                            description: |-
-                              CertData is an SSL certification file used to secure etcd communication.
-                              Required if using a TLS connection.
-                              Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
-                            format: byte
-                            type: string
                           endpoints:
                             description: Endpoints of etcd members. Required for ExternalEtcd.
                             items:
                               type: string
                             type: array
-                          keyData:
-                            description: |-
-                              KeyData is an SSL key file used to secure etcd communication.
-                              Required if using a TLS connection.
-                              Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
-                            format: byte
-                            type: string
                           secretRef:
                             description: |-
                               SecretRef references a Kubernetes secret containing the etcd connection credentials.

operator/pkg/apis/operator/v1alpha1/type.go

@@ -291,21 +291,6 @@ type ExternalEtcd struct {
 	// +required
 	Endpoints []string `json:"endpoints"`
 
-	// CAData is an SSL Certificate Authority file used to secure etcd communication.
-	// Required if using a TLS connection.
-	// Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
-	CAData []byte `json:"caData,omitempty"`
-
-	// CertData is an SSL certification file used to secure etcd communication.
-	// Required if using a TLS connection.
-	// Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
-	CertData []byte `json:"certData,omitempty"`
-
-	// KeyData is an SSL key file used to secure etcd communication.
-	// Required if using a TLS connection.
-	// Deprecated: This field is deprecated and will be removed in a future version. Use SecretRef for providing client connection credentials.
-	KeyData []byte `json:"keyData,omitempty"`
-
 	// SecretRef references a Kubernetes secret containing the etcd connection credentials.
 	// The secret must contain the following data keys:
 	// ca.crt: The Certificate Authority (CA) certificate data.