Merge branch 'master' into feat/br-fed-merge-kubeconfig

pingcap · Jul 27, 2023 · 65b5e32 · 65b5e32
2 parents a585099 + 34c19d4
commit 65b5e32
Show file tree

Hide file tree

Showing 113 changed files with 1,876 additions and 102,721 deletions.
diff --git a/.github/workflows/chaos.yaml b/.github/workflows/chaos.yaml
@@ -53,8 +53,8 @@ jobs:
     - name: Run chaos mesh
       uses: chaos-mesh/chaos-mesh-actions@master
       env:
-        CFG_BASE64: YXBpVmVyc2lvbjogY2hhb3MtbWVzaC5vcmcvdjFhbHBoYTEKa2luZDogUG9kQ2hhb3MKbWV0YWRhdGE6CiAgbmFtZTogcG9kLWZhaWx1cmUKICBuYW1lc3BhY2U6IHBpbmdjYXAKc3BlYzoKICBhY3Rpb246IHBvZC1mYWlsdXJlIAogIG1vZGU6IG9uZSAKICBkdXJhdGlvbjogIjYwcyIKICBzZWxlY3RvcjoKICAgIGxhYmVsU2VsZWN0b3JzOgogICAgICAiYXBwLmt1YmVybmV0ZXMuaW8vY29tcG9uZW50IjogImNvbnRyb2xsZXItbWFuYWdlciIKICBzY2hlZHVsZXI6CiAgICBjcm9uOiAiQGV2ZXJ5IDVtIgo=
-        CHAOS_MESH_VERSION: v1.0.0
+        CFG_BASE64: YXBpVmVyc2lvbjogY2hhb3MtbWVzaC5vcmcvdjFhbHBoYTEKa2luZDogU2NoZWR1bGUKbWV0YWRhdGE6CiAgbmFtZTogcG9kLWZhaWx1cmUKICBuYW1lc3BhY2U6IHBpbmdjYXAKc3BlYzoKICBzY2hlZHVsZTogJ0BldmVyeSA1bScKICB0eXBlOiBQb2RDaGFvcwogIGhpc3RvcnlMaW1pdDogNQogIGNvbmN1cnJlbmN5UG9saWN5OiBGb3JiaWQKICBwb2RDaGFvczoKICAgIGFjdGlvbjogcG9kLWZhaWx1cmUKICAgIG1vZGU6IG9uZQogICAgZHVyYXRpb246IDYwcwogICAgc2VsZWN0b3I6CiAgICAgIGxhYmVsU2VsZWN0b3JzOgogICAgICAgIGFwcC5rdWJlcm5ldGVzLmlvL2NvbXBvbmVudDogY29udHJvbGxlci1tYW5hZ2VyCg==
+        CHAOS_MESH_VERSION: v2.1.0
     - name: Run e2e
       run: |
         SKIP_UP=y ./hack/e2e.sh -- --ginkgo.focus='Restarter'

diff --git a/charts/tidb-operator/templates/admission/admission-webhook-registration.yaml b/charts/tidb-operator/templates/admission/admission-webhook-registration.yaml
@@ -41,7 +41,7 @@ webhooks:
     objectSelector:
       matchLabels:
         "app.kubernetes.io/managed-by": "tidb-operator"
-    admissionReviewVersions: ["v1beta1"]
+    admissionReviewVersions: ["v1"]
     failurePolicy: {{ .Values.admissionWebhook.failurePolicy.validation | default "Fail" }}
     sideEffects: None
     clientConfig:
@@ -79,7 +79,7 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 webhooks:
   - name: validating.admission.tidb.pingcap.com
-    admissionReviewVersions: ["v1beta1"]
+    admissionReviewVersions: ["v1"]
     failurePolicy: {{ .Values.admissionWebhook.failurePolicy.validation | default "Fail" }}
     sideEffects: None
     clientConfig:
@@ -113,7 +113,7 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+"  "_" }}
 webhooks:
   - name: defaulting.admission.tidb.pingcap.com
-    admissionReviewVersions: ["v1beta1"]
+    admissionReviewVersions: ["v1"]
     failurePolicy: {{ .Values.admissionWebhook.failurePolicy.mutation | default "Fail" }}
     sideEffects: None
     clientConfig:

diff --git a/charts/tidb-operator/values.yaml b/charts/tidb-operator/values.yaml
@@ -189,8 +189,7 @@ scheduler:
 # AdvancedStatefulSet controller.
 # Note that AdvancedStatefulSet CRD must be installed manually via the following
 # command:
-#   kubectl apply -f manifests/advanced-statefulset-crd.v1beta1.yaml # k8s version < 1.16.0
-#   kubectl apply -f manifests/advanced-statefulset-crd.v1.yaml      # k8s version >= 1.16.0
+#   kubectl apply -f manifests/advanced-statefulset-crd.v1.yaml
 advancedStatefulset:
   create: false
   image: pingcap/advanced-statefulset:v0.4.0

diff --git a/ci/pull_e2e_kind.groovy b/ci/pull_e2e_kind.groovy
@@ -150,8 +150,8 @@ e2ePodResources = [
         storage: "250Gi"
     ],
     limits: [
-        cpu: "16",
-        memory: "32Gi",
+        cpu: "24",
+        memory: "48Gi",
         storage: "250Gi"
     ],
 ]

diff --git a/cmd/to-crdgen/main.go b/cmd/to-crdgen/main.go
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -5619,7 +5619,7 @@ string
 <td>
 <code>AdditionalPrinterColums</code></br>
 <em>
-[]k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1.CustomResourceColumnDefinition
+[]k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceColumnDefinition
 </em>
 </td>
 <td>

diff --git a/examples/heterogeneous-tls/README.md b/examples/heterogeneous-tls/README.md
@@ -5,9 +5,6 @@ The following steps will create a basic TLS TiDB cluster , then we can create a
 
 ## Install Cert Manager 
 Reference [document](https://cert-manager.io/docs/installation/).
-```bash
-kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.7.1/cert-manager.yaml
-```
 
 ## Install TLS certificate
 The following commands is assumed to be executed in this directory.

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/selfsigned-ca.yaml b/examples/selfsigned-tls/selfsigned-ca.yaml
@@ -1,4 +1,4 @@
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: selfsigned-ca-cert

diff --git a/examples/selfsigned-tls/selfsigned-cert-issuer.yaml b/examples/selfsigned-tls/selfsigned-cert-issuer.yaml
@@ -1,4 +1,4 @@
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: selfsigned-cert-issuer

diff --git a/examples/selfsigned-tls/selfsigned-issuer.yaml b/examples/selfsigned-tls/selfsigned-issuer.yaml
@@ -1,4 +1,4 @@
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: selfsigned-issuer

diff --git a/examples/selfsigned-tls/tidb-client-cert.yaml b/examples/selfsigned-tls/tidb-client-cert.yaml
@@ -1,4 +1,4 @@
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: tidb-client-cert
@@ -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
@@ -1,4 +1,4 @@
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: tidb-server-cert
@@ -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