fix Certificate spec

pingcap · Jul 19, 2023 · 574305c · 574305c
1 parent 84b4ad2
commit 574305c
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 48 deletions.
diff --git a/examples/monitor-multiple-cluster-tls/cert-manager/ns1/cluster-client-secret.yaml b/examples/monitor-multiple-cluster-tls/cert-manager/ns1/cluster-client-secret.yaml
@@ -7,8 +7,9 @@ spec:
   secretName: ns1-cluster-client-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-    - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - client auth

diff --git a/examples/monitor-multiple-cluster-tls/cert-manager/ns1/pd-cluster-secret.yaml b/examples/monitor-multiple-cluster-tls/cert-manager/ns1/pd-cluster-secret.yaml
@@ -7,8 +7,9 @@ spec:
   secretName: ns1-pd-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-    - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth

diff --git a/examples/monitor-multiple-cluster-tls/cert-manager/ns1/tidb-client-cert.yaml b/examples/monitor-multiple-cluster-tls/cert-manager/ns1/tidb-client-cert.yaml
@@ -7,8 +7,9 @@ spec:
   secretName: ns1-tidb-client-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-    - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB Client"
   usages:
     - client auth

diff --git a/examples/monitor-multiple-cluster-tls/cert-manager/ns1/tidb-cluster-secret.yaml b/examples/monitor-multiple-cluster-tls/cert-manager/ns1/tidb-cluster-secret.yaml
@@ -7,8 +7,9 @@ spec:
   secretName: ns1-tidb-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-    - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth

diff --git a/examples/monitor-multiple-cluster-tls/cert-manager/ns1/tidb-server-secret.yaml b/examples/monitor-multiple-cluster-tls/cert-manager/ns1/tidb-server-secret.yaml
@@ -7,8 +7,9 @@ spec:
   secretName: ns1-tidb-server-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-    - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB Server"
   usages:
     - server auth

diff --git a/examples/monitor-multiple-cluster-tls/cert-manager/ns1/tikv-cluster-secret.yaml b/examples/monitor-multiple-cluster-tls/cert-manager/ns1/tikv-cluster-secret.yaml
@@ -7,8 +7,9 @@ spec:
   secretName: ns1-tikv-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-    - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth

diff --git a/examples/selfsigned-tls/tidb-client-cert.yaml b/examples/selfsigned-tls/tidb-client-cert.yaml
@@ -7,8 +7,8 @@ spec:
   subject:
     organizationalUnits:
       - "TiDB Operator"
-  organization:
-    - "PingCAP"
+    organizations:
+      - PingCAP
   duration: "8760h" # 364 days
   # If you want verify server cert Common Name (e.g. --ssl-verify-server-cert
   # flag in MySQL CLI), you must configure the HostName you used to connect the

diff --git a/examples/selfsigned-tls/tidb-server-cert.yaml b/examples/selfsigned-tls/tidb-server-cert.yaml
@@ -7,8 +7,8 @@ spec:
   subject:
     organizationalUnits:
     - "TiDB Operator"
-  organization:
-  - "PingCAP"
+    organizations:
+      - PingCAP
   duration: "8760h" # 364 days
   # If you want verify server cert Common Name (e.g. --ssl-verify-server-cert
   # flag in MySQL CLI), you must configure the HostName you used to connect the

diff --git a/tests/e2e/br/utils/tls/manager.go b/tests/e2e/br/utils/tls/manager.go
@@ -76,8 +76,9 @@ spec:
   secretName: {{ .SecretName }}
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "{{ .CN }}"
   {{- if .Usages }}
   usages:

diff --git a/tests/e2e/tidbcluster/tls.go b/tests/e2e/tidbcluster/tls.go
@@ -81,8 +81,9 @@ spec:
   secretName: {{ .ClusterName }}-tidb-server-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-    - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB Server"
   usages:
     - server auth
@@ -110,8 +111,9 @@ spec:
   secretName: {{ .ClusterName }}-tidb-client-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-    - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB Client"
   usages:
     - client auth
@@ -131,8 +133,9 @@ spec:
   secretName: {{ .ClusterName }}-pd-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth
@@ -166,8 +169,9 @@ spec:
   secretName: {{ .ClusterName }}-tikv-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth
@@ -199,8 +203,9 @@ spec:
   secretName: {{ .ClusterName }}-tidb-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth
@@ -232,8 +237,9 @@ spec:
   secretName: {{ .ClusterName }}-cluster-client-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - client auth
@@ -251,8 +257,9 @@ spec:
   secretName: {{ .ClusterName }}-pump-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth
@@ -278,8 +285,9 @@ spec:
   secretName: {{ .ClusterName }}-drainer-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth
@@ -305,8 +313,9 @@ spec:
   secretName: {{ .ClusterName }}-tiflash-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth
@@ -338,8 +347,9 @@ spec:
   secretName: {{ .ClusterName }}-ticdc-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
   - server auth
@@ -373,8 +383,9 @@ spec:
   secretName: {{ .ClusterName }}-{{ .Component }}-tls
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-    - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB Client"
   usages:
     - client auth
@@ -394,8 +405,9 @@ spec:
   secretName: {{ .ClusterName }}-mysql-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-    - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "MySQL Server"
   usages:
     - server auth
@@ -421,8 +433,9 @@ spec:
   secretName: {{ .ClusterName }}-dm-master-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth
@@ -454,8 +467,9 @@ spec:
   secretName: {{ .ClusterName }}-dm-worker-cluster-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - server auth
@@ -487,8 +501,9 @@ spec:
   secretName: {{ .ClusterName }}-dm-client-secret
   duration: 8760h # 365d
   renewBefore: 360h # 15d
-  organization:
-  - PingCAP
+  subject:
+    organizations:
+      - PingCAP
   commonName: "TiDB"
   usages:
     - client auth