From af5598c3e62d403dca1265e3e5f5a7b44765fcdf Mon Sep 17 00:00:00 2001 From: Gerrit Date: Wed, 20 Nov 2024 13:40:21 +0100 Subject: [PATCH] Revendor g/g v1.100. (#8) --- .github/workflows/verify.yaml | 4 +- .gitignore | 1 + Dockerfile | 2 +- Makefile | 8 +- example/controller-registration.yaml | 9 +- go.mod | 73 +++++++------ go.sum | 153 +++++++++++++-------------- pkg/controller/dnsrecord/actuator.go | 13 ++- 8 files changed, 129 insertions(+), 134 deletions(-) diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index 1ce58aa..a8b6eb8 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -20,10 +20,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up Go 1.22 + - name: Set up Go 1.23 uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version: '1.23.x' - name: Verify run: | diff --git a/.gitignore b/.gitignore index 77a6d91..c0281ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea/ .vscode +.ci/ hack/tools/bin vendor diff --git a/Dockerfile b/Dockerfile index db21004..867d3a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22 AS builder +FROM golang:1.23 AS builder WORKDIR /go/src/github.com/metal-stack/gardener-extension-dns-powerdns diff --git a/Makefile b/Makefile index fdba78c..322f86a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 ENSURE_GARDENER_MOD := $(shell go get github.com/gardener/gardener@$$(go list -m -f "{{.Version}}" github.com/gardener/gardener)) -GARDENER_HACK_DIR := $(shell go list -m -f "{{.Dir}}" github.com/gardener/gardener)/hack +GARDENER_HACK_DIR := $(shell go list -m -f "{{.Dir}}" github.com/gardener/gardener)/hack IMAGE_TAG := $(or ${GITHUB_TAG_NAME}, latest) REGISTRY := ghcr.io/metal-stack IMAGE_PREFIX := $(REGISTRY) @@ -15,8 +15,8 @@ LD_FLAGS := "-w -X github.com/metal-stack/gardener-extension- LEADER_ELECTION := false IGNORE_OPERATION_ANNOTATION := false WEBHOOK_CONFIG_URL := localhost -GO_VERSION := 1.22 -GOLANGCI_LINT_VERSION := v1.56.2 +GO_VERSION := 1.23 +GOLANGCI_LINT_VERSION := v1.62.0 ifeq ($(CI),true) DOCKER_TTY_ARG="" @@ -82,7 +82,7 @@ generate: $(VGOPATH) $(HELM) $(YQ) .PHONY: generate-in-container generate-in-container: tidy $(HELM) -# echo $(shell git describe --abbrev=0 --tags) > VERSION + echo $(shell git describe --abbrev=0 --tags) > VERSION docker run --rm -i$(DOCKER_TTY_ARG) \ --env GOCACHE=/gocache \ --mount type=tmpfs,destination=/gocache,tmpfs-mode=1777 \ diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index 5b0a5ed..6af2c74 100644 --- a/example/controller-registration.yaml +++ b/example/controller-registration.yaml @@ -1,14 +1,13 @@ --- -apiVersion: core.gardener.cloud/v1beta1 +apiVersion: core.gardener.cloud/v1 kind: ControllerDeployment metadata: name: powerdns -type: helm -providerConfig: - chart: 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 +helm: + rawChart: H4sIAAAAAAAAA+1ce3PbNhLP3/oUGLadtjcl9bBk5ziTm3NtN/E0cTW2m7ubTicDkZCEmCJYAHSipvnut3jwTZlS4jjtnTDtmAR3F4vH/rBYrLLAPCQx4S55K0ksKIvdMBZuwt4QDg/9R/dQBlCOJhP9F0r9r34eHoyHo8no8FDVDydHR5NHaHIfjXeVVEjMEXrEGZN30XV9/4uWRcf8nywxl94ar6IPb0NN8OF4vHH+R6Nxbf6PjkaDR2hwf93cXP7P5x8n9CXhat59dDvs4STJX52hN3B6IREBp4nUVcfoGYlWKFCLAs0ZR3JJ0FO7hNBULZrTiyuUr6VejFfERx2LrHebNTnwoM3e5x6T/6fSZf8hC7wF+7g2uuz/6KBh/wOF/3v7//Sl30dX09N/uz/QiJywZM3pYimvYTH4aDQYjdHV8RRdnSEwdRzrFzyf04hiSVDAVgmO1/AhLDAgYLHkdJZKxkWvS/iKSBy5MAHBDTpO5dLw5GzPaQBLkrjnIFrSOSUcECjBwZK4I4AJoFswf6GaVeqIJXID5MwwPHz59Pjy9Ozi7PLVs+OTH1+dnl/2MzpXa8iiCNY8JwsqJNTCsveALVv1yENffhNgiTyvD/+9PLu8Ov/p4lv7St7iVRKR/iZBarNEAIOXJGA89DOhjlIYTaGveEEshJIYzyIiUKUfaZIwC6+2ksYLjbQgj5NAoqJlVGm5l5Slb4WjXfYvCfQV1PoYT3B3/+/o6Ohg7/89RNl+/l8tSZTARu3JZEdfsAP/h8M6/o9GB8PxHv8forx756KQzGlMkKOcNQe579/3uhw2xUUA9hVtrywiwjMSCQ/cSO+GrI0w/ZLOCI8JrCOPsr5qqCJjg4hbHKVWo3fvEI2DKA1zPT1kGe9QpMlbV1BJ8dEGCtu+bqnZCxrD0okDotm9SxIRLIh3Acq1aparRlcA0UYzhNQXOkdLLKYcvr9Fjlji0eTQh2ZfquahKUXvSbxAOUfCaSznyPlK/PMrUafkJGGCwga8vksE9JG0CfQ/WCB0ttRvePzca3tfusv2+A9Ox5wuVjjZORrQhf+Hgwb+H44O9vj/EKV2/r+hceijEz3VL3DSUx56iCX2wcjNWb4diN18dVhCAa5oCzLqaoMZBmf9FnRWIv+ASuX2o7GizlQwregF6KM/oAIh13X133JHstXrqf/zhS08y56teS+IWBr2b4c4SpZ4qMXkA2AdbDMUqXGwexatMxS08oKIgqZAGYNzDmSmf6Btrd7XtaBqEJBE1YNi8nqdEKEHipPfUspJiJwO+V5TAKIi53e69GvjtyrrIc5qd9SqxLmbOmXGXI/fkl1HBTh2a1cx5O3NUi7kji1qnt3aNCx/nn1ye/wPSRKx9Qq6s+sG0IH/R8ODgxr+HwzGe/x/kFKGTXBxRT/fBE7z+d56F9gS+7U3XIJRuogZJ5dEsJQHGRbhOGZSo64wuMmz73X8Nuw+ciQHb71sWLttMqqRJV0sXXyLKRDRiMq13di8ja1LDZSC8FvCeyIhgdKWk1uqxvQZFcptfk5XFLBloL8kEQ2wwbZsAGzlCUtjaTQRMG4BsJqur7AMls+368qhFaBiQmSxtmMHexmNFz8nMIsk24ZW+O3Pse1rRCoKVT8VIAn1VylfNIh1pSHLAMNqXlo5euurz6recpYkuBHpqnAx3Tu9jMry+0YfXdCX3rVt2PseFtwUyyVyaj6r860eKHPAgvaKfuXnMBXLzPtFJKcBOBA6SHcVcLCVeFFmSjgDoiVJ81MtrMKWw6CzgUMomcXKzYi+UEdFnEYSWRXUek6Y6iaNS8E/l8N6oXCUbpeuoohWn2qPpiq8WNaqYjKqZGaTEcCZ9w3jgAsN50myTAsXhseYASBJFMEGEm7HD9vMjhxJOgN7cS3Nztyc3qpA8Fbsm+2eucDmiiXsC8JVkYFiAFwZJO54fFBI7jDax9nQZwBiZpMyDhB0EmEhLqoXaWItwNDcvw8Gllg1TANyHAQKRC7uBunMz8MUZOXT7HZhuyn66F+lshGNJtk0jaIpg7laVxDDRA+S/GOZL2CrFVhhsfZc1O8KRxWkroUId04j8qRPZNBv746Fhn7pRFERA2K5jt+7AG9KaJByDlPlqto4AOniSalHhVHqQ4dh9Qq2q3UciHI3VRtLgrmcESzdfNd8cseBqY0RZJM3LiADTL+6SlHKhRs1y/k8zXdu2a4MV70Vs6+6LCHm9OMW4L2pAcPyU8ZxnDPUZYdUKFAtXcZUlLafi2OYAFt5DQiInO+cFthuB7hKi/aTOwOTc3EYgmGLJ/5GcNyMjfkURHK5WZr53qZIvpjtrXe53znG2G9lXhLflo3C2Orzs+PTs8tXZ8/PTq7Pf7p4dXH84uxqenxyllMipKOYP8DW4JcqEZpTEoWXZF6ttfVq//Tz3dvL12dOG9FbUFSIKWczUhaxlDJ5SmRVaqLF9c2g/F79pHepzpFTRYCjoDr97Pp6WvpAYyopjk5JhNd2KftoOMgpOMEh3VlXxbV+EFUn9bACr3rCWS9spfYAJfuPumVscvyBYrunDAe1Y2Ym6ZZF6Yq8UPuEaK4oA4glnVeK0KyHbjzN3Lz5XHV1XYhPWHgMbsJx4wPKD8+nKXhyiysYuTBV3uq5BhNbffaWBGk5iJJprXfTq4q7XC7adT57mygDrXqdZSE3ZL3xEiC/JmjhRMigI7SMzuNWAm19rc2apre4eqiySJawiC3WPyqdneqVxJIJqefE8pipbuzwtTkOsnBfWcuto31ZsT7rCxYC33i0T+P5S5Tt4z9gwbAt81Sngs3ScEG2DQR15f8cDurxn/HRZH//+yClGjZXzngRAZqy8DSf8e/1jN93KGi3CE12OqpHLoYfHzGxW7Agq1sV9F8lmAP1P56goTc6dAfAcIITExOigLU/AuzacfNeln21NDZOwRoG7wxOZGroshPQcfQGr8WxOhL+WcK/O9g/n+HgwxKBO+x/PBnX7/+Gk33+38MUdX1WxgA9y1jn4tHfTVbZzWPtWxS3gxGMGeGXLCK7wMEuhs7TSHktrrrVe8pZmmgXxkWlu7xqOKZXcZAVKfTjJk1maXBDpGjW9GHaZVr+QFTiImmpqZIKHbysvJQJAjM49sWcX8GAYtJSU+bLgwb11zIRjecc2uRpIFNOWuvK5CqGlalin4vPAHMzO1QK17UrTYV5eKPQUz8l+VOqY8fNKdkUIGvOyArHeEHCvLaqhPM3pyk8YDAENC6vw6Zcva3UpAVwfJOkrVcf2UZWr3cxP5urHC9dIAwVmkbmvs+MbxNj80hM+0xsGmzH0X/URY1dgdn0bLRbwxCuqD7/VNJFywQJLdlW6UMpFLppbPJ9XtRe+3DWwxH9PVuD5BYsyjwKAjMkc5swhwlLZWPd1hDyW6jGe18EOCJWnI5+ivILNqHQilmC6ZFGhYrhQP9MfUHR+PSazcwDeMLFQx/OYmZ5p1Jn6r4hsyVjN0E5ccCQw5mOhh00AajFVtkI65QxWny1s6EdNbqVBa1wsKQx8QROtFm2zqDi7BYVboG6QFPG0eJ1F+D5GNjfAkc/QAEwLKZW211mAGIlBRpYFBm5Wfhd42rc7qbAlgPXZpTbBcONHUVEIcxHbf/fG/P4ZF4ANGEDlNmQ3aFhL0/eKfknHfqIdPYagFq7Gob5qnKPcj+HnM/t491Vtvf/Lax+wBGgK/9vPB418r/3v/97mNKa/2eN4P4P+43r/21uWuecrcxdKyGha+7MXZg0hYeuvWB1VWxe+OjrX9456tHZfLPznZNwJlnAIsd3rk+mzvtfv95al7ybbhZvsI2WAg7Qdi0sW7lHgVaNUOf9Li3DbuBqoMxbLm4NYRSoSikp9sn6lUJris0D5NRkERuTJWOR+VxdiRTxmu0SWswE5x6mn+VG6H40bmZaLvOyWfcRTLquMWto2sH7uS3005ad8d+61btsA13x34PBpJ7/d3g02uP/Q5S78D9zgj5rzFf50voKsqrUNbshoPIcR4L8j5voJy1d9m+uLz/uH4Do8v9Gk6Oa/Q+Gh/v474MUk82lD5/Zj7x8tFgGPPNb7O+zt8jBknjhI71XqHNTUkr9MhcfvV45z1Xd2jTvcYoE08ngK8WQnYjRu/e9Xmln9tHjweNBr8jA0BXDXq+UUaS6lQcAjL9Zy8hSyRcI5cG4LNG4mRvlowOVULIxvylDol4zc8lHv/yaVf/LxH1MXc0ny0V88QU4R1KFiYT+Ebjt9XeIeAsPiSwPdbZG2iEukj6BMxsi1ROQY1JX8zTSjFd/7CFUzWz1kXL29AiqJNveph+wtP18BSd6ZhVR/7VgcTbYxU9JWin0jzyGNonR/gJjCCOd/wDVNwEP+w+SOHuk35d92Zd92Zd9uY/yX4vwqWQAUAAA values: image: - tag: v0.1.0 + tag: v0.6.0 --- apiVersion: core.gardener.cloud/v1beta1 kind: ControllerRegistration diff --git a/go.mod b/go.mod index 32737df..b789186 100644 --- a/go.mod +++ b/go.mod @@ -1,19 +1,19 @@ module github.com/metal-stack/gardener-extension-dns-powerdns -go 1.22.0 +go 1.23.0 require ( - github.com/gardener/gardener v1.95.6 - github.com/go-logr/logr v1.4.1 + github.com/gardener/gardener v1.100.2 + github.com/go-logr/logr v1.4.2 github.com/joeig/go-powerdns/v3 v3.10.0 - github.com/spf13/cobra v1.8.0 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 - golang.org/x/tools v0.21.0 - k8s.io/api v0.29.5 - k8s.io/apimachinery v0.29.5 - k8s.io/code-generator v0.29.5 - k8s.io/component-base v0.29.5 - k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 + golang.org/x/tools v0.27.0 + k8s.io/api v0.29.7 + k8s.io/apimachinery v0.29.7 + k8s.io/code-generator v0.29.7 + k8s.io/component-base v0.29.7 + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 sigs.k8s.io/controller-runtime v0.17.5 ) @@ -30,18 +30,18 @@ require ( github.com/emicklei/go-restful/v3 v3.11.2 // indirect github.com/evanphx/json-patch/v5 v5.8.0 // indirect github.com/fatih/color v1.16.0 // indirect - github.com/fluent/fluent-operator/v2 v2.8.0 // indirect + github.com/fluent/fluent-operator/v2 v2.9.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/gardener/cert-management v0.14.2 // indirect - github.com/gardener/etcd-druid v0.22.0 // indirect + github.com/gardener/cert-management v0.15.0 // indirect + github.com/gardener/etcd-druid v0.22.3 // indirect github.com/gardener/hvpa-controller/api v0.15.0 // indirect - github.com/gardener/machine-controller-manager v0.53.0 // indirect + github.com/gardener/machine-controller-manager v0.53.1 // indirect github.com/go-logr/zapr v1.3.0 // indirect github.com/go-openapi/errors v0.21.0 // indirect github.com/go-openapi/jsonpointer v0.20.2 // indirect github.com/go-openapi/jsonreference v0.20.4 // indirect github.com/go-openapi/swag v0.22.8 // indirect - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/gobuffalo/flect v1.0.2 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -50,7 +50,7 @@ require ( 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/pprof v0.0.0-20231212022811-ec68065c825e // indirect + github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -73,9 +73,9 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/nxadm/tail v1.4.11 // indirect - github.com/onsi/ginkgo/v2 v2.17.1 // indirect + github.com/onsi/ginkgo/v2 v2.19.0 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 // indirect + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 // indirect github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.46.0 // indirect @@ -90,36 +90,35 @@ require ( go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.23.0 // indirect - golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/oauth2 v0.19.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/term v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/crypto v0.29.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/mod v0.22.0 // indirect + golang.org/x/net v0.31.0 // indirect + golang.org/x/oauth2 v0.20.0 // indirect + golang.org/x/sync v0.9.0 // indirect + golang.org/x/sys v0.27.0 // indirect + golang.org/x/term v0.26.0 // indirect + golang.org/x/text v0.20.0 // indirect golang.org/x/time v0.5.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/protobuf v1.34.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 helm.sh/helm/v3 v3.14.4 // indirect - istio.io/api v1.21.2 // indirect - istio.io/client-go v1.21.1 // indirect - k8s.io/apiextensions-apiserver v0.29.4 // indirect - k8s.io/autoscaler/vertical-pod-autoscaler v1.1.1 // indirect - k8s.io/client-go v0.29.5 // indirect + istio.io/api v1.22.3 // indirect + istio.io/client-go v1.22.0 // indirect + k8s.io/apiextensions-apiserver v0.29.7 // indirect + k8s.io/autoscaler/vertical-pod-autoscaler v1.1.2 // indirect + k8s.io/client-go v0.29.7 // indirect k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect k8s.io/klog v1.0.0 // indirect k8s.io/klog/v2 v2.120.1 // indirect - k8s.io/kube-aggregator v0.29.4 // indirect + k8s.io/kube-aggregator v0.29.7 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/kubelet v0.29.4 // indirect - k8s.io/metrics v0.29.4 // indirect + k8s.io/kubelet v0.29.7 // indirect + k8s.io/metrics v0.29.7 // indirect sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231015215740-bf15e44028f9 // indirect sigs.k8s.io/controller-tools v0.14.0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/go.sum b/go.sum index 48cc022..dd1881c 100644 --- a/go.sum +++ b/go.sum @@ -40,6 +40,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/ahmetb/gen-crd-api-reference-docs v0.3.0 h1:+XfOU14S4bGuwyvCijJwhhBIjYN+YXS18jrCY2EzJaY= github.com/ahmetb/gen-crd-api-reference-docs v0.3.0/go.mod h1:TdjdkYhlOifCQWPs1UdTma97kQQMozf5h26hTuG70u8= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -53,7 +55,7 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -77,8 +79,8 @@ github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1 github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= -github.com/fluent/fluent-operator/v2 v2.8.0 h1:G6TB1Fq6wx+HflXmv2mc7bhj2MiDoT9OfAeq/XkPCgI= -github.com/fluent/fluent-operator/v2 v2.8.0/go.mod h1:nGKS5Iryq98Jqt+Ixc8YSMmOzM/yNxD8Xwtt76DhmTg= +github.com/fluent/fluent-operator/v2 v2.9.0 h1:VFGgRPOI+yxnOrTIAL6sgFCtc+quDda12iyVL1lRQag= +github.com/fluent/fluent-operator/v2 v2.9.0/go.mod h1:Hthhi/3oO26udvro6t5foUx20PZAMn7WGUhSnEWUV9U= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -86,22 +88,22 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/gardener/cert-management v0.14.2 h1:dlrPblsUIIjMaDPfZyYXvO3OKDkAlHSjbdZO1c6HASQ= -github.com/gardener/cert-management v0.14.2/go.mod h1:dfhuPXJn+yy9OoSSxY/HAMiwzD2IOqoM+UMx16QTkvI= -github.com/gardener/etcd-druid v0.22.0 h1:DVe+Zjrb93r9vI1uUiCTMHBffIUoMAKhNzFZNC6hsQ8= -github.com/gardener/etcd-druid v0.22.0/go.mod h1:FROhfVKyWBo4krlPe3R6FIhJRmOmijEWBdEeUP0CJjE= -github.com/gardener/gardener v1.95.6 h1:s57+CL1WeZRV0demFDWJda/cerGPSknb7ZZEKU2SnHg= -github.com/gardener/gardener v1.95.6/go.mod h1:dPyPIfT8n77FopQO/z1CXplkBGV5oN4LAQDhr5obOVI= +github.com/gardener/cert-management v0.15.0 h1:ohm1eWae2rQSkwFGWXTt+lBv4rLBhtJsJgqvaXJBs6o= +github.com/gardener/cert-management v0.15.0/go.mod h1:3BK2VEtGwv2ijf3bSziTLMCUvYnPzIQrQ/uPeZzL4m0= +github.com/gardener/etcd-druid v0.22.3 h1:WRUSIlTG/HX7G/cGRzMyU7wIEmIKjp4On6PL/P6NbWI= +github.com/gardener/etcd-druid v0.22.3/go.mod h1:FROhfVKyWBo4krlPe3R6FIhJRmOmijEWBdEeUP0CJjE= +github.com/gardener/gardener v1.100.2 h1:9L1qNFERsocHiYNb2jJdBs99zXsZTGptL2phqHS3QIw= +github.com/gardener/gardener v1.100.2/go.mod h1:OzCK5XFSNma6u1xUDYDpwbgJwmpo9WVVEu/pR21sarM= github.com/gardener/hvpa-controller/api v0.15.0 h1:igsalL5Z6kFMn1+Kv1Eq0cRjYW+4oBA1aEY/yDO2QtI= github.com/gardener/hvpa-controller/api v0.15.0/go.mod h1:fqb4wNrQLESDKpm7ppXyCM2Gvx96wRlLL35aH0ge07U= -github.com/gardener/machine-controller-manager v0.53.0 h1:g2O0F7nEYZ9LjyPY6Gew8+q0n+rU88deexNq5k8CKks= -github.com/gardener/machine-controller-manager v0.53.0/go.mod h1:XWXHaTy32TU0qmLjWqOgtw8NncdB0HfFzXhUUrcpr7Y= +github.com/gardener/machine-controller-manager v0.53.1 h1:4P9qtzoD+989Lhc8XaI6Zo3X2TaQVXgHHrbEpuhJcrI= +github.com/gardener/machine-controller-manager v0.53.1/go.mod h1:XWXHaTy32TU0qmLjWqOgtw8NncdB0HfFzXhUUrcpr7Y= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-openapi/errors v0.21.0 h1:FhChC/duCnfoLj1gZ0BgaBmzhJC2SL/sJr8a2vAobSY= @@ -123,8 +125,8 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.22.8 h1:/9RjDSQ0vbFR+NyjGMkFTsA1IA0fmhKSThmfGZjicbw= github.com/go-openapi/swag v0.22.8/go.mod h1:6QT22icPLEqAM/z/TChgb4WAveCHF92+2gF0CNjHpPI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA= github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= @@ -172,8 +174,8 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20231212022811-ec68065c825e h1:bwOy7hAFd0C91URzMIEBfr6BAz29yk7Qj0cy6S7DJlU= -github.com/google/pprof v0.0.0-20231212022811-ec68065c825e/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -270,12 +272,12 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= -github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= -github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -283,8 +285,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 h1:GwlGJPK6vf1UIohpc72KJVkKYlzki1UgE3xC4bWbf20= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2/go.mod h1:yJ3CawR/A5qEYFEeCOUVYLTwYxmacfHQhJS+b/2QiaM= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 h1:AHzMWDxNiAVscJL6+4wkvFRTpMnJqiaZFEKA/osaBXE= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0/go.mod h1:wAR5JopumPtAZnu0Cjv2PSqV4p4QB09LMhc6fZZTXuA= github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -310,8 +312,8 @@ github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNo github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -323,7 +325,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= @@ -359,15 +360,15 @@ golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= +golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= -golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -385,8 +386,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -408,15 +409,15 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= +golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg= -golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8= +golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= +golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -425,8 +426,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -451,21 +452,21 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU= +golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -498,8 +499,8 @@ golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= -golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= +golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -526,10 +527,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac h1:ZL/Teoy/ZGnzyrqK/Optxxp2pmVh+fmJ97slxSRyzUg= -google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k= -google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac h1:OZkkudMUu9LVQMCoRUbI/1p5VCo9BOrlvkqMvWtqa6s= -google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:B5xPO//w8qmBDjGReYLpR6UJPnkldGkCSMoH/2vxJeg= +google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 h1:RFiFrvy37/mpSpdySBDrUdipW/dHwsRwh3J3+A9VgT4= +google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -574,30 +573,28 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -istio.io/api v1.21.2 h1:rnMcWXez7JIpfQjhYQMCkSGoie9U0hCq9lFEo2jP11w= -istio.io/api v1.21.2/go.mod h1:TFCMUCAHRjxBv1CsIsFCsYHPHi4axVI4vdIzVr8eFjY= -istio.io/client-go v1.21.1 h1:gAZCeG4pV2o2L6WaD/MLruNB+tBxa+Y21BuRJmFYlAI= -istio.io/client-go v1.21.1/go.mod h1:mqwsapfu4b1FG47puY9H8y4+ga1+d+hxfdosNQ1HclY= +istio.io/api v1.22.3 h1:V59wgcCm2fK2r137QBsddCDHNg0efg/DauIWEB9DFz8= +istio.io/api v1.22.3/go.mod h1:S3l8LWqNYS9yT+d4bH+jqzH2lMencPkW7SKM1Cu9EyM= +istio.io/client-go v1.22.0 h1:TQ+Y7hqZVQHvaJXF99Q1jBqnVG7gYAHR9IvCK2nlwfE= +istio.io/client-go v1.22.0/go.mod h1:1lAPr0DOVBbnRQqLAQKxWbEaxFk6b1CJTm+ypnP7sMo= k8s.io/api v0.19.0/go.mod h1:I1K45XlvTrDjmj5LoM5LuP/KYrhWbjUKT/SoPG0qTjw= -k8s.io/api v0.29.5 h1:levS+umUigHCfI3riD36pMY1vQEbrzh4r1ivVWAhHaI= -k8s.io/api v0.29.5/go.mod h1:7b18TtPcJzdjk7w5zWyIHgoAtpGeRvGGASxlS7UZXdQ= -k8s.io/apiextensions-apiserver v0.29.4 h1:M7hbuHU/ckbibR7yPbe6DyNWgTFKNmZDbdZKD8q1Smk= -k8s.io/apiextensions-apiserver v0.29.4/go.mod h1:TTDC9fB+0kHY2rogf5hgBR03KBKCwED+GHUsXGpR7SM= +k8s.io/api v0.29.7 h1:Q2/thp7YYESgy0MGzxT9RvA/6doLJHBXSFH8GGLxSbc= +k8s.io/api v0.29.7/go.mod h1:mPimdbyuIjwoLtBEVIGVUYb4BKOE+44XHt/n4IqKsLA= +k8s.io/apiextensions-apiserver v0.29.7 h1:X62u7vUGfwW5rYJB5jkZDr0uV2XSyEHJRdxnfD5PaLs= +k8s.io/apiextensions-apiserver v0.29.7/go.mod h1:JzBXxlZKKdtEYGr4yiN+s0eXheCTYgKDay8JXPfSGoQ= k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.29.5 h1:Hofa2BmPfpoT+IyDTlcPdCHSnHtEQMoJYGVoQpRTfv4= -k8s.io/apimachinery v0.29.5/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= -k8s.io/apiserver v0.29.4 h1:wPwGOO58GQOpRiZu59P5eRoDcB7QtV+QBglkRiXwCiM= -k8s.io/apiserver v0.29.4/go.mod h1:VqTF9t98HVfhKZVRohCPezsdUt9u2g3bHKftxGcXoRo= -k8s.io/autoscaler/vertical-pod-autoscaler v1.1.1 h1:cz1xqf+WccJcvEaDd9sefJVx7bEldJT5RLQWViRgoTI= -k8s.io/autoscaler/vertical-pod-autoscaler v1.1.1/go.mod h1:J2cNKnieE7r4bInjpQDBq93D50aD/CmspSi6xRUfKk4= +k8s.io/apimachinery v0.29.7 h1:ICXzya58Q7hyEEfnTrbmdfX1n1schSepX2KUfC2/ykc= +k8s.io/apimachinery v0.29.7/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= +k8s.io/autoscaler/vertical-pod-autoscaler v1.1.2 h1:ENxmnVXLt8+iXhDA0PNFhXb1sgvbvnAc66sC34UGrTw= +k8s.io/autoscaler/vertical-pod-autoscaler v1.1.2/go.mod h1:J2cNKnieE7r4bInjpQDBq93D50aD/CmspSi6xRUfKk4= k8s.io/client-go v0.19.0/go.mod h1:H9E/VT95blcFQnlyShFgnFT9ZnJOAceiUHM3MlRC+mU= -k8s.io/client-go v0.29.5 h1:nlASXmPQy190qTteaVP31g3c/wi2kycznkTP7Sv1zPc= -k8s.io/client-go v0.29.5/go.mod h1:aY5CnqUUvXYccJhm47XHoPcRyX6vouHdIBHaKZGTbK4= +k8s.io/client-go v0.29.7 h1:vTtiFrGBKlcBhxaeZC4eDrqui1e108nsTyue/KU63IY= +k8s.io/client-go v0.29.7/go.mod h1:69BvVqdRozgR/9TP45u/oO0tfrdbP+I8RqrcCJQshzg= k8s.io/code-generator v0.19.0/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= -k8s.io/code-generator v0.29.5 h1:WqSdBPVV1B3jsPnKtPS39U02zj6Q7+FsjhAj1EPBJec= -k8s.io/code-generator v0.29.5/go.mod h1:7TYnI0dYItL2cKuhhgPSuF3WED9uMdELgbVXFfn/joE= -k8s.io/component-base v0.29.5 h1:Ptj8AzG+p8c2a839XriHwxakDpZH9uvIgYz+o1agjg8= -k8s.io/component-base v0.29.5/go.mod h1:9nBUoPxW/yimISIgAG7sJDrUGJlu7t8HnDafIrOdU8Q= +k8s.io/code-generator v0.29.7 h1:NEwmKOJVNObCh3upBLEojL1QuJMzGplOTYZnee4h0TY= +k8s.io/code-generator v0.29.7/go.mod h1:7TYnI0dYItL2cKuhhgPSuF3WED9uMdELgbVXFfn/joE= +k8s.io/component-base v0.29.7 h1:zXLJvZjvvDWdYmZCwZYk95E1Fd2oRXUz71mQukkRk5I= +k8s.io/component-base v0.29.7/go.mod h1:ddLTpIrjazaRI1EG83M41GNcYEAdskuQmx4JOOSXCOg= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -610,18 +607,18 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-aggregator v0.29.4 h1:yT7vYtwIag4G8HNrktYZ3qz6p6oHKronMAXOw4eQ2WQ= -k8s.io/kube-aggregator v0.29.4/go.mod h1:zBfe4iXXmw5HinNgN0JoAu5rpXdyCUvRfG99+FVOd68= +k8s.io/kube-aggregator v0.29.7 h1:KD6/K64zAPo3nH7a3tumN0jc0vgaYEdB0mJ9ZwxmY/A= +k8s.io/kube-aggregator v0.29.7/go.mod h1:izFeKn6G9BJStPlpHOXEqFqzkC5Mft8YRlJMtrZcGqw= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubelet v0.29.4 h1:6fTt4sTd5xqTtIhVoS7PkiFUBevQsyu3ZmENVvwY62M= -k8s.io/kubelet v0.29.4/go.mod h1:lAu6Z17pxKwgM+9hsgGkqFjYTOhbc0dnZ6GNnlbjYW0= -k8s.io/metrics v0.29.4 h1:06sZ63/Kt9HEb5GP/1y6xbHDz6XkxnHpu949UdXfoXQ= -k8s.io/metrics v0.29.4/go.mod h1:ZN9peB0nLTqPZuwQna8ZUrPFJQ0i8QNH4pqRJopS+9c= +k8s.io/kubelet v0.29.7 h1:YapoCGXAXRLCuRaEmCaHIbM6Ogw6dipRU+6ijMU+weo= +k8s.io/kubelet v0.29.7/go.mod h1:6cnRnEhVk4WvZC1bsegIgxhluMHa/c0Php+1bWJabLQ= +k8s.io/metrics v0.29.7 h1:/oMPdVL7dt+lF8W6lXTg9gIKz1dDKgVBfDnJwgyJrhk= +k8s.io/metrics v0.29.7/go.mod h1:5AiYPn1Crd25wtTh7OxHg9Rm2t9THSXJVp3Lb2k7MB8= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= -k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/controller-runtime v0.17.5 h1:1FI9Lm7NiOOmBsgTV36/s2XrEFXnO2C4sbg/Zme72Rw= sigs.k8s.io/controller-runtime v0.17.5/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY= diff --git a/pkg/controller/dnsrecord/actuator.go b/pkg/controller/dnsrecord/actuator.go index 46a86cb..99244f5 100644 --- a/pkg/controller/dnsrecord/actuator.go +++ b/pkg/controller/dnsrecord/actuator.go @@ -15,7 +15,6 @@ import ( gardencorev1beta1helper "github.com/gardener/gardener/pkg/apis/core/v1beta1/helper" extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" extensionsv1alpha1helper "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/helper" - kutil "github.com/gardener/gardener/pkg/utils/kubernetes" "github.com/go-logr/logr" "github.com/joeig/go-powerdns/v3" "sigs.k8s.io/controller-runtime/pkg/client" @@ -41,7 +40,7 @@ func (a *actuator) Reconcile(ctx context.Context, log logr.Logger, dns *extensio // Create PowerDNS client pdnsClient, err := pdns.NewClientFromSecretRef(ctx, a.client, dns.Spec.SecretRef) if err != nil { - return fmt.Errorf("could not create PowerDNS client: %+v", err) + return fmt.Errorf("could not create PowerDNS client: %w", err) } // Determine DNS hosted zone ID @@ -52,7 +51,7 @@ func (a *actuator) Reconcile(ctx context.Context, log logr.Logger, dns *extensio // Create or update DNS recordset ttl := extensionsv1alpha1helper.GetDNSRecordTTL(dns.Spec.TTL) - log.Info("Creating or updating DNS recordset", "zone", zone, "name", dns.Spec.Name, "type", dns.Spec.RecordType, "values", dns.Spec.Values, "dnsrecord", kutil.ObjectName(dns)) + log.Info("Creating or updating DNS recordset", "zone", zone, "name", dns.Spec.Name, "type", dns.Spec.RecordType, "values", dns.Spec.Values, "dnsrecord", dns.Name) if err := pdnsClient.CreateOrUpdateDNSRecordSet(ctx, zone, dns.Spec.Name, powerdns.RRType(dns.Spec.RecordType), dns.Spec.Values, ttl); err != nil { return fmt.Errorf("could not create or update DNS recordset in zone %s with name %s, type %s, and values %v: %w", zone, dns.Spec.Name, dns.Spec.RecordType, dns.Spec.Values, err) } @@ -60,7 +59,7 @@ func (a *actuator) Reconcile(ctx context.Context, log logr.Logger, dns *extensio // Delete meta DNS recordset if exists if dns.Status.LastOperation == nil || dns.Status.LastOperation.Type == gardencorev1beta1.LastOperationTypeCreate { name, recordType := dnsrecord.GetMetaRecordName(dns.Spec.Name), "TXT" - log.Info("Deleting meta DNS recordset", "zone", zone, "name", name, "type", recordType, "dnsrecord", kutil.ObjectName(dns)) + log.Info("Deleting meta DNS recordset", "zone", zone, "name", name, "type", recordType, "dnsrecord", dns.Name) if err := pdnsClient.DeleteDNSRecordSet(ctx, zone, name, powerdns.RRType(recordType)); err != nil { return fmt.Errorf("could not delete meta DNS recordset in zone %s with name %s and type %s: %w", zone, name, recordType, err) } @@ -77,7 +76,7 @@ func (a *actuator) Delete(ctx context.Context, log logr.Logger, dns *extensionsv // Create PowerDNS client pdnsClient, err := pdns.NewClientFromSecretRef(ctx, a.client, dns.Spec.SecretRef) if err != nil { - return fmt.Errorf("could not create PowerDNS client: %+v", err) + return fmt.Errorf("could not create PowerDNS client: %w", err) } // Determine DNS hosted zone ID @@ -87,7 +86,7 @@ func (a *actuator) Delete(ctx context.Context, log logr.Logger, dns *extensionsv } // Delete DNS recordset - log.Info("Deleting DNS recordset", "zone", zone, "name", dns.Spec.Name, "type", dns.Spec.RecordType, "values", dns.Spec.Values, "dnsrecord", kutil.ObjectName(dns)) + log.Info("Deleting DNS recordset", "zone", zone, "name", dns.Spec.Name, "type", dns.Spec.RecordType, "values", dns.Spec.Values, "dnsrecord", dns.Name) if err := pdnsClient.DeleteDNSRecordSet(ctx, zone, dns.Spec.Name, powerdns.RRType(dns.Spec.RecordType)); err != nil { return fmt.Errorf("could not delete DNS recordset in zone %s with name %s, type %s, and values %v: %w", zone, dns.Spec.Name, dns.Spec.RecordType, dns.Spec.Values, err) } @@ -123,7 +122,7 @@ func (a *actuator) getZone(ctx context.Context, log logr.Logger, dns *extensions if err != nil { return "", fmt.Errorf("could not get DNS hosted zones: %w", err) } - log.Info("Got DNS hosted zones", "zones", zones, "dnsrecord", kutil.ObjectName(dns)) + log.Info("Got DNS hosted zones", "zones", zones, "dnsrecord", dns.Name) zone := dnsrecord.FindZoneForName(zones, dns.Spec.Name) if zone == "" { return "", gardencorev1beta1helper.NewErrorWithCodes(fmt.Errorf("could not find DNS hosted zone for name %s", dns.Spec.Name), gardencorev1beta1.ErrorConfigurationProblem)