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.

Sign up for GitHub

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

1.18.10 rebase main #105

Closed
wants to merge 9 commits into from
Closed

1.18.10 rebase main #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f1ec54
support katalyst-api for version 1.18.10
waynepeking348 Feb 26, 2024
6aafce9
change dependency for gnostic, kube-openapi
waynepeking348 Feb 27, 2024
162cabe
support dedicated image fs disk
nightmeng Mar 7, 2024
1de2e11
add minimumImageFsDiskCapacityThreshold
nightmeng Mar 12, 2024
f8b1eda
add memory bandwidth resource
luomingmeng Mar 14, 2024
68c1a15
service extended indicator add BaselinePercent
luomingmeng Feb 28, 2024
96e68e2
add test extended indicator
luomingmeng Feb 29, 2024
aaafb9b
Merge pull request #71 from luomingmeng/dev/maintain-1.18.10-version-k8s
waynepeking348 Mar 15, 2024
ed786b8
Merge branch 'main' into dev/1.18.10-rebase-main
luomingmeng Dec 5, 2024
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
2 changes: 0 additions & 2 deletions config/crd/bases/workload.katalyst.kubewharf.io_serviceprofiledescriptors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,6 @@ spec:
Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
description: 'Standard object''s metadata. More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
type: object
timestamp:
description: The following fields define time interval
Expand Down
77 changes: 39 additions & 38 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ require (
google.golang.org/grpc v1.51.0
k8s.io/api v0.24.6
k8s.io/apimachinery v0.24.6
k8s.io/client-go v0.24.6
k8s.io/code-generator v0.24.6
k8s.io/client-go v0.18.10
k8s.io/code-generator v0.18.10
k8s.io/klog/v2 v2.70.1
k8s.io/kube-scheduler v0.24.6
k8s.io/kubelet v0.24.6
k8s.io/kubernetes v1.24.6
k8s.io/metrics v0.24.6
k8s.io/kubelet v0.18.10
k8s.io/kubernetes v1.18.10
k8s.io/metrics v0.18.10
sigs.k8s.io/yaml v1.2.0
)

Expand All @@ -27,20 +26,22 @@ require (
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/spec v0.19.3 // indirect
github.com/go-openapi/swag v0.19.14 // 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/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/hashicorp/golang-lru v0.5.1 // 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/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/pkg/errors v0.9.1 // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
Expand All @@ -55,43 +56,43 @@ require (
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/apiserver v0.24.6 // indirect
k8s.io/component-base v0.24.6 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // 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/structured-merge-diff/v3 v3.0.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.24.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.6
k8s.io/apimachinery => k8s.io/apimachinery v0.24.6
k8s.io/apiserver => k8s.io/apiserver v0.24.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.6
k8s.io/client-go => k8s.io/client-go v0.24.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.6
k8s.io/code-generator => k8s.io/code-generator v0.24.6
k8s.io/component-base => k8s.io/component-base v0.24.6
k8s.io/component-helpers => k8s.io/component-helpers v0.24.6
k8s.io/controller-manager => k8s.io/controller-manager v0.24.6
k8s.io/cri-api => k8s.io/cri-api v0.24.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.6
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.1.0
k8s.io/api => k8s.io/api v0.18.10
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.10
k8s.io/apimachinery => k8s.io/apimachinery v0.18.10
k8s.io/apiserver => k8s.io/apiserver v0.18.10
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.10
k8s.io/client-go => k8s.io/client-go v0.18.10
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.10
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.10
k8s.io/code-generator => k8s.io/code-generator v0.18.10
k8s.io/component-base => k8s.io/component-base v0.18.10
k8s.io/component-helpers => k8s.io/component-helpers v0.18.10
k8s.io/controller-manager => k8s.io/controller-manager v0.18.10
k8s.io/cri-api => k8s.io/cri-api v0.18.10
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.10
k8s.io/klog => k8s.io/klog v1.0.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.6
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.6
k8s.io/kubectl => k8s.io/kubectl v0.24.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.10
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.10
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.10
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.10
k8s.io/kubectl => k8s.io/kubectl v0.18.10
k8s.io/kubelet => github.com/kubewharf/kubelet v1.24.6-kubewharf.8
k8s.io/kubernetes => k8s.io/kubernetes v1.24.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.6
k8s.io/metrics => k8s.io/metrics v0.24.6
k8s.io/mount-utils => k8s.io/mount-utils v0.24.6
k8s.io/node-api => k8s.io/node-api v0.24.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.6
k8s.io/kubernetes => k8s.io/kubernetes v1.18.10
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.10
k8s.io/metrics => k8s.io/metrics v0.18.10
k8s.io/mount-utils => k8s.io/mount-utils v0.18.10
k8s.io/node-api => k8s.io/node-api v0.18.10
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.18.10
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.10
)
Loading
Loading