-
Notifications
You must be signed in to change notification settings - Fork 4
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
fix: go mod confliction #5
Merged
volcano-sh-bot
merged 1 commit into
volcano-sh:main
from
Vacant2333:fix-go-mod-conflicat
Dec 9, 2024
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,25 +1,26 @@ | ||
module volcano.sh/volcano-global | ||
|
||
go 1.22.0 | ||
go 1.22.9 | ||
|
||
require ( | ||
github.com/karmada-io/karmada v1.10.2 | ||
github.com/karmada-io/karmada v0.0.0-00010101000000-000000000000 | ||
github.com/spf13/pflag v1.0.5 | ||
gomodules.xyz/jsonpatch/v2 v2.4.0 | ||
k8s.io/api v0.30.2 | ||
k8s.io/apimachinery v0.30.2 | ||
k8s.io/apiserver v0.30.2 | ||
k8s.io/client-go v0.30.2 | ||
k8s.io/component-base v0.30.2 | ||
k8s.io/klog/v2 v2.120.1 | ||
k8s.io/klog/v2 v2.130.1 | ||
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b | ||
sigs.k8s.io/controller-runtime v0.17.5 | ||
sigs.k8s.io/controller-runtime v0.18.4 | ||
volcano.sh/apis v1.10.0 | ||
volcano.sh/volcano v1.10.0 | ||
) | ||
|
||
// todo: remove this when resourceBinding suspend merge to master | ||
// PR ref: https://github.com/karmada-io/karmada/commit/3058bbf50b953d02166625e2b797cb16c7f26396 | ||
replace github.com/karmada-io/karmada => github.com/Vacant2333/karmada v0.0.0-20240606155424-3058bbf50b95 | ||
// Ref: https://github.com/Vacant2333/karmada/tree/suspend-rb-2 | ||
replace github.com/karmada-io/karmada => github.com/Vacant2333/karmada v0.0.0-20241207135009-0a9b0e40a707 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. change to the correct branch, we will remove this when karmada supports resource binding suspension |
||
|
||
require ( | ||
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect | ||
|
@@ -29,10 +30,10 @@ require ( | |
github.com/cespare/xxhash/v2 v2.3.0 // indirect | ||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect | ||
github.com/distribution/reference v0.5.0 // indirect | ||
github.com/emicklei/go-restful/v3 v3.11.0 // indirect | ||
github.com/emicklei/go-restful/v3 v3.12.1 // indirect | ||
github.com/evanphx/json-patch/v5 v5.9.0 // indirect | ||
github.com/fsnotify/fsnotify v1.7.0 // indirect | ||
github.com/go-logr/logr v1.4.1 // indirect | ||
github.com/go-logr/logr v1.4.2 // indirect | ||
github.com/go-logr/zapr v1.3.0 // indirect | ||
github.com/go-openapi/jsonpointer v0.20.2 // indirect | ||
github.com/go-openapi/jsonreference v0.20.4 // indirect | ||
|
@@ -55,9 +56,9 @@ require ( | |
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect | ||
github.com/mailru/easyjson v0.7.7 // indirect | ||
github.com/mitchellh/go-wordwrap v1.0.1 // indirect | ||
github.com/moby/spdystream v0.2.0 // indirect | ||
github.com/moby/sys/mountinfo v0.6.2 // indirect | ||
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect | ||
github.com/moby/spdystream v0.4.0 // indirect | ||
github.com/moby/sys/mountinfo v0.7.1 // indirect | ||
github.com/moby/term v0.5.0 // 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 | ||
|
@@ -66,42 +67,41 @@ require ( | |
github.com/opencontainers/selinux v1.11.0 // indirect | ||
github.com/pkg/errors v0.9.1 // indirect | ||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect | ||
github.com/prometheus/client_golang v1.19.0 // indirect | ||
github.com/prometheus/client_model v0.6.0 // indirect | ||
github.com/prometheus/common v0.48.0 // indirect | ||
github.com/prometheus/procfs v0.12.0 // indirect | ||
github.com/rogpeppe/go-internal v1.11.0 // indirect | ||
github.com/prometheus/client_golang v1.19.1 // indirect | ||
github.com/prometheus/client_model v0.6.1 // indirect | ||
github.com/prometheus/common v0.55.0 // indirect | ||
github.com/prometheus/procfs v0.15.1 // indirect | ||
github.com/rogpeppe/go-internal v1.12.0 // indirect | ||
github.com/russross/blackfriday/v2 v2.1.0 // indirect | ||
github.com/spf13/cobra v1.8.0 // indirect | ||
github.com/spf13/cobra v1.8.1 // indirect | ||
github.com/stretchr/objx v0.5.2 // indirect | ||
github.com/stretchr/testify v1.9.0 // indirect | ||
go.uber.org/multierr v1.11.0 // indirect | ||
go.uber.org/zap v1.26.0 // indirect | ||
golang.org/x/crypto v0.23.0 // indirect | ||
golang.org/x/crypto v0.24.0 // indirect | ||
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect | ||
golang.org/x/net v0.25.0 // indirect | ||
golang.org/x/oauth2 v0.20.0 // indirect | ||
golang.org/x/sys v0.20.0 // indirect | ||
golang.org/x/term v0.20.0 // indirect | ||
golang.org/x/text v0.15.0 // indirect | ||
golang.org/x/net v0.26.0 // indirect | ||
golang.org/x/oauth2 v0.21.0 // indirect | ||
golang.org/x/sys v0.21.0 // indirect | ||
golang.org/x/term v0.21.0 // indirect | ||
golang.org/x/text v0.16.0 // indirect | ||
golang.org/x/time v0.5.0 // indirect | ||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect | ||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect | ||
google.golang.org/grpc v1.65.0 // indirect | ||
google.golang.org/protobuf v1.34.1 // indirect | ||
google.golang.org/protobuf v1.34.2 // 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.29.4 // indirect | ||
k8s.io/apiserver v0.30.2 // indirect | ||
k8s.io/cli-runtime v0.29.4 // indirect | ||
k8s.io/apiextensions-apiserver v0.30.2 // indirect | ||
k8s.io/cli-runtime v0.30.2 // indirect | ||
k8s.io/cloud-provider v0.25.0 // indirect | ||
k8s.io/component-helpers v0.30.2 // indirect | ||
k8s.io/csi-translation-lib v0.30.2 // indirect | ||
k8s.io/kube-scheduler v0.0.0 // indirect | ||
k8s.io/kubectl v0.29.4 // indirect | ||
k8s.io/kubectl v0.30.2 // indirect | ||
k8s.io/kubernetes v1.30.2 // indirect | ||
k8s.io/mount-utils v0.25.0 // indirect | ||
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect | ||
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect | ||
sigs.k8s.io/cluster-api v1.7.1 // indirect | ||
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect | ||
sigs.k8s.io/mcs-api v0.1.0 // indirect | ||
|
@@ -110,19 +110,19 @@ require ( | |
) | ||
|
||
replace ( | ||
github.com/vektra/mockery/v2 => github.com/vektra/mockery/v2 v2.10.0 | ||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0 | ||
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0 | ||
k8s.io/cri-api => k8s.io/cri-api v0.29.0 | ||
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0 | ||
k8s.io/endpointslice => k8s.io/endpointslice v0.29.0 | ||
k8s.io/kube-aggregator => k8s.io/kube-aggrega v0.29.0 | ||
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0 | ||
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0 | ||
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0 | ||
k8s.io/kubectl => k8s.io/kubectl v0.29.0 | ||
k8s.io/kubelet => k8s.io/kubelet v0.29.0 | ||
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0 | ||
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0 | ||
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0 | ||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.2 | ||
k8s.io/cri-api => k8s.io/cri-api v0.30.2 | ||
k8s.io/cri-client => k8s.io/cri-client v0.30.2 | ||
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.2 | ||
k8s.io/endpointslice => k8s.io/endpointslice v0.30.2 | ||
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.2 | ||
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.2 | ||
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.2 | ||
k8s.io/kubectl => k8s.io/kubectl v0.30.2 | ||
k8s.io/kubelet => k8s.io/kubelet v0.30.2 | ||
k8s.io/kubernetes => k8s.io/kubernetes v1.30.2 | ||
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.2 | ||
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.2 | ||
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.2 | ||
|
||
) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Karmada removes the kubeconfig secret, we must get the kubeconfig from the another secret