This repository has been archived by the owner on Oct 6, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from everpeace/upgrade-kubernetes-v1.23.4
Upgrade kubernetes v1.23.4
- Loading branch information
Showing
5 changed files
with
460 additions
and
341 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM golang:1.16 as builder | ||
| FROM golang:1.17 as builder | ||
| ARG RELEASE | ||
| ARG VERSION | ||
| WORKDIR /workspace | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -106,7 +106,7 @@ setup: | |
| $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected]) | ||
| $(call go-get-tool,$(KIND),sigs.k8s.io/kind) | ||
| cd $(shell go env GOPATH) && \ | ||
| curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(DEV_TOOL_PREFIX)/bin v1.27.0 | ||
| curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(DEV_TOOL_PREFIX)/bin v1.43.0 | ||
|
|
||
| # go-get-tool will 'go get' any package $2 and install it to $1. | ||
| define go-get-tool | ||
|
|
@@ -158,9 +158,13 @@ export E2E_GOMEGA_DEFAULT_CONSISTENTLY_DURATION=2s | |
| E2E_PAUSE_IMAGE=k8s.gcr.io/pause:3.2 | ||
| E2E_KIND_KUBECNOFIG = $(DEV_TOOL_PREFIX)/.kubeconfig | ||
| E2E_KIND_CONF=./hack/e2e/kind.conf | ||
| E2E_NODE_IMAGE ?= kindest/node:v1.23.4 | ||
| e2e-setup: | ||
| $(KIND) get clusters | grep kube-throttler-e2e 2>&1 >/dev/null \ | ||
| || $(KIND) create cluster --name=kube-throttler-e2e --kubeconfig=$(E2E_KIND_KUBECNOFIG) --config=$(E2E_KIND_CONF) | ||
| || $(KIND) create cluster --name=kube-throttler-e2e \ | ||
| --kubeconfig=$(E2E_KIND_KUBECNOFIG) \ | ||
| --config=$(E2E_KIND_CONF) \ | ||
| --image=$(E2E_NODE_IMAGE) | ||
| kubectl --kubeconfig=$(E2E_KIND_KUBECNOFIG) apply -f ./deploy/crd.yaml | ||
| docker pull $(E2E_PAUSE_IMAGE) | ||
| $(KIND) load docker-image $(E2E_PAUSE_IMAGE) --name=kube-throttler-e2e | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,147 @@ | ||
| module github.com/everpeace/kube-throttler | ||
|
|
||
| go 1.16 | ||
| go 1.17 | ||
|
|
||
| require ( | ||
| github.com/MakeNowJust/heredoc v1.0.0 | ||
| github.com/google/go-cmp v0.5.5 | ||
| github.com/onsi/ginkgo v1.16.5 | ||
| github.com/onsi/gomega v1.16.0 | ||
| github.com/pkg/errors v0.9.1 | ||
| github.com/prometheus/client_golang v1.7.1 | ||
| github.com/prometheus/client_golang v1.11.0 | ||
| github.com/spf13/cobra v1.2.1 | ||
| k8s.io/api v0.20.5 | ||
| k8s.io/apimachinery v0.20.5 | ||
| k8s.io/apiserver v0.20.5 | ||
| k8s.io/client-go v0.20.5 | ||
| k8s.io/component-base v0.20.5 | ||
| k8s.io/klog/v2 v2.8.0 | ||
| k8s.io/kube-scheduler v0.20.5 // indirect | ||
| k8s.io/kubernetes v1.20.5 | ||
| k8s.io/utils v0.0.0-20210629042839-4a2b36d8d73f | ||
| k8s.io/api v0.23.4 | ||
| k8s.io/apimachinery v0.23.4 | ||
| k8s.io/apiserver v0.23.4 | ||
| k8s.io/client-go v0.23.4 | ||
| k8s.io/component-base v0.23.4 | ||
| k8s.io/klog/v2 v2.30.0 | ||
| k8s.io/kubernetes v1.23.4 | ||
| k8s.io/utils v0.0.0-20211116205334-6203023598ed | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect | ||
| github.com/NYTimes/gziphandler v1.1.1 // indirect | ||
| github.com/PuerkitoBio/purell v1.1.1 // indirect | ||
| github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect | ||
| github.com/beorn7/perks v1.0.1 // indirect | ||
| github.com/bits-and-blooms/bitset v1.2.0 // indirect | ||
| github.com/blang/semver v3.5.1+incompatible // indirect | ||
| github.com/cespare/xxhash/v2 v2.1.1 // indirect | ||
| github.com/coreos/go-semver v0.3.0 // indirect | ||
| github.com/coreos/go-systemd/v22 v22.3.2 // indirect | ||
| github.com/cyphar/filepath-securejoin v0.2.2 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/docker/distribution v2.7.1+incompatible // indirect | ||
| github.com/emicklei/go-restful v2.9.5+incompatible // indirect | ||
| github.com/evanphx/json-patch v4.12.0+incompatible // indirect | ||
| github.com/felixge/httpsnoop v1.0.1 // indirect | ||
| github.com/fsnotify/fsnotify v1.4.9 // indirect | ||
| github.com/go-logr/logr v1.2.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/gogo/protobuf v1.3.2 // indirect | ||
| github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | ||
| github.com/golang/protobuf v1.5.2 // indirect | ||
| github.com/google/gofuzz v1.1.0 // indirect | ||
| github.com/google/uuid v1.1.2 // indirect | ||
| github.com/googleapis/gnostic v0.5.5 // indirect | ||
| github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect | ||
| github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect | ||
| github.com/imdario/mergo v0.3.5 // indirect | ||
| github.com/inconshreveable/mousetrap v1.0.0 // indirect | ||
| github.com/josharian/intern v1.0.0 // indirect | ||
| github.com/json-iterator/go v1.1.12 // indirect | ||
| github.com/mailru/easyjson v0.7.6 // indirect | ||
| github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // 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.2 // indirect | ||
| github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
| github.com/nxadm/tail v1.4.8 // indirect | ||
| github.com/opencontainers/go-digest v1.0.0 // indirect | ||
| github.com/opencontainers/runc v1.0.2 // indirect | ||
| github.com/opencontainers/selinux v1.8.2 // indirect | ||
| github.com/prometheus/client_model v0.2.0 // indirect | ||
| github.com/prometheus/common v0.28.0 // indirect | ||
| github.com/prometheus/procfs v0.6.0 // indirect | ||
| github.com/spf13/pflag v1.0.5 // indirect | ||
| go.etcd.io/etcd/api/v3 v3.5.0 // indirect | ||
| go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect | ||
| go.etcd.io/etcd/client/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.uber.org/atomic v1.7.0 // indirect | ||
| go.uber.org/multierr v1.6.0 // indirect | ||
| go.uber.org/zap v1.19.0 // indirect | ||
| golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect | ||
| golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect | ||
| golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect | ||
| golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect | ||
| golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect | ||
| golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect | ||
| golang.org/x/text v0.3.7 // indirect | ||
| golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect | ||
| golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect | ||
| google.golang.org/appengine v1.6.7 // indirect | ||
| google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect | ||
| google.golang.org/grpc v1.40.0 // indirect | ||
| google.golang.org/protobuf v1.27.1 // indirect | ||
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect | ||
| gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect | ||
| gopkg.in/yaml.v2 v2.4.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect | ||
| k8s.io/cloud-provider v0.23.4 // indirect | ||
| k8s.io/component-helpers v0.23.4 // indirect | ||
| k8s.io/csi-translation-lib v0.23.4 // indirect | ||
| k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect | ||
| k8s.io/kube-scheduler v0.23.4 // indirect | ||
| k8s.io/mount-utils v0.23.4 // indirect | ||
| sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 // indirect | ||
| sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect | ||
| sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect | ||
| sigs.k8s.io/yaml v1.2.0 // indirect | ||
| ) | ||
|
|
||
| replace ( | ||
| // see https://github.com/kubernetes/kubernetes/blob/v1.20.5/go.mod#L473 | ||
| google.golang.org/grpc => google.golang.org/grpc v1.27.1 | ||
| k8s.io/api => k8s.io/api v0.20.5 | ||
| k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.5 | ||
| k8s.io/apimachinery => k8s.io/apimachinery v0.20.5 | ||
| k8s.io/apiserver => k8s.io/apiserver v0.20.5 | ||
| k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.5 | ||
| k8s.io/client-go => k8s.io/client-go v0.20.5 | ||
| k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.5 | ||
| k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.5 | ||
| k8s.io/code-generator => k8s.io/code-generator v0.20.5 | ||
| k8s.io/component-base => k8s.io/component-base v0.20.5 | ||
| k8s.io/component-helpers => k8s.io/component-helpers v0.20.5 | ||
| k8s.io/controller-manager => k8s.io/controller-manager v0.20.5 | ||
| k8s.io/cri-api => k8s.io/cri-api v0.20.5 | ||
| k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.5 | ||
| k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.5 | ||
| k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.5 | ||
| k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.5 | ||
| k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.5 | ||
| k8s.io/kubectl => k8s.io/kubectl v0.20.5 | ||
| k8s.io/kubelet => k8s.io/kubelet v0.20.5 | ||
| k8s.io/kubernetes => k8s.io/kubernetes v1.20.5 | ||
| k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.5 | ||
| k8s.io/metrics => k8s.io/metrics v0.20.5 | ||
| k8s.io/mount-utils => k8s.io/mount-utils v0.20.5 | ||
| k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.5 | ||
| // see https://github.com/kubernetes/kubernetes/blob/v1.23.4/go.mod#L474 | ||
| google.golang.org/grpc => google.golang.org/grpc v1.40.0 | ||
| k8s.io/api => k8s.io/api v0.23.4 | ||
| k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.4 | ||
| k8s.io/apimachinery => k8s.io/apimachinery v0.23.4 | ||
| k8s.io/apiserver => k8s.io/apiserver v0.23.4 | ||
| k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.4 | ||
| k8s.io/client-go => k8s.io/client-go v0.23.4 | ||
| k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.4 | ||
| k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.4 | ||
| k8s.io/code-generator => k8s.io/code-generator v0.23.4 | ||
| k8s.io/component-base => k8s.io/component-base v0.23.4 | ||
| k8s.io/component-helpers => k8s.io/component-helpers v0.23.4 | ||
| k8s.io/controller-manager => k8s.io/controller-manager v0.23.4 | ||
| k8s.io/cri-api => k8s.io/cri-api v0.23.4 | ||
| k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.4 | ||
| k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.4 | ||
| k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.4 | ||
| k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.4 | ||
| k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.4 | ||
| k8s.io/kubectl => k8s.io/kubectl v0.23.4 | ||
| k8s.io/kubelet => k8s.io/kubelet v0.23.4 | ||
| k8s.io/kubernetes => k8s.io/kubernetes v1.23.4 | ||
| k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.4 | ||
| k8s.io/metrics => k8s.io/metrics v0.23.4 | ||
| k8s.io/mount-utils => k8s.io/mount-utils v0.23.4 | ||
| k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.4 | ||
| k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.4 | ||
| ) |
Oops, something went wrong.