Skip to content

Commit 528c324

Browse files
author
smiletan
authored
Merge pull request #348 from catpineapple/kerberos-type-fix
[fix](dcr) fix kerberos type
2 parents 5ea7e13 + 4b9cce4 commit 528c324

File tree

5 files changed

+2
-14
lines changed

5 files changed

+2
-14
lines changed

api/doris/v1/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ type DorisClusterSpec struct {
5959

6060
type KerberosInfo struct {
6161
// Krb5ConfigMap is the name of configmap within 'krb5.conf'
62-
Krb5ConfigMap string `json:"krb5ConfigMap"`
62+
Krb5ConfigMap string `json:"krb5ConfigMap,omitempty"`
6363

6464
// SecretName is the name of sercet within '*.keytab' files,
6565
// refer to the following command to create a Secret :
6666
// 'kubectl create secret generic {secret-name} --from-file=. '
67-
KeytabSecretName string `json:"keytabSecretName"`
67+
KeytabSecretName string `json:"keytabSecretName,omitempty"`
6868

6969
// KeytabPath is the path where the Secret is finally stored inside the pod. default '/etc/keytab/'.
7070
// It is not recommended to modify it unless necessary.

config/crd/bases/crds.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8868,9 +8868,6 @@ spec:
88688868
krb5ConfigMap:
88698869
description: Krb5ConfigMap is the name of configmap within 'krb5.conf'
88708870
type: string
8871-
required:
8872-
- keytabSecretName
8873-
- krb5ConfigMap
88748871
type: object
88758872
type: object
88768873
status:

config/crd/bases/doris.apache.com_dorisclusters.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8868,9 +8868,6 @@ spec:
88688868
krb5ConfigMap:
88698869
description: Krb5ConfigMap is the name of configmap within 'krb5.conf'
88708870
type: string
8871-
required:
8872-
- keytabSecretName
8873-
- krb5ConfigMap
88748871
type: object
88758872
type: object
88768873
status:

config/crd/bases/doris.selectdb.com_dorisclusters.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8868,9 +8868,6 @@ spec:
88688868
krb5ConfigMap:
88698869
description: Krb5ConfigMap is the name of configmap within 'krb5.conf'
88708870
type: string
8871-
required:
8872-
- keytabSecretName
8873-
- krb5ConfigMap
88748871
type: object
88758872
type: object
88768873
status:

helm-charts/doris-operator/crds/doris.apache.com_dorisclusters.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8868,9 +8868,6 @@ spec:
88688868
krb5ConfigMap:
88698869
description: Krb5ConfigMap is the name of configmap within 'krb5.conf'
88708870
type: string
8871-
required:
8872-
- keytabSecretName
8873-
- krb5ConfigMap
88748871
type: object
88758872
type: object
88768873
status:

0 commit comments

Comments
 (0)