Skip to content

Commit 7094153

Browse files
floreksfloreks
authored
feat: bump dependencies and add owner ref information to object meta (#9483)
* bump dependencies and add owner ref information to object meta * fix lint * fix unit tests * fix web lint and unit tests * fix dependency review issue * fix lint
1 parent 2e1b1bb commit 7094153

Some content is hidden

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

81 files changed

+1891
-1355
lines changed

‎.golangci.yml

+14-3
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,26 @@
1313
# limitations under the License.
1414
#
1515
run:
16+
modules-download-mode: readonly
17+
allow-parallel-runners: true
1618
timeout: 30m
1719
issues-exit-code: 1
1820
tests: true
1921
linters:
2022
disable-all: true
2123
enable:
22-
- gocyclo
23-
- goimports
24+
# default linters
25+
- errcheck
26+
- gosimple
2427
- govet
2528
- ineffassign
26-
- misspell
29+
- staticcheck
30+
- typecheck
2731
- unused
32+
- gocyclo
33+
34+
# additional linters
35+
- errorlint
36+
- errname
37+
- goimports
38+
- misspell

‎Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ serve: $(PRE) --ensure-kind-cluster --ensure-metrics-server ## Starts developmen
8282
SIDECAR_HOST=$(SIDECAR_HOST) \
8383
docker compose -f $(DOCKER_COMPOSE_DEV_PATH) --project-name=$(PROJECT_NAME) up \
8484
--build \
85+
--force-recreate \
8586
--remove-orphans \
8687
--no-attach gateway \
8788
--no-attach scraper \
@@ -90,7 +91,7 @@ serve: $(PRE) --ensure-kind-cluster --ensure-metrics-server ## Starts developmen
9091
# Starts production version of the application.
9192
#
9293
# HTTPS: https://localhost:8443
93-
# HTTP: https://localhost:8080
94+
# HTTP: http://localhost:8080
9495
#
9596
# Note: Make sure that the ports 8443 (Gateway HTTPS) and 8080 (Gateway HTTP) are free on your localhost
9697
.PHONY: run

‎hack/docker/dev.compose.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version: "3.8"
16-
1715
services:
1816
gateway:
1917
container_name: kong-gateway
20-
image: kong/kong-gateway:3.6
18+
image: kong/kong-gateway:3.8
2119
environment:
2220
- "KONG_DATABASE=off"
2321
- "KONG_PROXY_ACCESS_LOG=/dev/stdout"
@@ -44,7 +42,7 @@ services:
4442
- ${PWD}/modules/auth/api:/workspace/auth/api # Required - Source dir watched by AIR
4543
- ${PWD}/modules/auth/main.go:/workspace/auth/main.go # Required - Entry file watched by AIR
4644
- ${PWD}/modules/auth/.air.toml:/workspace/auth/.air.toml # Required - AIR configuration
47-
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - local kubeconfig path resolves to $HOME/<user>/.kube/config
45+
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
4846
tmpfs:
4947
- /tmp
5048

@@ -61,7 +59,7 @@ services:
6159
- ${PWD}/modules/api/pkg:/workspace/api/pkg # Required - Source dir watched by AIR
6260
- ${PWD}/modules/api/main.go:/workspace/api/main.go # Required - Entry file watched by AIR
6361
- ${PWD}/modules/api/.air.toml:/workspace/api/.air.toml # Required - AIR configuration
64-
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - local kubeconfig path resolves to $HOME/<user>/.kube/config
62+
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
6563
tmpfs:
6664
- /tmp
6765

@@ -79,7 +77,7 @@ services:
7977
- ${PWD}/modules/web/pkg:/workspace/web/pkg # Required - Source dir watched by AIR
8078
- ${PWD}/modules/web/main.go:/workspace/web/main.go # Required - Entry file watched by AIR
8179
- ${PWD}/modules/web/.air.toml:/workspace/web/.air.toml # Required - AIR configuration
82-
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - local kubeconfig path resolves to $HOME/<user>/.kube/config
80+
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
8381
tmpfs:
8482
- /tmp
8583

@@ -107,7 +105,7 @@ services:
107105
- ${PWD}/modules/metrics-scraper/pkg:/workspace/metrics-scraper/pkg # Required - Source dir watched by AIR
108106
- ${PWD}/modules/metrics-scraper/main.go:/workspace/metrics-scraper/main.go # Required - Entry file watched by AIR
109107
- ${PWD}/modules/metrics-scraper/.air.toml:/workspace/metrics-scraper/.air.toml # Required - AIR configuration
110-
- ${KUBECONFIG:?}:${KUBECONFIG:?}
108+
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
111109
shm_size: 1G
112110
tmpfs:
113111
- /tmp

‎hack/docker/docker.compose.yaml

+5-7
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version: "3.8"
16-
1715
services:
1816
gateway:
1917
container_name: kong-gateway
20-
image: kong/kong-gateway:3.6
18+
image: kong/kong-gateway:3.8
2119
environment:
2220
- "KONG_DATABASE=off"
2321
- "KONG_PROXY_ACCESS_LOG=/dev/stdout"
@@ -42,7 +40,7 @@ services:
4240
command:
4341
- "--kubeconfig=${KUBECONFIG:?}"
4442
volumes:
45-
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - local kubeconfig path resolves to $HOME/<user>/.kube/config
43+
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
4644
tmpfs:
4745
- /tmp
4846

@@ -57,7 +55,7 @@ services:
5755
--kubeconfig=${KUBECONFIG:?}
5856
--sidecar-host=${SIDECAR_HOST:?}
5957
volumes:
60-
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - local kubeconfig path resolves to $HOME/<user>/.kube/config
58+
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
6159
tmpfs:
6260
- /tmp
6361

@@ -74,7 +72,7 @@ services:
7472
- "--system-banner=${SYSTEM_BANNER:?}"
7573
- "--system-banner-severity=${SYSTEM_BANNER_SEVERITY:?}"
7674
volumes:
77-
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - local kubeconfig path resolves to $HOME/<user>/.kube/config
75+
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
7876
tmpfs:
7977
- /tmp
8078

@@ -90,7 +88,7 @@ services:
9088
--metric-resolution=5s
9189
--metric-duration=10m
9290
volumes:
93-
- ${KUBECONFIG:?}:${KUBECONFIG:?}
91+
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
9492
shm_size: 1G
9593
tmpfs:
9694
- /tmp

‎modules/api/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN adduser \
2727
--uid "${UID}" \
2828
"${USER}"
2929

30-
FROM golang:1.22-alpine3.19 as builder
30+
FROM golang:1.23-alpine3.19 as builder
3131

3232
ARG TARGETARCH
3333
ARG TARGETOS

‎modules/api/dev.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
# ! Context expected to be set to "modules" dir !
1616

17-
FROM golang:1.22-alpine3.19 as AIR
17+
FROM golang:1.23-alpine3.19 as AIR
1818

1919
RUN go install github.com/air-verse/air@latest
2020

21-
FROM golang:1.22-alpine3.19
21+
FROM golang:1.23-alpine3.19
2222

2323
# Copy air binary
2424
COPY --from=AIR $GOPATH/bin/air $GOPATH/bin/air

‎modules/api/go.mod

+51-45
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,122 @@
11
module k8s.io/dashboard/api
22

3-
go 1.22.0
3+
go 1.23.0
44

55
require (
6-
github.com/docker/distribution v2.8.3+incompatible
6+
github.com/distribution/reference v0.6.0
77
github.com/emicklei/go-restful-openapi/v2 v2.10.2
88
github.com/emicklei/go-restful/v3 v3.12.1
99
github.com/go-openapi/spec v0.21.0
10-
github.com/prometheus/client_golang v1.19.1
10+
github.com/prometheus/client_golang v1.20.4
1111
github.com/spf13/pflag v1.0.5
12-
golang.org/x/net v0.28.0
12+
golang.org/x/net v0.29.0
1313
gopkg.in/igm/sockjs-go.v2 v2.1.0
14-
k8s.io/api v0.30.3
15-
k8s.io/apiextensions-apiserver v0.30.3
16-
k8s.io/apimachinery v0.30.3
17-
k8s.io/client-go v0.30.3
14+
k8s.io/api v0.31.1
15+
k8s.io/apiextensions-apiserver v0.31.1
16+
k8s.io/apimachinery v0.31.1
17+
k8s.io/client-go v0.31.1
1818
k8s.io/dashboard/certificates v0.0.0-00010101000000-000000000000
1919
k8s.io/dashboard/client v0.0.0-00010101000000-000000000000
2020
k8s.io/dashboard/csrf v0.0.0-00010101000000-000000000000
2121
k8s.io/dashboard/errors v0.0.0-00010101000000-000000000000
2222
k8s.io/dashboard/helpers v0.0.0-00010101000000-000000000000
2323
k8s.io/dashboard/types v0.0.0-00010101000000-000000000000
2424
k8s.io/klog/v2 v2.130.1
25-
k8s.io/kubectl v0.30.3
25+
k8s.io/kubectl v0.31.1
2626
)
2727

2828
require (
2929
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3030
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3131
github.com/beorn7/perks v1.0.1 // indirect
32-
github.com/bytedance/sonic v1.9.1 // indirect
33-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
32+
github.com/blang/semver/v4 v4.0.0 // indirect
33+
github.com/bytedance/sonic v1.11.6 // indirect
34+
github.com/bytedance/sonic/loader v0.1.1 // indirect
35+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3436
github.com/chai2010/gettext-go v1.0.2 // indirect
35-
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
36-
github.com/davecgh/go-spew v1.1.1 // indirect
37-
github.com/distribution/reference v0.5.0 // indirect
38-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
37+
github.com/cloudwego/base64x v0.1.4 // indirect
38+
github.com/cloudwego/iasm v0.2.0 // indirect
39+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3940
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
40-
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
41+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
42+
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
4143
github.com/gin-contrib/sse v0.1.0 // indirect
42-
github.com/gin-gonic/gin v1.9.1 // indirect
44+
github.com/gin-gonic/gin v1.10.0 // indirect
4345
github.com/go-errors/errors v1.4.2 // indirect
44-
github.com/go-logr/logr v1.4.1 // indirect
46+
github.com/go-logr/logr v1.4.2 // indirect
4547
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4648
github.com/go-openapi/jsonreference v0.21.0 // indirect
4749
github.com/go-openapi/swag v0.23.0 // indirect
4850
github.com/go-playground/locales v0.14.1 // indirect
4951
github.com/go-playground/universal-translator v0.18.1 // indirect
50-
github.com/go-playground/validator/v10 v10.14.0 // indirect
51-
github.com/gobuffalo/flect v1.0.2 // indirect
52+
github.com/go-playground/validator/v10 v10.20.0 // indirect
53+
github.com/gobuffalo/flect v1.0.3 // indirect
5254
github.com/goccy/go-json v0.10.2 // indirect
5355
github.com/gogo/protobuf v1.3.2 // indirect
5456
github.com/golang/protobuf v1.5.4 // indirect
5557
github.com/google/btree v1.0.1 // indirect
5658
github.com/google/gnostic-models v0.6.8 // indirect
59+
github.com/google/go-cmp v0.6.0 // indirect
5760
github.com/google/gofuzz v1.2.0 // indirect
5861
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5962
github.com/google/uuid v1.6.0 // indirect
60-
github.com/gorilla/websocket v1.5.1 // indirect
63+
github.com/gorilla/websocket v1.5.0 // indirect
6164
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
6265
github.com/imdario/mergo v0.3.16 // indirect
6366
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6467
github.com/josharian/intern v1.0.0 // indirect
6568
github.com/json-iterator/go v1.1.12 // indirect
66-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
67-
github.com/leodido/go-urn v1.2.4 // indirect
69+
github.com/klauspost/compress v1.17.9 // indirect
70+
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
71+
github.com/leodido/go-urn v1.4.0 // indirect
6872
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
6973
github.com/mailru/easyjson v0.7.7 // indirect
7074
github.com/mattn/go-isatty v0.0.20 // indirect
7175
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
72-
github.com/moby/spdystream v0.2.0 // indirect
73-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
76+
github.com/moby/spdystream v0.4.0 // indirect
77+
github.com/moby/term v0.5.0 // indirect
7478
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7579
github.com/modern-go/reflect2 v1.0.2 // indirect
7680
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7781
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7882
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7983
github.com/opencontainers/go-digest v1.0.0 // indirect
80-
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
84+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
8185
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
8286
github.com/pkg/errors v0.9.1 // indirect
83-
github.com/prometheus/client_model v0.5.0 // indirect
84-
github.com/prometheus/common v0.48.0 // indirect
85-
github.com/prometheus/procfs v0.12.0 // indirect
87+
github.com/prometheus/client_model v0.6.1 // indirect
88+
github.com/prometheus/common v0.55.0 // indirect
89+
github.com/prometheus/procfs v0.15.1 // indirect
8690
github.com/russross/blackfriday/v2 v2.1.0 // indirect
87-
github.com/spf13/cobra v1.7.0 // indirect
91+
github.com/samber/lo v1.47.0 // indirect
92+
github.com/spf13/cobra v1.8.1 // indirect
8893
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
89-
github.com/ugorji/go/codec v1.2.11 // indirect
94+
github.com/ugorji/go/codec v1.2.12 // indirect
95+
github.com/x448/float16 v0.8.4 // indirect
9096
github.com/xlab/treeprint v1.2.0 // indirect
9197
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
92-
golang.org/x/arch v0.3.0 // indirect
93-
golang.org/x/crypto v0.26.0 // indirect
94-
golang.org/x/oauth2 v0.16.0 // indirect
98+
golang.org/x/arch v0.8.0 // indirect
99+
golang.org/x/crypto v0.27.0 // indirect
100+
golang.org/x/oauth2 v0.21.0 // indirect
95101
golang.org/x/sync v0.8.0 // indirect
96-
golang.org/x/sys v0.23.0 // indirect
97-
golang.org/x/term v0.23.0 // indirect
98-
golang.org/x/text v0.17.0 // indirect
102+
golang.org/x/sys v0.25.0 // indirect
103+
golang.org/x/term v0.24.0 // indirect
104+
golang.org/x/text v0.18.0 // indirect
99105
golang.org/x/time v0.5.0 // indirect
100-
google.golang.org/appengine v1.6.8 // indirect
101-
google.golang.org/protobuf v1.33.0 // indirect
106+
google.golang.org/protobuf v1.34.2 // indirect
107+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
102108
gopkg.in/inf.v0 v0.9.1 // indirect
103109
gopkg.in/yaml.v2 v2.4.0 // indirect
104110
gopkg.in/yaml.v3 v3.0.1 // indirect
105-
k8s.io/cli-runtime v0.30.3 // indirect
106-
k8s.io/component-base v0.30.3 // indirect
111+
k8s.io/cli-runtime v0.31.1 // indirect
112+
k8s.io/component-base v0.31.1 // indirect
107113
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
108-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
114+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
109115
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
110-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
111-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
116+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
117+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
112118
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
113-
sigs.k8s.io/yaml v1.3.0 // indirect
119+
sigs.k8s.io/yaml v1.4.0 // indirect
114120
)
115121

116122
replace (

0 commit comments

Comments
 (0)