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

fix: go mod confliction #5

Merged
merged 1 commit into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Volcano Global

Multi Cluster scheduler, designed to efficiently manage and schedule AI/ML, Bigdata workloads across multiple Kubernetes clusters.

# volcano-global
Expand All @@ -13,7 +14,7 @@ This project originated from:

# Quick start

You can read [deploy guide](docs/deploy/README).
You can read [deploy guide](docs/deploy/README.md).

# How does it run?

Expand Down
20 changes: 10 additions & 10 deletions docs/deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ You can install `Volcano` to all member cluster like:

```bash
# Switch to the member clusters, you need install the Volcano to the all member cluster.
export KUBECONFIG=/Users/vacant/.kube/members.config
export KUBECONFIG=$HOME/.kube/members.config

# Deploy Volcano to the member clusters.
kubectl --context member1 apply -f https://raw.githubusercontent.com/volcano-sh/volcano/release-1.10/installer/volcano-development.yaml
Expand All @@ -67,11 +67,11 @@ we need a plugin to share the target secret with the `volcano-global` namespace.

```bash
# Switch to Karmada host kubeconfig.
export KUBECONFIG=/Users/vacant/.kube/karmada.config
export KUBECONFIG=$HOME/.kube/karmada.config

# Deploy the Kubernetes Reflector and share the kubeconfig from karmada-system namespace.
# Deploy the Kubernetes Reflector and share the karmada-webhook-config secret from karmada-system namespace, it includes the kubeconfig of Karmada control plane.
kubectl --context karmada-host -n kube-system apply -f https://github.com/emberstack/kubernetes-reflector/releases/download/v7.1.262/reflector.yaml
kubectl --context karmada-host annotate secret kubeconfig \
kubectl --context karmada-host annotate secret karmada-webhook-config \
Copy link
Contributor Author

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

reflector.v1.k8s.emberstack.com/reflection-allowed="true" \
reflector.v1.k8s.emberstack.com/reflection-auto-namespaces="volcano-global" \
reflector.v1.k8s.emberstack.com/reflection-auto-enabled="true" \
Expand All @@ -96,7 +96,7 @@ You need to run these commands on `docs/deploy` direction.

```bash
# Switch to Karmada host kubeconfig.
export KUBECONFIG=/Users/vacant/.kube/karmada.config
export KUBECONFIG=$HOME/.kube/karmada.config

# Apply the component deployment yaml.
kubectl --context karmada-host apply -f volcano-global-namespace.yaml
Expand All @@ -111,7 +111,7 @@ kubectl --context karmada-apiserver apply -f volcano-global-webhooks.yaml

```bash
# Switch to Karmada host kubeconfig.
export KUBECONFIG=/Users/vacant/.kube/karmada.config
export KUBECONFIG=$HOME/.kube/karmada.config

# Update the karmada scheduler image.
kubectl --context karmada-host set image deployment/karmada-scheduler \
Expand All @@ -132,7 +132,7 @@ Required `Volcano` CRD List:

```bash
# Switch to Karmada host kubeconfig.
export KUBECONFIG=/Users/vacant/.kube/karmada.config
export KUBECONFIG=$HOME/.kube/karmada.config

# Apply the required CRD to Karmada control plane.
kubectl --context karmada-apiserver apply -f https://github.com/volcano-sh/volcano/raw/release-1.10/installer/helm/chart/volcano/crd/bases/batch.volcano.sh_jobs.yaml
Expand All @@ -150,7 +150,7 @@ You need to run these commands on `docs/deploy` direction.

```bash
# Switch to Karmada host kubeconfig.
export KUBECONFIG=/Users/vacant/.kube/karmada.config
export KUBECONFIG=$HOME/.kube/karmada.config

# Apply the volcano job resource interpreter customization configuration.
kubectl --context karmada-apiserver apply -f vcjob-resource-interpreter-customization.yaml
Expand All @@ -170,7 +170,7 @@ to prevent unintended consequences due to accidental deletion.

```bash
# Switch to Karmada host kubeconfig.
export KUBECONFIG=/Users/vacant/.kube/karmada.config
export KUBECONFIG=$HOME/.kube/karmada.config

# Apply the volcano job resource interpreter customization configuration.
kubectl --context karmada-apiserver apply -f volcano-global-all-queue-propagation.yaml
Expand All @@ -185,7 +185,7 @@ You need to run these commands on `docs/deploy` direction.

```bash
# Switch to Karmada host kubeconfig.
export KUBECONFIG=/Users/vacant/.kube/karmada.config
export KUBECONFIG=$HOME/.kube/karmada.config

# Apply the example job, try to care the status of member clusters.
kubectl --context karmada-apiserver apply -f exmaple/.
Expand Down
9 changes: 4 additions & 5 deletions docs/deploy/volcano-global-controller-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,18 @@ spec:
- name: volcano-global-controllers-manager
image: volcanosh/volcano-global-controller-manager:1.0
args:
- --kubeconfig=/etc/kubeconfig
- --kubeconfig=/etc/kubeconfig/karmada.config
- --leader-elect=false
- --logtostderr
- --enable-healthz=true
- -v=5
- 2>&1
imagePullPolicy: Never
volumeMounts:
- name: kubeconfig-secret
subPath: kubeconfig
- name: webhook-config
mountPath: /etc/kubeconfig
readOnly: true
volumes:
- name: kubeconfig-secret
- name: webhook-config
secret:
secretName: kubeconfig
secretName: karmada-webhook-config
9 changes: 4 additions & 5 deletions docs/deploy/volcano-global-webhook-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
containers:
- name: volcano-global-webhook-manager
args:
- --kubeconfig=/etc/kubeconfig
- --kubeconfig=/etc/kubeconfig/karmada.config
- --enabled-admission=/resourcebindings/mutate
- --tls-cert-file=/admission.local.config/certificates/tls.crt
- --tls-private-key-file=/admission.local.config/certificates/tls.key
Expand All @@ -37,14 +37,13 @@ spec:
- mountPath: /admission.local.config/certificates
name: admission-certs
readOnly: true
- name: kubeconfig-secret
subPath: kubeconfig
- name: webhook-config
mountPath: /etc/kubeconfig
readOnly: true
volumes:
- name: kubeconfig-secret
- name: webhook-config
secret:
secretName: kubeconfig
secretName: karmada-webhook-config
- name: admission-certs
secret:
secretName: volcano-global-webhook-cert
Expand Down
90 changes: 45 additions & 45 deletions go.mod
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
Copy link
Contributor Author

Choose a reason for hiding this comment

The 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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

)
Loading