Skip to content

Commit fbcde7d

Browse files
floreksfloreks
authored
feat: refactor verber and fix client-side throttling due to client init misconfiguration (#8900)
* update verber put method to use dynamic client and merge patch * multiple fixes/improvements for verber client, api and web * Refactor common client and correctly override QPS/Burst config * fix lint
1 parent 567a38f commit fbcde7d

File tree

40 files changed

+475
-988
lines changed

40 files changed

+475
-988
lines changed

‎Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ helm: --ensure-kind-cluster --ensure-kind-ingress-nginx --ensure-helm-dependenci
151151
--set cert-manager.enabled=true \
152152
--set app.ingress.enabled=true \
153153
--set app.ingress.ingressClassName=nginx \
154-
--set api.scaling.replicas=3 \
155154
charts/kubernetes-dashboard
156155

157156
# Installs latest version of Kubernetes Dashboard in our dedicated kind cluster.
@@ -173,7 +172,6 @@ helm-release: --ensure-kind-cluster --ensure-kind-ingress-nginx --ensure-helm-de
173172
--set metrics-server.enabled=true \
174173
--set app.ingress.enabled=true \
175174
--set app.ingress.ingressClassName=nginx \
176-
--set api.scaling.replicas=3 \
177175
charts/kubernetes-dashboard
178176

179177
# To serve Dashboard under a different path than root (/) use:

‎modules/api/go.mod

+7-8
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,28 @@ require (
4242
github.com/go-playground/locales v0.14.1 // indirect
4343
github.com/go-playground/universal-translator v0.18.1 // indirect
4444
github.com/go-playground/validator/v10 v10.14.0 // indirect
45+
github.com/gobuffalo/flect v1.0.2 // indirect
4546
github.com/goccy/go-json v0.10.2 // indirect
4647
github.com/gogo/protobuf v1.3.2 // indirect
4748
github.com/golang/protobuf v1.5.3 // indirect
4849
github.com/google/gnostic-models v0.6.8 // indirect
4950
github.com/google/gofuzz v1.2.0 // indirect
50-
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
51-
github.com/google/uuid v1.3.1 // indirect
52-
github.com/gorilla/websocket v1.5.0 // indirect
51+
github.com/google/uuid v1.6.0 // indirect
52+
github.com/gorilla/websocket v1.5.1 // indirect
5353
github.com/imdario/mergo v0.3.16 // indirect
5454
github.com/josharian/intern v1.0.0 // indirect
5555
github.com/json-iterator/go v1.1.12 // indirect
5656
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
5757
github.com/leodido/go-urn v1.2.4 // indirect
5858
github.com/mailru/easyjson v0.7.7 // indirect
59-
github.com/mattn/go-isatty v0.0.19 // indirect
59+
github.com/mattn/go-isatty v0.0.20 // indirect
6060
github.com/moby/spdystream v0.2.0 // indirect
6161
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6262
github.com/modern-go/reflect2 v1.0.2 // indirect
6363
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6464
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6565
github.com/opencontainers/go-digest v1.0.0 // indirect
66-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
66+
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
6767
github.com/pkg/errors v0.9.1 // indirect
6868
github.com/prometheus/client_model v0.5.0 // indirect
6969
github.com/prometheus/common v0.48.0 // indirect
@@ -76,9 +76,8 @@ require (
7676
golang.org/x/sys v0.18.0 // indirect
7777
golang.org/x/term v0.18.0 // indirect
7878
golang.org/x/text v0.14.0 // indirect
79-
golang.org/x/time v0.3.0 // indirect
80-
golang.org/x/tools v0.17.0 // indirect
81-
google.golang.org/appengine v1.6.7 // indirect
79+
golang.org/x/time v0.5.0 // indirect
80+
google.golang.org/appengine v1.6.8 // indirect
8281
google.golang.org/protobuf v1.33.0 // indirect
8382
gopkg.in/inf.v0 v0.9.1 // indirect
8483
gopkg.in/yaml.v2 v2.4.0 // indirect

‎modules/api/go.sum

+12-24
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg
5959
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
6060
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
6161
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
62+
github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA=
63+
github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
6264
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
6365
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
6466
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
6567
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
66-
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
6768
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
6869
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
6970
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -78,11 +79,9 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
7879
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
7980
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
8081
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
81-
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
82-
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
82+
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
8383
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
84-
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
85-
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
84+
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
8685
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
8786
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
8887
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -108,8 +107,7 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
108107
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
109108
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
110109
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
111-
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
112-
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
110+
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
113111
github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
114112
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
115113
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -122,14 +120,11 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
122120
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
123121
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
124122
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
125-
github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
126-
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
127-
github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
128-
github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
123+
github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
124+
github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
129125
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
130126
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
131-
github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
132-
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
127+
github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo=
133128
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
134129
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
135130
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -142,8 +137,7 @@ github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSz
142137
github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
143138
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
144139
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
145-
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
146-
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
140+
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
147141
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
148142
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
149143
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -156,7 +150,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
156150
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
157151
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
158152
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
159-
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
160153
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
161154
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
162155
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
@@ -176,7 +169,6 @@ golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOM
176169
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
177170
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
178171
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
179-
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
180172
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
181173
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
182174
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
@@ -203,26 +195,22 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
203195
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
204196
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
205197
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
206-
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
207198
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
208199
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
209200
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
210201
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
211202
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
212-
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
213-
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
203+
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
214204
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
215205
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
216206
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
217207
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
218-
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
219-
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
208+
golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
220209
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
221210
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
222211
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
223212
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
224-
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
225-
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
213+
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
226214
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
227215
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
228216
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=

‎modules/api/pkg/handler/apihandler.go

+19-15
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package handler
1616

1717
import (
18+
"io"
1819
"log"
1920
"net/http"
2021
"strconv"
@@ -30,7 +31,6 @@ import (
3031

3132
"github.com/emicklei/go-restful/v3"
3233
"golang.org/x/net/xsrftoken"
33-
"k8s.io/apimachinery/pkg/runtime"
3434
"k8s.io/client-go/tools/remotecommand"
3535

3636
"k8s.io/dashboard/api/pkg/handler/parser"
@@ -897,7 +897,7 @@ func CreateHTTPAPIHandler(iManager integration.Manager) (*restful.Container, err
897897
apiV1Ws.Route(
898898
apiV1Ws.PUT("/_raw/{kind}/namespace/{namespace}/name/{name}").To(apiHandler.handlePutResource).
899899
// docs
900-
Doc("creates a resource in a namespace").
900+
Doc("creates or updates a resource in a namespace").
901901
Param(apiV1Ws.PathParameter("kind", "kind of the resource")).
902902
Param(apiV1Ws.PathParameter("namespace", "namespace of the resource")).
903903
Param(apiV1Ws.PathParameter("name", "name of the resource")).
@@ -923,7 +923,7 @@ func CreateHTTPAPIHandler(iManager integration.Manager) (*restful.Container, err
923923
apiV1Ws.Route(
924924
apiV1Ws.PUT("/_raw/{kind}/name/{name}").To(apiHandler.handlePutResource).
925925
// docs
926-
Doc("creates a non-namespaced resource").
926+
Doc("creates or updates a non-namespaced resource").
927927
Param(apiV1Ws.PathParameter("kind", "kind of the resource")).
928928
Param(apiV1Ws.PathParameter("name", "name of the resource")).
929929
Reads(JSON("")).
@@ -2301,9 +2301,9 @@ func (apiHandler *APIHandler) handleGetResource(request *restful.Request, respon
23012301
}
23022302

23032303
kind := request.PathParameter("kind")
2304-
namespace, ok := request.PathParameters()["namespace"]
2304+
namespace := request.PathParameters()["namespace"]
23052305
name := request.PathParameter("name")
2306-
result, err := verber.Get(kind, ok, namespace, name)
2306+
result, err := verber.Get(kind, namespace, name)
23072307
if err != nil {
23082308
errors.HandleInternalError(response, err)
23092309
return
@@ -2320,16 +2320,20 @@ func (apiHandler *APIHandler) handlePutResource(
23202320
return
23212321
}
23222322

2323-
kind := request.PathParameter("kind")
2324-
namespace, ok := request.PathParameters()["namespace"]
2325-
name := request.PathParameter("name")
2326-
putSpec := &runtime.Unknown{}
2327-
if err := request.ReadEntity(putSpec); err != nil {
2323+
raw := &unstructured.Unstructured{}
2324+
bytes, err := io.ReadAll(request.Request.Body)
2325+
if err != nil {
2326+
errors.HandleInternalError(response, err)
2327+
return
2328+
}
2329+
2330+
err = raw.UnmarshalJSON(bytes)
2331+
if err != nil {
23282332
errors.HandleInternalError(response, err)
23292333
return
23302334
}
23312335

2332-
if err := verber.Put(kind, ok, namespace, name, putSpec); err != nil {
2336+
if err = verber.Update(raw); err != nil {
23332337
errors.HandleInternalError(response, err)
23342338
return
23352339
}
@@ -2346,11 +2350,11 @@ func (apiHandler *APIHandler) handleDeleteResource(
23462350
}
23472351

23482352
kind := request.PathParameter("kind")
2349-
namespace, ok := request.PathParameters()["namespace"]
2353+
namespace := request.PathParameters()["namespace"]
23502354
name := request.PathParameter("name")
23512355
deleteNow := request.QueryParameter("deleteNow") == "true"
23522356

2353-
if err := verber.Delete(kind, ok, namespace, name, deleteNow); err != nil {
2357+
if err := verber.Delete(kind, namespace, name, deleteNow); err != nil {
23542358
errors.HandleInternalError(response, err)
23552359
return
23562360
}
@@ -2896,8 +2900,8 @@ func (apiHandler *APIHandler) handleGetCronJobList(request *restful.Request, res
28962900

28972901
namespace := parseNamespacePathParameter(request)
28982902
dataSelect := parser.ParseDataSelectPathParameter(request)
2899-
dataSelect.MetricQuery = dataselect.StandardMetrics
2900-
result, err := cronjob.GetCronJobList(k8sClient, namespace, dataSelect, apiHandler.iManager.Metric().Client())
2903+
dataSelect.MetricQuery = dataselect.NoMetrics
2904+
result, err := cronjob.GetCronJobList(k8sClient, namespace, dataSelect)
29012905
if err != nil {
29022906
errors.HandleInternalError(response, err)
29032907
return

‎modules/api/pkg/integration/metric/manager.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ func (self *metricManager) List() []integrationapi.Integration {
116116

117117
// ConfigureSidecar implements metric manager interface. See MetricManager for more information.
118118
func (self *metricManager) ConfigureSidecar(host string) MetricManager {
119-
kubeClient := client.InClusterClient()
120-
metricClient, err := sidecar.CreateSidecarClient(host, kubeClient)
119+
inClusterClient := client.InClusterClient()
120+
metricClient, err := sidecar.CreateSidecarClient(host, inClusterClient)
121121
if err != nil {
122122
klog.Errorf("There was an error during sidecar client creation: %s", err.Error())
123123
return self

‎modules/api/pkg/integration/metric/sidecar/client.go

+10-12
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ import (
2424

2525
"k8s.io/apimachinery/pkg/types"
2626
"k8s.io/client-go/kubernetes"
27-
"k8s.io/client-go/rest"
27+
"k8s.io/klog/v2"
2828

29+
"k8s.io/dashboard/api/pkg/args"
2930
integrationapi "k8s.io/dashboard/api/pkg/integration/api"
3031
metricapi "k8s.io/dashboard/api/pkg/integration/metric/api"
3132
"k8s.io/dashboard/api/pkg/integration/metric/common"
@@ -262,20 +263,17 @@ func (self sidecarClient) unmarshalType(path string, v interface{}) error {
262263
// string the function assumes that it is running inside a Kubernetes cluster and connects via
263264
// service proxy. sidecarHost param is in the format of protocol://address:port,
264265
// e.g., http://localhost:8002.
265-
func CreateSidecarClient(host string, k8sClient kubernetes.Interface) (
266-
metricapi.MetricClient, error) {
267-
if host == "" && k8sClient != nil {
268-
log.Print("Creating in-cluster Sidecar client")
269-
c := inClusterSidecarClient{client: k8sClient.CoreV1().RESTClient()}
270-
return sidecarClient{client: c}, nil
266+
func CreateSidecarClient(host string, inClusterClient kubernetes.Interface) (metricapi.MetricClient, error) {
267+
if host == "" && inClusterClient != nil {
268+
klog.V(args.LogLevelInfo).Info("Creating in-cluster Sidecar client")
269+
return sidecarClient{client: inClusterSidecarClient{client: inClusterClient.CoreV1().RESTClient()}}, nil
271270
}
272271

273-
cfg := &rest.Config{Host: host, QPS: client.DefaultQPS, Burst: client.DefaultBurst}
274-
restClient, err := kubernetes.NewForConfig(cfg)
272+
klog.V(args.LogLevelInfo).InfoS("Creating remote Sidecar client", "host", host)
273+
restClient, err := client.RestClientForHost(host)
275274
if err != nil {
276275
return sidecarClient{}, err
277276
}
278-
log.Printf("Creating remote Sidecar client for %s", host)
279-
c := remoteSidecarClient{client: restClient.RESTClient()}
280-
return sidecarClient{client: c}, nil
277+
278+
return sidecarClient{client: remoteSidecarClient{client: restClient}}, nil
281279
}

0 commit comments

Comments
 (0)