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.

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

bump K8s to v1.22.17 #5182

Merged
merged 12 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/chaos.yaml
Expand Up @@ -54,7 +54,7 @@ jobs:
uses: chaos-mesh/chaos-mesh-actions@master
env:
CFG_BASE64: YXBpVmVyc2lvbjogY2hhb3MtbWVzaC5vcmcvdjFhbHBoYTEKa2luZDogUG9kQ2hhb3MKbWV0YWRhdGE6CiAgbmFtZTogcG9kLWZhaWx1cmUKICBuYW1lc3BhY2U6IHBpbmdjYXAKc3BlYzoKICBhY3Rpb246IHBvZC1mYWlsdXJlIAogIG1vZGU6IG9uZSAKICBkdXJhdGlvbjogIjYwcyIKICBzZWxlY3RvcjoKICAgIGxhYmVsU2VsZWN0b3JzOgogICAgICAiYXBwLmt1YmVybmV0ZXMuaW8vY29tcG9uZW50IjogImNvbnRyb2xsZXItbWFuYWdlciIKICBzY2hlZHVsZXI6CiAgICBjcm9uOiAiQGV2ZXJ5IDVtIgo=
hanlins marked this conversation as resolved.
Show resolved Hide resolved
CHAOS_MESH_VERSION: v1.0.0
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
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
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
38 changes: 0 additions & 38 deletions cmd/to-crdgen/main.go

This file was deleted.

2 changes: 1 addition & 1 deletion docs/api-references/docs.md
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
159 changes: 84 additions & 75 deletions go.mod
Expand Up @@ -31,12 +31,12 @@ require (
github.com/onsi/gomega v1.10.2
github.com/openshift/generic-admission-server v1.14.1-0.20210422140326-da96454c926d
github.com/pingcap/TiProxy/lib v0.0.0-20230201020701-df06ec482c69
github.com/pingcap/advanced-statefulset/client v1.17.1-0.20230713082326-10c25e6b76a3
github.com/pingcap/advanced-statefulset/client v1.17.1-0.20230717084314-aebf289f5b33
github.com/pingcap/errors v0.11.4
github.com/pingcap/kvproto v0.0.0-20200927054727-1290113160f0
github.com/pingcap/tidb-operator/pkg/apis v1.6.0-alpha.3
github.com/pingcap/tidb-operator/pkg/client v1.6.0-alpha.3
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.26.0
github.com/prometheus/prom2json v1.3.0
Expand All @@ -48,56 +48,73 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.1
github.com/tikv/pd v2.1.17+incompatible
github.com/yisaer/crd-validation v0.0.3
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
go.etcd.io/etcd/client/v3 v3.5.0
go.uber.org/atomic v1.9.0
gocloud.dev v0.18.0
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
gomodules.xyz/jsonpatch/v2 v2.1.0
google.golang.org/grpc v1.27.1
google.golang.org/grpc v1.38.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.14
k8s.io/apiextensions-apiserver v0.21.14
k8s.io/apimachinery v0.21.14
k8s.io/apiserver v0.21.14
k8s.io/cli-runtime v0.21.14
k8s.io/client-go v0.21.14
k8s.io/component-base v0.21.14
k8s.io/api v0.22.17
k8s.io/apiextensions-apiserver v0.22.17
k8s.io/apimachinery v0.22.17
k8s.io/apiserver v0.22.17
k8s.io/cli-runtime v0.22.17
k8s.io/client-go v0.22.17
k8s.io/component-base v0.22.17
k8s.io/klog/v2 v2.9.0
k8s.io/kube-aggregator v0.21.14
k8s.io/kube-scheduler v0.21.14
k8s.io/kubectl v0.21.14
k8s.io/kubernetes v1.21.14
k8s.io/kube-aggregator v0.22.17
k8s.io/kube-scheduler v0.22.17
k8s.io/kubectl v0.22.17
k8s.io/kubernetes v1.22.17
k8s.io/utils v0.0.0-20211116205334-6203023598ed
mvdan.cc/sh/v3 v3.4.3
sigs.k8s.io/controller-runtime v0.7.2
)

require (
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/fvbommel/sortorder v1.0.1 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/opencontainers/runc v1.0.2 // indirect
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
go.opentelemetry.io/otel v0.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
k8s.io/component-helpers v0.21.14 // indirect
k8s.io/component-helpers v0.22.17 // indirect
k8s.io/kubelet v0.0.0 // indirect
sigs.k8s.io/kustomize/api v0.8.8 // indirect
sigs.k8s.io/kustomize/kyaml v0.10.17 // indirect
sigs.k8s.io/kustomize/api v0.8.11 // indirect
sigs.k8s.io/kustomize/kyaml v0.11.0 // indirect
)

