Skip to content
This repository has been archived by the owner on Apr 24, 2023. It is now read-only.

Update K8S Version to 1.25 #241

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions examples/extender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ data:
"hardPodAffinitySymmetricWeight": 10
}
kube-scheduler-config: |
apiVersion: kubescheduler.config.k8s.io/v1alpha1
apiVersion: kubescheduler.config.k8s.io/v1
kind: KubeSchedulerConfiguration
schedulerName: spark-scheduler
algorithmSource:
Expand Down Expand Up @@ -237,4 +237,4 @@ spec:
name: spark-scheduler
items:
- key: spark-scheduler-conversion-webhook-config
path: install.yml
path: install.yml
91 changes: 45 additions & 46 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,31 @@ require (
github.com/spf13/cobra v1.4.0
go.uber.org/atomic v1.7.0
// Pin for CVE-2022-27664
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
k8s.io/api v0.24.7
k8s.io/apiextensions-apiserver v0.24.7
k8s.io/apimachinery v0.24.7
k8s.io/client-go v0.24.7
k8s.io/component-helpers v0.24.7
golang.org/x/net v0.7.0 // indirect
k8s.io/api v0.26.2
k8s.io/apiextensions-apiserver v0.25.7
k8s.io/apimachinery v0.26.2
k8s.io/client-go v0.25.7
k8s.io/component-helpers v0.25.7
k8s.io/kube-scheduler v0.0.0
k8s.io/kubernetes v1.24.7
k8s.io/kubernetes v1.25.7
sigs.k8s.io/controller-runtime v0.11.0
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-logr/logr v1.2.3 // 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/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
Expand Down Expand Up @@ -67,26 +67,25 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/satori/go.uuid v1.2.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/goleak v1.2.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // 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-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.24.7 // indirect
k8s.io/component-base v0.24.7 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

Expand All @@ -96,29 +95,29 @@ replace (
google.golang.org/grpc => google.golang.org/grpc v1.26.0
// k8s.io/kubernetes sets these to v0.0.0, replace them with the current
// k8s.io/kubernetes version to be able to depend on it.
k8s.io/api => k8s.io/api v0.24.7
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.7
k8s.io/apimachinery => k8s.io/apimachinery v0.24.7
k8s.io/apiserver => k8s.io/apiserver v0.24.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.7
k8s.io/client-go => k8s.io/client-go v0.24.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.7
k8s.io/code-generator => k8s.io/code-generator v0.24.7
k8s.io/component-base => k8s.io/component-base v0.24.7
k8s.io/component-helpers => k8s.io/component-helpers v0.24.7
k8s.io/controller-manager => k8s.io/controller-manager v0.24.7
k8s.io/cri-api => k8s.io/cri-api v0.24.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.7
k8s.io/kubectl => k8s.io/kubectl v0.24.7
k8s.io/kubelet => k8s.io/kubelet v0.24.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.7
k8s.io/metrics => k8s.io/metrics v0.24.7
k8s.io/mount-utils => k8s.io/mount-utils v0.24.7
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.7
k8s.io/api => k8s.io/api v0.26.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.7
k8s.io/apimachinery => k8s.io/apimachinery v0.25.7
k8s.io/apiserver => k8s.io/apiserver v0.25.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.7
k8s.io/client-go => k8s.io/client-go v0.25.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.7
k8s.io/code-generator => k8s.io/code-generator v0.25.7
k8s.io/component-base => k8s.io/component-base v0.25.7
k8s.io/component-helpers => k8s.io/component-helpers v0.25.7
k8s.io/controller-manager => k8s.io/controller-manager v0.25.7
k8s.io/cri-api => k8s.io/cri-api v0.25.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.7
k8s.io/kubectl => k8s.io/kubectl v0.25.7
k8s.io/kubelet => k8s.io/kubelet v0.25.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.7
k8s.io/metrics => k8s.io/metrics v0.25.7
k8s.io/mount-utils => k8s.io/mount-utils v0.25.7
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.7
)
Loading