-
Notifications
You must be signed in to change notification settings - Fork 143
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…1694) ### What changes were proposed in this pull request? 1. Upgrade Go to 1.19, Because mac brew doesn't support to install older than 1.19 Go. 2. Upgrade K8S api to 0.24. Because 1.24.1 supports to run the tests in the Mac M1 local machine and supports autoscaling/v2 api. 3. Change v2beta2 to v2 4. Use log4j2 instead of log4j ### Why are the changes needed? Kubernetes 1.26 removed the v2beta2 api of auto scaling. So our operator can't deployed some stable version K8S cluster. So I try to upgrade the version of the client. Compatible solution will be very difficult and bring more burden to maintain. So I choose to upgrade directly. If some users use low version, they can revert this pull request and compile again. Fix: #1673 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? UT + Manual test.
- Loading branch information
Showing
25 changed files
with
1,671 additions
and
1,173 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
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
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
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
6 changes: 3 additions & 3 deletions
6
deploy/kubernetes/operator/api/uniffle/v1alpha1/zz_generated.deepcopy.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2,277 changes: 1,268 additions & 1,009 deletions
2,277
deploy/kubernetes/operator/config/crd/bases/uniffle.apache.org_remoteshuffleservices.yaml
Large diffs are not rendered by default.
Oops, something went wrong.
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
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,78 +1,79 @@ | ||
module github.com/apache/incubator-uniffle/deploy/kubernetes/operator | ||
|
||
go 1.17 | ||
go 1.19 | ||
|
||
require ( | ||
github.com/onsi/ginkgo/v2 v2.1.4 | ||
github.com/onsi/gomega v1.20.0 | ||
github.com/stretchr/testify v1.7.0 | ||
github.com/stretchr/testify v1.8.0 | ||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 | ||
gomodules.xyz/jsonpatch/v2 v2.2.0 | ||
k8s.io/api v0.22.2 | ||
k8s.io/apimachinery v0.22.2 | ||
k8s.io/client-go v0.22.2 | ||
k8s.io/code-generator v0.22.2 | ||
k8s.io/klog/v2 v2.9.0 | ||
k8s.io/api v0.24.1 | ||
k8s.io/apimachinery v0.24.1 | ||
k8s.io/client-go v0.24.1 | ||
k8s.io/code-generator v0.24.1 | ||
k8s.io/klog/v2 v2.60.1 | ||
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 | ||
sigs.k8s.io/controller-runtime v0.10.0 | ||
sigs.k8s.io/controller-runtime v0.12.1 | ||
) | ||
|
||
require ( | ||
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/cespare/xxhash/v2 v2.1.1 // indirect | ||
github.com/cespare/xxhash/v2 v2.1.2 // indirect | ||
github.com/davecgh/go-spew v1.1.1 // indirect | ||
github.com/emicklei/go-restful v2.16.0+incompatible // indirect | ||
github.com/evanphx/json-patch v4.11.0+incompatible // indirect | ||
github.com/evanphx/json-patch v4.12.0+incompatible // indirect | ||
github.com/fsnotify/fsnotify v1.5.1 // indirect | ||
github.com/go-logr/logr v0.4.0 // indirect | ||
github.com/go-logr/zapr v0.4.0 // indirect | ||
github.com/go-logr/logr v1.2.0 // indirect | ||
github.com/go-logr/zapr 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/gnostic v0.5.7-v3refs // indirect | ||
github.com/google/go-cmp v0.5.8 // 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/imdario/mergo v0.3.12 // indirect | ||
github.com/josharian/intern v1.0.0 // indirect | ||
github.com/json-iterator/go v1.1.11 // 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/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
github.com/modern-go/reflect2 v1.0.1 // indirect | ||
github.com/onsi/ginkgo v1.16.5 // indirect | ||
github.com/modern-go/reflect2 v1.0.2 // indirect | ||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
github.com/pkg/errors v0.9.1 // indirect | ||
github.com/pmezard/go-difflib v1.0.0 // indirect | ||
github.com/prometheus/client_golang v1.11.1 // indirect | ||
github.com/prometheus/client_golang v1.12.1 // indirect | ||
github.com/prometheus/client_model v0.2.0 // indirect | ||
github.com/prometheus/common v0.26.0 // indirect | ||
github.com/prometheus/procfs v0.6.0 // indirect | ||
github.com/prometheus/common v0.32.1 // indirect | ||
github.com/prometheus/procfs v0.7.3 // indirect | ||
github.com/spf13/pflag v1.0.5 // 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 | ||
go.uber.org/zap v1.19.1 // 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 | ||
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect | ||
golang.org/x/sys v0.5.0 // indirect | ||
golang.org/x/term v0.5.0 // indirect | ||
golang.org/x/text v0.7.0 // indirect | ||
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect | ||
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect | ||
golang.org/x/tools v0.1.12 // indirect | ||
google.golang.org/appengine v1.6.7 // indirect | ||
google.golang.org/protobuf v1.33.0 // indirect | ||
gopkg.in/inf.v0 v0.9.1 // indirect | ||
gopkg.in/yaml.v2 v2.4.0 // indirect | ||
gopkg.in/yaml.v3 v3.0.1 // indirect | ||
k8s.io/apiextensions-apiserver v0.22.1 // indirect | ||
k8s.io/component-base v0.22.1 // indirect | ||
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect | ||
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect | ||
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect | ||
sigs.k8s.io/yaml v1.2.0 // indirect | ||
k8s.io/apiextensions-apiserver v0.24.0 // indirect | ||
k8s.io/component-base v0.24.0 // indirect | ||
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect | ||
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect | ||
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect | ||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect | ||
sigs.k8s.io/yaml v1.3.0 // indirect | ||
) |
Oops, something went wrong.