Merge pull request #348 from catpineapple/kerberos-type-fix

[fix](dcr) fix kerberos type
apache · Mar 4, 2025 · 528c324 · 528c324
2 parents 5ea7e13 + 4b9cce4
commit 528c324
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 14 deletions.
diff --git a/api/doris/v1/types.go b/api/doris/v1/types.go
@@ -59,12 +59,12 @@ type DorisClusterSpec struct {
 
 type KerberosInfo struct {
 	// Krb5ConfigMap is the name of configmap within 'krb5.conf'
-	Krb5ConfigMap string `json:"krb5ConfigMap"`
+	Krb5ConfigMap string `json:"krb5ConfigMap,omitempty"`
 
 	// SecretName is the name of sercet within '*.keytab' files,
 	// refer to the following command to create a Secret :
 	// 	'kubectl create secret generic {secret-name} --from-file=. '
-	KeytabSecretName string `json:"keytabSecretName"`
+	KeytabSecretName string `json:"keytabSecretName,omitempty"`
 
 	// KeytabPath is the path where the Secret is finally stored inside the pod. default '/etc/keytab/'.
 	// It is not recommended to modify it unless necessary.

diff --git a/config/crd/bases/crds.yaml b/config/crd/bases/crds.yaml
@@ -8868,9 +8868,6 @@ spec:
                   krb5ConfigMap:
                     description: Krb5ConfigMap is the name of configmap within 'krb5.conf'
                     type: string
-                required:
-                - keytabSecretName
-                - krb5ConfigMap
                 type: object
             type: object
           status:

diff --git a/config/crd/bases/doris.apache.com_dorisclusters.yaml b/config/crd/bases/doris.apache.com_dorisclusters.yaml
@@ -8868,9 +8868,6 @@ spec:
                   krb5ConfigMap:
                     description: Krb5ConfigMap is the name of configmap within 'krb5.conf'
                     type: string
-                required:
-                - keytabSecretName
-                - krb5ConfigMap
                 type: object
             type: object
           status:

diff --git a/config/crd/bases/doris.selectdb.com_dorisclusters.yaml b/config/crd/bases/doris.selectdb.com_dorisclusters.yaml
@@ -8868,9 +8868,6 @@ spec:
                   krb5ConfigMap:
                     description: Krb5ConfigMap is the name of configmap within 'krb5.conf'
                     type: string
-                required:
-                - keytabSecretName
-                - krb5ConfigMap
                 type: object
             type: object
           status:

diff --git a/helm-charts/doris-operator/crds/doris.apache.com_dorisclusters.yaml b/helm-charts/doris-operator/crds/doris.apache.com_dorisclusters.yaml
@@ -8868,9 +8868,6 @@ spec:
                   krb5ConfigMap:
                     description: Krb5ConfigMap is the name of configmap within 'krb5.conf'
                     type: string
-                required:
-                - keytabSecretName
-                - krb5ConfigMap
                 type: object
             type: object
           status: