Skip to content

Commit 6a839b1

Browse files
WilliamTigeraWilliamTigera
committed
Revert "Add clusterinfo endpoint to whisker backend"
This reverts commit 1c6e518.
1 parent e265c51 commit 6a839b1

File tree

14 files changed

+6
-642
lines changed

14 files changed

+6
-642
lines changed

‎lib/httpmachinery/go.mod

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,19 @@ go 1.23.1
44

55
require (
66
github.com/go-playground/form v3.1.4+incompatible
7-
github.com/go-playground/validator/v10 v10.22.1
87
github.com/google/uuid v1.6.0
98
github.com/gorilla/mux v1.8.1
10-
github.com/onsi/gomega v1.36.2
119
github.com/sirupsen/logrus v1.9.3
12-
github.com/stretchr/testify v1.8.4
10+
github.com/go-playground/validator/v10 v10.22.1
11+
github.com/onsi/gomega v1.36.2
1312
)
1413

1514
require (
16-
github.com/davecgh/go-spew v1.1.1 // indirect
1715
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
1816
github.com/go-playground/locales v0.14.1 // indirect
1917
github.com/go-playground/universal-translator v0.18.1 // indirect
2018
github.com/google/go-cmp v0.6.0 // indirect
2119
github.com/leodido/go-urn v1.4.0 // indirect
22-
github.com/pmezard/go-difflib v1.0.0 // indirect
23-
github.com/stretchr/objx v0.5.0 // indirect
2420
golang.org/x/crypto v0.31.0 // indirect
2521
golang.org/x/net v0.33.0 // indirect
2622
golang.org/x/sys v0.28.0 // indirect

‎lib/httpmachinery/go.sum

-5
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
3636
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
3737
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
3838
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
39-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
40-
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
41-
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
4239
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
43-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
44-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
4540
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
4641
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
4742
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=

‎lib/httpmachinery/pkg/apiutil/handler.go

-8
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,6 @@ func NewJSONListOrEventStreamHandler[RequestParams any, ResponseBody any](f func
7373
}
7474
}
7575

76-
func NewJSONSingleResponseHandler[RequestParams any, ResponseBody any](f func(apicontext.Context, RequestParams) SingleResponse[ResponseBody]) handler {
77-
return genericHandler[RequestParams, ResponseBody]{
78-
f: func(ctx apicontext.Context, params RequestParams) responseType {
79-
return f(ctx, params)
80-
},
81-
}
82-
}
83-
8476
func (l genericHandler[RequestParams, Body]) ServeHTTP(cfg RouterConfig, w http.ResponseWriter, req *http.Request) {
8577
ctx := apicontext.NewRequestContext(req)
8678

‎lib/httpmachinery/pkg/apiutil/response.go

-48
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,12 @@ type ListOrStreamResponse[E any] struct {
3636
responseWriter ResponseWriter
3737
}
3838

39-
type SingleResponse[E any] struct {
40-
status int
41-
responseWriter ResponseWriter
42-
}
43-
4439
func NewListOrStreamResponse[E any](status int) ListOrStreamResponse[E] {
4540
return ListOrStreamResponse[E]{
4641
status: status,
4742
}
4843
}
4944

50-
func NewSingleResponse[E any](status int) SingleResponse[E] {
51-
return SingleResponse[E]{
52-
status: status,
53-
}
54-
}
55-
5645
// SendList sets the ListOrStreamResponse to send back a list with the given total and items.
5746
//
5847
// If this is called, it is not valid to call this again or to call SendStream, those actions will result in a panic.
@@ -65,15 +54,6 @@ func (rsp ListOrStreamResponse[E]) SendList(total int, items []E) ListOrStreamRe
6554
return rsp
6655
}
6756

68-
func (rsp SingleResponse[E]) Send(item E) SingleResponse[E] {
69-
if rsp.responseWriter != nil {
70-
panic("response writer already set")
71-
}
72-
73-
rsp.responseWriter = &jsonResponseWriter[E]{item: item}
74-
return rsp
75-
}
76-
7757
// SendStream sets the ListOrStreamResponse to send back a stream with the given iter.Seq. It will iterate through the
7858
// objects given to it in the iterator and send them over the stream.
7959
//
@@ -153,31 +133,3 @@ func (rs *jsonErrorResponseWriter) WriteResponse(ctx apicontext.Context, status
153133
writeJSONResponse(w, ErrorResponse{Error: rs.error})
154134
return nil
155135
}
156-
157-
type jsonResponseWriter[Body any] struct {
158-
item Body
159-
}
160-
161-
func (rs *jsonResponseWriter[Body]) WriteResponse(ctx apicontext.Context, status int, w http.ResponseWriter) error {
162-
w.WriteHeader(status)
163-
writeJSONResponse(w, rs.item)
164-
return nil
165-
}
166-
167-
func (rsp SingleResponse[E]) SetError(msg string) SingleResponse[E] {
168-
rsp.responseWriter = &jsonErrorResponseWriter{msg}
169-
return rsp
170-
}
171-
172-
func (rsp SingleResponse[E]) SetStatus(status int) SingleResponse[E] {
173-
rsp.status = status
174-
return rsp
175-
}
176-
177-
func (rsp SingleResponse[E]) ResponseWriter() ResponseWriter {
178-
return rsp.responseWriter
179-
}
180-
181-
func (rsp SingleResponse[E]) Status() int {
182-
return rsp.status
183-
}

‎manifests/ocp/custom-resources.yaml

-4
This file was deleted.

‎whisker-backend/.mockery.yaml

-13
This file was deleted.

‎whisker-backend/Makefile

-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ ci: static-checks ut
5757
ut:
5858
$(DOCKER_GO_BUILD) go test ./... -cover -count 1
5959

60-
gen-mocks:
61-
$(DOCKER_RUN) $(CALICO_BUILD) sh -c 'mockery'
62-
6360
###############################################################################
6461
# Release
6562
###############################################################################

‎whisker-backend/cmd/main.go

+1-32
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ import (
2121
"github.com/sirupsen/logrus"
2222
"google.golang.org/grpc"
2323
"google.golang.org/grpc/credentials/insecure"
24-
"k8s.io/apimachinery/pkg/runtime"
25-
"k8s.io/client-go/rest"
26-
"k8s.io/client-go/tools/clientcmd"
27-
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
2824

29-
v3 "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
3025
"github.com/projectcalico/calico/goldmane/pkg/client"
3126
"github.com/projectcalico/calico/lib/httpmachinery/pkg/server"
3227
gorillaadpt "github.com/projectcalico/calico/lib/httpmachinery/pkg/server/adaptors/gorilla"
@@ -76,37 +71,11 @@ func main() {
7671
opts = append(opts, server.WithTLSFiles(cfg.TlsCertPath, cfg.TlsKeyPath))
7772
}
7873

79-
var kubeRestConfig *rest.Config
80-
if cfg.Kubeconfig == "" {
81-
// Creates the in-cluster restConfig.
82-
kubeRestConfig, err = rest.InClusterConfig()
83-
if err != nil {
84-
logrus.WithError(err).Fatal("Failed to build kubernetes rest config.")
85-
}
86-
} else {
87-
// Creates a restConfig from supplied kubeconfig.
88-
kubeRestConfig, err = clientcmd.BuildConfigFromFlags("", cfg.Kubeconfig)
89-
if err != nil {
90-
logrus.WithError(err).Fatal("Failed to build kubernetes rest config.")
91-
}
92-
}
93-
94-
scheme := runtime.NewScheme()
95-
if err = v3.AddToScheme(scheme); err != nil {
96-
logrus.WithError(err).Fatal("Failed to configure controller runtime client.")
97-
}
98-
client, err := ctrlclient.New(kubeRestConfig, ctrlclient.Options{Scheme: scheme})
99-
if err != nil {
100-
logrus.WithError(err).Fatal("Failed to configure controller runtime client.")
101-
}
102-
10374
flowsAPI := v1.NewFlows(gmCli)
104-
usageTrackerAPI := v1.NewClusterInfoHandler(client)
105-
apis := append(flowsAPI.APIs(), usageTrackerAPI.APIs()...)
10675

10776
srv, err := server.NewHTTPServer(
10877
gorillaadpt.NewRouter(),
109-
apis,
78+
flowsAPI.APIs(),
11079
opts...,
11180
)
11281
if err != nil {

‎whisker-backend/pkg/apis/v1/clusterinfo.go

-25
This file was deleted.

‎whisker-backend/pkg/apis/v1/flows.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ import (
2424
const (
2525
sep = "/"
2626

27-
FlowsPath = sep + "flows"
28-
ClusterInfoPath = sep + "clusterinfo"
27+
FlowsPath = sep + "flows"
2928
)
3029

3130
func init() {
@@ -59,6 +58,8 @@ type ListFlowsParams struct {
5958
SortBy listFlowsSortBy `urlQuery:"sortBy"`
6059
}
6160

61+
type StreamFlowsParams struct{}
62+
6263
type FlowResponse struct {
6364
StartTime time.Time `json:"start_time"`
6465
EndTime time.Time `json:"end_time"`

‎whisker-backend/pkg/config/api.go

-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"fmt"
2020

2121
"github.com/kelseyhightower/envconfig"
22-
"github.com/projectcalico/calico/libcalico-go/lib/apiconfig"
2322
)
2423

2524
type Config struct {
@@ -29,8 +28,6 @@ type Config struct {
2928
TlsCertPath string `default:""`
3029
TlsKeyPath string `default:""`
3130
LogLevel string `default:"info" envconfig:"LOG_LEVEL"`
32-
33-
apiconfig.KubeConfig
3431
}
3532

3633
func NewConfig() (*Config, error) {

‎whisker-backend/pkg/handlers/v1/clusterinfo.go

-63
This file was deleted.

0 commit comments

Comments
 (0)