require (
cloud.google.com/go v0.54.0 // indirect
github.com/Azure/azure-pipeline-go v0.2.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.12 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.1 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/logger v0.2.0 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317 // indirect
Expand All @@ -120,50 +137,46 @@ require (
github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
github.com/containerd/containerd v1.4.4 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.0 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect; indirectload
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/go-openapi/jsonpointer v0.19.3 // indirect
github.com/go-openapi/jsonreference v0.19.3 // indirect
github.com/go-openapi/spec v0.19.5 // indirect
github.com/go-openapi/swag v0.19.5 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/google/wire v0.3.0 // indirect
github.com/googleapis/gax-go v2.0.2+incompatible // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.13.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/imdario/mergo v0.3.10 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mailru/easyjson v0.7.0 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/minio/sha256-simd v0.1.1 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb // indirect
Expand All @@ -189,7 +202,7 @@ require (
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b // indirect
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
Expand All @@ -200,7 +213,7 @@ require (
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/api v0.20.0 // indirect
google.golang.org/appengine v1.6.6 // indirect
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/gcfg.v1 v1.2.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand All @@ -210,10 +223,10 @@ require (
gopkg.in/warnings.v0 v0.1.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
honnef.co/go/tools v0.0.1-2020.1.3 // indirect
k8s.io/cloud-provider v0.21.14 // indirect
k8s.io/csi-translation-lib v0.21.14 // indirect
k8s.io/cloud-provider v0.22.17 // indirect
k8s.io/csi-translation-lib v0.22.17 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20211110012726-3cc51fd1e909 // indirect
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
k8s.io/legacy-cloud-providers v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
Expand All @@ -226,65 +239,61 @@ replace github.com/pingcap/tidb-operator/pkg/client => ./pkg/client

replace github.com/renstrom/dedent => github.com/lithammer/dedent v1.1.0

replace k8s.io/api => k8s.io/api v0.21.14
replace k8s.io/api => k8s.io/api v0.22.17

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.14
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.17

replace k8s.io/apimachinery => k8s.io/apimachinery v0.21.14
replace k8s.io/apimachinery => k8s.io/apimachinery v0.22.17

replace k8s.io/apiserver => k8s.io/apiserver v0.21.14
replace k8s.io/apiserver => k8s.io/apiserver v0.22.17

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.14
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.17

replace k8s.io/client-go => k8s.io/client-go v0.21.14
replace k8s.io/client-go => k8s.io/client-go v0.22.17

replace k8s.io/code-generator => k8s.io/code-generator v0.21.14
replace k8s.io/code-generator => k8s.io/code-generator v0.22.17

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.14
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.17

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.14
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.17

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.14
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.17

replace k8s.io/kubelet => k8s.io/kubelet v0.21.14
replace k8s.io/kubelet => k8s.io/kubelet v0.22.17

replace k8s.io/metrics => k8s.io/metrics v0.21.14
replace k8s.io/metrics => k8s.io/metrics v0.22.17

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.14
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.17

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.14
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.17

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.14
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.17

replace k8s.io/component-base => k8s.io/component-base v0.21.14
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.17

replace k8s.io/cri-api => k8s.io/cri-api v0.21.14
replace k8s.io/component-base => k8s.io/component-base v0.22.17

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.14
replace k8s.io/cri-api => k8s.io/cri-api v0.22.17

replace k8s.io/kubectl => k8s.io/kubectl v0.21.14
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.17

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.14
replace k8s.io/kubectl => k8s.io/kubectl v0.22.17

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.17

replace github.com/uber-go/atomic => go.uber.org/atomic v1.5.0

replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.0+incompatible

replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.11.1

replace k8s.io/controller-manager => k8s.io/controller-manager v0.21.14

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.14
replace k8s.io/controller-manager => k8s.io/controller-manager v0.22.17

replace k8s.io/component-helpers => k8s.io/component-helpers v0.21.14
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.17

replace k8s.io/mount-utils => k8s.io/mount-utils v0.21.14
replace k8s.io/component-helpers => k8s.io/component-helpers v0.22.17

// workaround for https://github.com/kubernetes/apiserver/issues/65
// controller-rutime v0.7.2 use github.com/googleapis/gnostic v0.5.0, kube-apiserver v1.19 use github.com/googleapis/gnostic v0.4.1
// so downgrade github.com/googleapis/gnostic to v0.4.1
// TODO: remove it after upgrading kubernetes dependency to v1.22
replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
replace k8s.io/mount-utils => k8s.io/mount-utils v0.22.17

// workaround for github.com/advisories/GHSA-25xm-hr59-7c27
// TODO: remove it after upgrading github.com/mholt/archiver greater than v3.5.0
Expand Down