Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump K8s to v1.22.17 #5182

Merged
merged 12 commits into from
Jul 20, 2023
Merged

bump K8s to v1.22.17 #5182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d8bedc6
bump K8s to v1.22.17
csuzhangxc Jul 18, 2023
ec8e154
remove v1beta CRD and some v1beta APIs
csuzhangxc Jul 18, 2023
b4ec2b6
update chaos-mesh test
csuzhangxc Jul 18, 2023
fae26fb
revert
csuzhangxc Jul 18, 2023
22a5958
Update .github/workflows/chaos.yaml
hanlins Jul 18, 2023
7c5b11b
Update .github/workflows/chaos.yaml
hanlins Jul 18, 2023
79a321c
downgrade kind k8s for debug
csuzhangxc Jul 19, 2023
6635cac
increase E2E timeout and resource limits
csuzhangxc Jul 19, 2023
84b4ad2
bump cert-manager
csuzhangxc Jul 19, 2023
574305c
fix Certificate spec
csuzhangxc Jul 19, 2023
dc37fea
bump operator for serial tests and remove 1.7 case
csuzhangxc Jul 20, 2023
802fd91
fix build
csuzhangxc Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/chaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems apart from bumping chaos-mesh version, we also need to modify the CFG_BASE64 spec above. In chaos-mesh v2, scheduler field is deprecated (details in chaos-mesh/chaos-mesh#1578, chaos-mesh/rfcs#15, chaos-mesh/chaos-mesh#1520), and it seems the chaos-mesh team provided some docs for migration: https://chaos-mesh-website-archived.netlify.app/docs/upgrade-to-2.0/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the doc, the chaos spec should be modified to something like

apiVersion: chaos-mesh.org/v1alpha1
kind: Schedule
metadata:
  name: pod-failure
  namespace: pingcap
spec:
  schedule: '@every 5m'
  type: PodChaos
  historyLimit: 5
  concurrencyPolicy: Forbid
  podChaos:
    action: pod-failure
    mode: one
    duration: 60s
    selector:
      labelSelectors:
        app.kubernetes.io/component: controller-manager

- name: Run e2e
run: |
SKIP_UP=y ./hack/e2e.sh -- --ginkgo.focus='Restarter'
Expand Down
6 changes: 3 additions & 3 deletions charts/tidb-operator/templates/admission/admission-webhook-registration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions charts/tidb-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/pull_e2e_kind.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ e2ePodResources = [
storage: "250Gi"
],
limits: [
cpu: "16",
memory: "32Gi",
cpu: "24",
memory: "48Gi",
storage: "250Gi"
],
]
Expand Down
38 changes: 0 additions & 38 deletions cmd/to-crdgen/main.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docs/api-references/docs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions examples/heterogeneous-tls/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 3 additions & 2 deletions examples/monitor-multiple-cluster-tls/cert-manager/ns1/cluster-client-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions examples/monitor-multiple-cluster-tls/cert-manager/ns1/pd-cluster-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions examples/monitor-multiple-cluster-tls/cert-manager/ns1/tidb-client-cert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions examples/monitor-multiple-cluster-tls/cert-manager/ns1/tidb-cluster-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions examples/monitor-multiple-cluster-tls/cert-manager/ns1/tidb-server-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions examples/monitor-multiple-cluster-tls/cert-manager/ns1/tikv-cluster-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/selfsigned-tls/selfsigned-ca.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: cert-manager.io/v1alpha2
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: selfsigned-ca-cert
Expand Down
2 changes: 1 addition & 1 deletion examples/selfsigned-tls/selfsigned-cert-issuer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: cert-manager.io/v1alpha2
apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
name: selfsigned-cert-issuer
Expand Down
2 changes: 1 addition & 1 deletion examples/selfsigned-tls/selfsigned-issuer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: cert-manager.io/v1alpha2
apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
name: selfsigned-issuer
Expand Down
6 changes: 3 additions & 3 deletions examples/selfsigned-tls/tidb-client-cert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: cert-manager.io/v1alpha2
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: tidb-client-cert
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions examples/selfsigned-tls/tidb-server-cert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: cert-manager.io/v1alpha2
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: tidb-server-cert
Expand All @@ -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
Expand Down