Skip to content

Commit 2641df9

Browse files
khareyash05khareyash05
committed
Revert "Merge branch 'main' into supportgraph"
This reverts commit d3c6a2a, reversing changes made to c3175f3.
1 parent d3c6a2a commit 2641df9

File tree

1,570 files changed

+43534
-140388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,570 files changed

+43534
-140388
lines changed

‎.golangci.yml

-4
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,5 @@ linters-settings:
3232
- Standard
3333
- Default
3434
- Prefix(github.com/clusterpedia-io)
35-
staticcheck:
36-
checks:
37-
- all
38-
- "-SA1019" # disable the rule SA1019(Using a deprecated function, variable, constant or field)
3935
output:
4036
sort-results: true

‎cmd/apiserver/app/options/options.go

+1-14
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,16 @@ import (
88

99
utilerrors "k8s.io/apimachinery/pkg/util/errors"
1010
"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
11-
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
1211
genericrequest "k8s.io/apiserver/pkg/endpoints/request"
1312
genericapiserver "k8s.io/apiserver/pkg/server"
1413
genericoptions "k8s.io/apiserver/pkg/server/options"
1514
"k8s.io/apiserver/pkg/util/feature"
16-
"k8s.io/client-go/dynamic"
17-
"k8s.io/client-go/kubernetes"
1815
cliflag "k8s.io/component-base/cli/flag"
1916
"k8s.io/component-base/featuregate"
2017
"k8s.io/component-base/logs"
2118
logsapi "k8s.io/component-base/logs/api/v1"
2219

2320
"github.com/clusterpedia-io/clusterpedia/pkg/apiserver"
24-
generatedopenapi "github.com/clusterpedia-io/clusterpedia/pkg/generated/openapi"
2521
"github.com/clusterpedia-io/clusterpedia/pkg/storage"
2622
storageoptions "github.com/clusterpedia-io/clusterpedia/pkg/storage/options"
2723
)
@@ -103,10 +99,6 @@ func (o *ClusterPediaServerOptions) Config() (*apiserver.Config, error) {
10399
// genericConfig.OpenAPIConfig.Info.Title = openAPITitle
104100
// genericConfig.OpenAPIConfig.Info.Version= openAPIVersion
105101

106-
genericConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(apiserver.Scheme))
107-
genericConfig.OpenAPIV3Config.Info.Title = "clusterpedia apiserver"
108-
genericConfig.OpenAPIV3Config.Info.Version = ""
109-
110102
// todo
111103
// support watch to LongRunningFunc
112104
genericConfig.LongRunningFunc = func(r *http.Request, requestInfo *genericrequest.RequestInfo) bool {
@@ -145,12 +137,7 @@ func (o *ClusterPediaServerOptions) genericOptionsApplyTo(config *genericapiserv
145137
if err := o.CoreAPI.ApplyTo(config); err != nil {
146138
return err
147139
}
148-
client, err := kubernetes.NewForConfig(config.ClientConfig)
149-
if err != nil {
150-
return err
151-
}
152-
dynamicClient := dynamic.NewForConfigOrDie(config.ClientConfig)
153-
if err := o.Admission.ApplyTo(&config.Config, config.SharedInformerFactory, client, dynamicClient, o.FeatureGate); err != nil {
140+
if err := o.Admission.ApplyTo(&config.Config, config.SharedInformerFactory, config.ClientConfig, o.FeatureGate); err != nil {
154141
return err
155142
}
156143

‎cmd/controller-manager/app/controllermanager.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,8 @@ func run(config *restclient.Config, stopCh <-chan struct{}) error {
139139
if err != nil {
140140
return err
141141
}
142-
httpClient, err := restclient.HTTPClientFor(config)
143-
if err != nil {
144-
return err
145-
}
146-
mapper, err := apiutil.NewDynamicRESTMapper(config, httpClient)
142+
143+
mapper, err := apiutil.NewDynamicRESTMapper(config)
147144
if err != nil {
148145
return err
149146
}

‎go.mod

+74-77
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/clusterpedia-io/clusterpedia
22

3-
go 1.20
3+
go 1.19
44

55
require (
66
github.com/DATA-DOG/go-sqlmock v1.5.0
@@ -11,7 +11,7 @@ require (
1111
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa
1212
github.com/jackc/pgx/v4 v4.17.2
1313
github.com/jinzhu/configor v1.2.1
14-
github.com/prometheus/client_golang v1.16.0
14+
github.com/prometheus/client_golang v1.15.1
1515
github.com/prometheus/common v0.44.0
1616
github.com/prometheus/exporter-toolkit v0.10.0
1717
github.com/spf13/cobra v1.7.0
@@ -20,70 +20,69 @@ require (
2020
github.com/vesoft-inc/nebula-go/v3 v3.3.1
2121
github.com/zhihu/norm/v3 v3.0.0
2222
go.uber.org/atomic v1.10.0
23-
gopkg.in/natefinch/lumberjack.v2 v2.2.1
23+
gopkg.in/natefinch/lumberjack.v2 v2.0.0
2424
gorm.io/datatypes v1.0.7
2525
gorm.io/driver/mysql v1.4.4
2626
gorm.io/driver/postgres v1.4.5
2727
gorm.io/driver/sqlite v1.4.4
2828
gorm.io/gorm v1.24.1
29-
k8s.io/api v0.28.2
30-
k8s.io/apiextensions-apiserver v0.28.2
31-
k8s.io/apimachinery v0.28.2
32-
k8s.io/apiserver v0.28.2
33-
k8s.io/client-go v0.28.2
34-
k8s.io/code-generator v0.28.2
35-
k8s.io/component-base v0.28.2
36-
k8s.io/klog/v2 v2.100.1
29+
k8s.io/api v0.26.6
30+
k8s.io/apiextensions-apiserver v0.26.6
31+
k8s.io/apimachinery v0.26.6
32+
k8s.io/apiserver v0.26.6
33+
k8s.io/client-go v0.26.6
34+
k8s.io/code-generator v0.26.6
35+
k8s.io/component-base v0.26.6
36+
k8s.io/klog/v2 v2.90.1
3737
k8s.io/kube-aggregator v0.0.0
38-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
3938
k8s.io/kube-state-metrics/v2 v2.9.2
40-
k8s.io/kubernetes v1.28.2
39+
k8s.io/kubernetes v1.26.6
4140
k8s.io/utils v0.0.0-20230505201702-9f6742963106
42-
sigs.k8s.io/controller-runtime v0.16.2
43-
sigs.k8s.io/controller-tools v0.13.0
41+
sigs.k8s.io/controller-runtime v0.14.6
42+
sigs.k8s.io/controller-tools v0.11.3
4443
)
4544

4645
require (
46+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
4747
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4848
github.com/BurntSushi/toml v0.3.1 // indirect
4949
github.com/Masterminds/goutils v1.1.1 // indirect
5050
github.com/Masterminds/semver/v3 v3.1.1 // indirect
5151
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
5252
github.com/NYTimes/gziphandler v1.1.1 // indirect
53-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
54-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
53+
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
5554
github.com/beorn7/perks v1.0.1 // indirect
5655
github.com/blang/semver/v4 v4.0.0 // indirect
57-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
56+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
5857
github.com/cespare/xxhash/v2 v2.2.0 // indirect
59-
github.com/coreos/go-semver v0.3.1 // indirect
58+
github.com/coreos/go-semver v0.3.0 // indirect
6059
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6160
github.com/davecgh/go-spew v1.1.1 // indirect
6261
github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0 // indirect
63-
github.com/docker/distribution v2.8.2+incompatible // indirect
62+
github.com/docker/distribution v2.8.1+incompatible // indirect
6463
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
65-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
64+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
6665
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
6766
github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 // indirect
6867
github.com/fatih/color v1.13.0 // indirect
6968
github.com/felixge/httpsnoop v1.0.3 // indirect
7069
github.com/fsnotify/fsnotify v1.6.0 // indirect
7170
github.com/go-kit/log v0.2.1 // indirect
7271
github.com/go-logfmt/logfmt v0.5.1 // indirect
73-
github.com/go-logr/logr v1.2.4 // indirect
72+
github.com/go-logr/logr v1.2.3 // indirect
7473
github.com/go-logr/stdr v1.2.2 // indirect
75-
github.com/go-logr/zapr v1.2.4 // indirect
74+
github.com/go-logr/zapr v1.2.3 // indirect
7675
github.com/go-openapi/jsonpointer v0.19.6 // indirect
77-
github.com/go-openapi/jsonreference v0.20.2 // indirect
76+
github.com/go-openapi/jsonreference v0.20.1 // indirect
7877
github.com/go-openapi/swag v0.22.3 // indirect
7978
github.com/gobuffalo/flect v1.0.2 // indirect
8079
github.com/gogo/protobuf v1.3.2 // indirect
8180
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8281
github.com/golang/protobuf v1.5.3 // indirect
83-
github.com/google/cel-go v0.16.1 // indirect
84-
github.com/google/gnostic-models v0.6.8 // indirect
82+
github.com/google/cel-go v0.12.6 // indirect
83+
github.com/google/gnostic v0.5.7-v3refs // indirect
8584
github.com/google/go-cmp v0.5.9 // indirect
86-
github.com/google/gofuzz v1.2.0 // indirect
85+
github.com/google/gofuzz v1.1.0 // indirect
8786
github.com/google/uuid v1.3.0 // indirect
8887
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
8988
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
@@ -102,13 +101,13 @@ require (
102101
github.com/jpillora/backoff v1.0.0 // indirect
103102
github.com/json-iterator/go v1.1.12 // indirect
104103
github.com/mailru/easyjson v0.7.7 // indirect
105-
github.com/mattn/go-colorable v0.1.13 // indirect
106-
github.com/mattn/go-isatty v0.0.17 // indirect
104+
github.com/mattn/go-colorable v0.1.12 // indirect
105+
github.com/mattn/go-isatty v0.0.14 // indirect
107106
github.com/mattn/go-sqlite3 v1.14.15 // indirect
108107
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
109108
github.com/mitchellh/copystructure v1.0.0 // indirect
110109
github.com/mitchellh/reflectwalk v1.0.0 // indirect
111-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
110+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
112111
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
113112
github.com/modern-go/reflect2 v1.0.2 // indirect
114113
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -117,7 +116,7 @@ require (
117116
github.com/pkg/errors v0.9.1 // indirect
118117
github.com/pmezard/go-difflib v1.0.0 // indirect
119118
github.com/prometheus/client_model v0.4.0 // indirect
120-
github.com/prometheus/procfs v0.10.1 // indirect
119+
github.com/prometheus/procfs v0.9.0 // indirect
121120
github.com/robfig/cron/v3 v3.0.1 // indirect
122121
github.com/shopspring/decimal v1.2.0 // indirect
123122
github.com/spf13/cast v1.5.0 // indirect
@@ -129,7 +128,7 @@ require (
129128
go.etcd.io/etcd/client/v2 v2.305.6 // indirect
130129
go.etcd.io/etcd/client/v3 v3.5.6 // indirect
131130
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
132-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
131+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
133132
go.opentelemetry.io/otel v1.10.0 // indirect
134133
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
135134
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
@@ -138,65 +137,63 @@ require (
138137
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
139138
go.opentelemetry.io/otel/trace v1.10.0 // indirect
140139
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
141-
go.uber.org/multierr v1.11.0 // indirect
142-
go.uber.org/zap v1.25.0 // indirect
143-
golang.org/x/crypto v0.12.0 // indirect
144-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
145-
golang.org/x/mod v0.12.0 // indirect
146-
golang.org/x/net v0.14.0 // indirect
140+
go.uber.org/multierr v1.8.0 // indirect
141+
go.uber.org/zap v1.24.0 // indirect
142+
golang.org/x/crypto v0.8.0 // indirect
143+
golang.org/x/mod v0.8.0 // indirect
144+
golang.org/x/net v0.10.0 // indirect
147145
golang.org/x/oauth2 v0.8.0 // indirect
148-
golang.org/x/sync v0.3.0 // indirect
149-
golang.org/x/sys v0.11.0 // indirect
150-
golang.org/x/term v0.11.0 // indirect
151-
golang.org/x/text v0.12.0 // indirect
146+
golang.org/x/sync v0.1.0 // indirect
147+
golang.org/x/sys v0.8.0 // indirect
148+
golang.org/x/term v0.8.0 // indirect
149+
golang.org/x/text v0.9.0 // indirect
152150
golang.org/x/time v0.3.0 // indirect
153-
golang.org/x/tools v0.12.0 // indirect
151+
golang.org/x/tools v0.6.0 // indirect
154152
google.golang.org/appengine v1.6.7 // indirect
155-
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
156-
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
157-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
158-
google.golang.org/grpc v1.54.0 // indirect
153+
google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
154+
google.golang.org/grpc v1.52.0 // indirect
159155
google.golang.org/protobuf v1.30.0 // indirect
160156
gopkg.in/inf.v0 v0.9.1 // indirect
161157
gopkg.in/yaml.v2 v2.4.0 // indirect
162158
gopkg.in/yaml.v3 v3.0.1 // indirect
163159
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
164-
k8s.io/kms v0.28.2 // indirect
160+
k8s.io/kms v0.26.6 // indirect
161+
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
165162
k8s.io/sample-controller v0.26.5 // indirect
166-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
163+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
167164
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
168165
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
169166
sigs.k8s.io/yaml v1.3.0 // indirect
170167
)
171168

172169
replace (
173170
github.com/clusterpedia-io/api => ./staging/src/github.com/clusterpedia-io/api
174-
k8s.io/api => k8s.io/api v0.28.2
175-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.2
176-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.2
177-
k8s.io/apiserver => k8s.io/apiserver v0.28.2
178-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.2
179-
k8s.io/client-go => k8s.io/client-go v0.28.2
180-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.2
181-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.2
182-
k8s.io/code-generator => k8s.io/code-generator v0.28.2
183-
k8s.io/component-base => k8s.io/component-base v0.28.2
184-
k8s.io/component-helpers => k8s.io/component-helpers v0.28.2
185-
k8s.io/controller-manager => k8s.io/controller-manager v0.28.2
186-
k8s.io/cri-api => k8s.io/cri-api v0.28.2
187-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.2
188-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.2
189-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.2
190-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
191-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.2
192-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.2
193-
k8s.io/kubectl => k8s.io/kubectl v0.28.2
194-
k8s.io/kubelet => k8s.io/kubelet v0.28.2
195-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.2
196-
k8s.io/metrics => k8s.io/metrics v0.28.2
197-
k8s.io/mount-utils => k8s.io/mount-utils v0.28.2
198-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.2
199-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.2
200-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.2
201-
k8s.io/sample-controller => k8s.io/sample-controller v0.28.2
171+
k8s.io/api => k8s.io/api v0.26.6
172+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.6
173+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.6
174+
k8s.io/apiserver => k8s.io/apiserver v0.26.6
175+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.6
176+
k8s.io/client-go => k8s.io/client-go v0.26.6
177+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.6
178+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.6
179+
k8s.io/code-generator => k8s.io/code-generator v0.26.6
180+
k8s.io/component-base => k8s.io/component-base v0.26.6
181+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.6
182+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.6
183+
k8s.io/cri-api => k8s.io/cri-api v0.26.6
184+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.6
185+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.6
186+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.6
187+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
188+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.6
189+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.6
190+
k8s.io/kubectl => k8s.io/kubectl v0.26.6
191+
k8s.io/kubelet => k8s.io/kubelet v0.26.6
192+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.6
193+
k8s.io/metrics => k8s.io/metrics v0.26.6
194+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.6
195+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.6
196+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.6
197+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.6
198+
k8s.io/sample-controller => k8s.io/sample-controller v0.26.6
202199
)

0 commit comments

Comments
 (0)