Skip to content

Commit

Permalink
bump dependencies and add owner ref information to object meta
Browse files Browse the repository at this point in the history
  • Loading branch information
floreks committed Sep 24, 2024
1 parent b5d2545 commit fb033b2
Show file tree
Hide file tree
Showing 52 changed files with 1,680 additions and 1,198 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ serve: $(PRE) --ensure-kind-cluster --ensure-metrics-server ## Starts developmen
SIDECAR_HOST=$(SIDECAR_HOST) \
docker compose -f $(DOCKER_COMPOSE_DEV_PATH) --project-name=$(PROJECT_NAME) up \
--build \
--force-recreate \
--remove-orphans \
--no-attach gateway \
--no-attach scraper \
Expand All @@ -90,7 +91,7 @@ serve: $(PRE) --ensure-kind-cluster --ensure-metrics-server ## Starts developmen
# Starts production version of the application.
#
# HTTPS: https://localhost:8443
# HTTP: https://localhost:8080
# HTTP: http://localhost:8080
#
# Note: Make sure that the ports 8443 (Gateway HTTPS) and 8080 (Gateway HTTP) are free on your localhost
.PHONY: run
Expand Down
12 changes: 5 additions & 7 deletions hack/docker/dev.compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version: "3.8"

services:
gateway:
container_name: kong-gateway
image: kong/kong-gateway:3.6
image: kong/kong-gateway:3.8
environment:
- "KONG_DATABASE=off"
- "KONG_PROXY_ACCESS_LOG=/dev/stdout"
Expand All @@ -44,7 +42,7 @@ services:
- ${PWD}/modules/auth/api:/workspace/auth/api # Required - Source dir watched by AIR
- ${PWD}/modules/auth/main.go:/workspace/auth/main.go # Required - Entry file watched by AIR
- ${PWD}/modules/auth/.air.toml:/workspace/auth/.air.toml # Required - AIR configuration
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - local kubeconfig path resolves to $HOME/<user>/.kube/config
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
tmpfs:
- /tmp

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

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

Expand Down Expand Up @@ -107,7 +105,7 @@ services:
- ${PWD}/modules/metrics-scraper/pkg:/workspace/metrics-scraper/pkg # Required - Source dir watched by AIR
- ${PWD}/modules/metrics-scraper/main.go:/workspace/metrics-scraper/main.go # Required - Entry file watched by AIR
- ${PWD}/modules/metrics-scraper/.air.toml:/workspace/metrics-scraper/.air.toml # Required - AIR configuration
- ${KUBECONFIG:?}:${KUBECONFIG:?}
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
shm_size: 1G
tmpfs:
- /tmp
Expand Down
12 changes: 5 additions & 7 deletions hack/docker/docker.compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version: "3.8"

services:
gateway:
container_name: kong-gateway
image: kong/kong-gateway:3.6
image: kong/kong-gateway:3.8
environment:
- "KONG_DATABASE=off"
- "KONG_PROXY_ACCESS_LOG=/dev/stdout"
Expand All @@ -42,7 +40,7 @@ services:
command:
- "--kubeconfig=${KUBECONFIG:?}"
volumes:
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - local kubeconfig path resolves to $HOME/<user>/.kube/config
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
tmpfs:
- /tmp

Expand All @@ -57,7 +55,7 @@ services:
--kubeconfig=${KUBECONFIG:?}
--sidecar-host=${SIDECAR_HOST:?}
volumes:
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - local kubeconfig path resolves to $HOME/<user>/.kube/config
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
tmpfs:
- /tmp

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

Expand All @@ -90,7 +88,7 @@ services:
--metric-resolution=5s
--metric-duration=10m
volumes:
- ${KUBECONFIG:?}:${KUBECONFIG:?}
- ${KUBECONFIG:?}:${KUBECONFIG:?} # Required - tmp kubeconfig path resolves to $DASHBOARD_DIR/.tmp/kubeconfig
shm_size: 1G
tmpfs:
- /tmp
Expand Down
2 changes: 1 addition & 1 deletion modules/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN adduser \
--uid "${UID}" \
"${USER}"

FROM golang:1.22-alpine3.19 as builder
FROM golang:1.23-alpine3.19 as builder

ARG TARGETARCH
ARG TARGETOS
Expand Down
4 changes: 2 additions & 2 deletions modules/api/dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

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

FROM golang:1.22-alpine3.19 as AIR
FROM golang:1.23-alpine3.19 as AIR

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

FROM golang:1.22-alpine3.19
FROM golang:1.23-alpine3.19

# Copy air binary
COPY --from=AIR $GOPATH/bin/air $GOPATH/bin/air
Expand Down
96 changes: 51 additions & 45 deletions modules/api/go.mod
Original file line number Diff line number Diff line change
@@ -1,116 +1,122 @@
module k8s.io/dashboard/api

go 1.22.0
go 1.23.0

require (
github.com/docker/distribution v2.8.3+incompatible
github.com/distribution/reference v0.6.0
github.com/emicklei/go-restful-openapi/v2 v2.10.2
github.com/emicklei/go-restful/v3 v3.12.1
github.com/go-openapi/spec v0.21.0
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/client_golang v1.20.4
github.com/spf13/pflag v1.0.5
golang.org/x/net v0.28.0
golang.org/x/net v0.29.0
gopkg.in/igm/sockjs-go.v2 v2.1.0
k8s.io/api v0.30.3
k8s.io/apiextensions-apiserver v0.30.3
k8s.io/apimachinery v0.30.3
k8s.io/client-go v0.30.3
k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery v0.31.1
k8s.io/client-go v0.31.1
k8s.io/dashboard/certificates v0.0.0-00010101000000-000000000000
k8s.io/dashboard/client v0.0.0-00010101000000-000000000000
k8s.io/dashboard/csrf v0.0.0-00010101000000-000000000000
k8s.io/dashboard/errors v0.0.0-00010101000000-000000000000
k8s.io/dashboard/helpers v0.0.0-00010101000000-000000000000
k8s.io/dashboard/types v0.0.0-00010101000000-000000000000
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.30.3
k8s.io/kubectl v0.31.1
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bytedance/sonic v1.9.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bytedance/sonic v1.11.6 // indirect
github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/gin-gonic/gin v1.9.1 // indirect
github.com/gin-gonic/gin v1.10.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/gobuffalo/flect v1.0.2 // indirect
github.com/go-playground/validator/v10 v10.20.0 // indirect
github.com/gobuffalo/flect v1.0.3 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/moby/spdystream v0.4.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/samber/lo v1.47.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
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/cli-runtime v0.30.3 // indirect
k8s.io/component-base v0.30.3 // indirect
k8s.io/cli-runtime v0.31.1 // indirect
k8s.io/component-base v0.31.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/api v0.17.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
Expand Down
Loading

0 comments on commit fb033b2

Please sign in to comment.