From 472b9d06281de0971644cad93b2a55a5327b8175 Mon Sep 17 00:00:00 2001 From: Andreas Fritzler Date: Mon, 19 Aug 2024 10:14:47 +0200 Subject: [PATCH] Bump `gardener` deps to v1.99.1 --- ...nsions.gardener.cloud_infrastructures.yaml | 20 +++ ...gardener.cloud_operatingsystemconfigs.yaml | 33 +--- ...crd-extensions.gardener.cloud_workers.yaml | 33 +++- example/controller-registration.yaml | 7 +- go.mod | 48 +++--- go.sum | 161 ++++++++++++------ pkg/admission/validator/secretbinding.go | 3 +- pkg/admission/validator/shoot.go | 3 +- pkg/controller/controlplane/valuesprovider.go | 3 +- .../worker/machine_controller_manager.go | 4 +- pkg/controller/worker/machines.go | 2 +- pkg/controller/worker/machines_test.go | 5 +- pkg/webhook/controlplane/ensurer.go | 2 +- pkg/webhook/controlplane/ensurer_test.go | 37 ++-- 14 files changed, 223 insertions(+), 138 deletions(-) diff --git a/example/20-crd-extensions.gardener.cloud_infrastructures.yaml b/example/20-crd-extensions.gardener.cloud_infrastructures.yaml index 9a72633f..aaa94c15 100644 --- a/example/20-crd-extensions.gardener.cloud_infrastructures.yaml +++ b/example/20-crd-extensions.gardener.cloud_infrastructures.yaml @@ -207,6 +207,26 @@ spec: - state - type type: object + networking: + description: Networking contains information about cluster networking + such as CIDRs. + properties: + nodes: + description: Nodes are the CIDRs of the node network. + items: + type: string + type: array + pods: + description: Pods are the CIDRs of the pod network. + items: + type: string + type: array + services: + description: Services are the CIDRs of the service network. + items: + type: string + type: array + type: object nodesCIDR: description: |- NodesCIDR is the CIDR of the node network that was optionally created by the acting extension controller. diff --git a/example/20-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml b/example/20-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml index a9f3dd08..44723dff 100644 --- a/example/20-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml +++ b/example/20-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml @@ -157,17 +157,9 @@ spec: description: |- Purpose describes how the result of this OperatingSystemConfig is used by Gardener. Either it gets sent to the `Worker` extension controller to bootstrap a VM, or it is downloaded by the - cloud-config-downloader script already running on a bootstrapped VM. + gardener-node-agent already running on a bootstrapped VM. This field is immutable. type: string - reloadConfigFilePath: - description: |- - ReloadConfigFilePath is the path to the generated operating system configuration. If set, controllers - are asked to use it when determining the .status.command of this resource. For example, if for CoreOS - the reload-path might be "/var/lib/config"; then the controller shall set .status.command to - "/usr/bin/coreos-cloudinit --from-file=/var/lib/config". - TODO(rfranzke): Deprecate this field once UseGardenerNodeAgent feature gate is promoted to GA. - type: string type: description: Type contains the instance of the resource's kind. type: string @@ -249,13 +241,6 @@ spec: required: - secretRef type: object - command: - description: |- - Command is the command whose execution renews/reloads the cloud config on an existing VM, e.g. - "/usr/bin/reload-cloud-config -from-file=". The is optionally provided by Gardener - in the .spec.reloadConfigFilePath field. - TODO(rfranzke): Deprecate this field once UseGardenerNodeAgent feature gate is promoted to GA. - type: string conditions: description: Conditions represents the latest available observations of a Seed's current state. @@ -426,14 +411,6 @@ spec: - name type: object type: array - files: - description: |- - Files is a list of file paths that are part of the generated Cloud Config and shall be - written to the host's file system. - TODO(rfranzke): Deprecate this field once UseGardenerNodeAgent feature gate is promoted to GA. - items: - type: string - type: array lastError: description: LastError holds information about the last occurred error during an operation. @@ -537,14 +514,6 @@ spec: what ever data it needs. type: object x-kubernetes-preserve-unknown-fields: true - units: - description: |- - Units is a list of systemd unit names that are part of the generated Cloud Config and shall be - restarted when a new version has been downloaded. - TODO(rfranzke): Deprecate this field once UseGardenerNodeAgent feature gate is promoted to GA. - items: - type: string - type: array type: object required: - spec diff --git a/example/20-crd-extensions.gardener.cloud_workers.yaml b/example/20-crd-extensions.gardener.cloud_workers.yaml index dd0f1e1c..fd6f7158 100644 --- a/example/20-crd-extensions.gardener.cloud_workers.yaml +++ b/example/20-crd-extensions.gardener.cloud_workers.yaml @@ -220,6 +220,11 @@ spec: name: description: Name is the name of this worker pool. type: string + nodeAgentSecretName: + description: |- + NodeAgentSecretName is uniquely identifying selected aspects of the OperatingSystemConfig. If it changes, then the + worker pool must be rolled. + type: string nodeTemplate: description: NodeTemplate contains resource information of the machine which is used by Cluster Autoscaler to generate nodeTemplate @@ -279,8 +284,35 @@ spec: description: |- UserData is a base64-encoded string that contains the data that is sent to the provider's APIs when a new machine/VM that is part of this worker pool shall be spawned. + Either this or UserDataSecretRef must be provided. + Deprecated: This field will be removed in future release. + TODO(rfranzke): Remove this field after v1.100 has been released. format: byte type: string + userDataSecretRef: + description: |- + UserDataSecretRef references a Secret and a data key containing the data that is sent to the provider's APIs when + a new machine/VM that is part of this worker pool shall be spawned. + Either this or UserData must be provided. + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid? + type: string + optional: + description: Specify whether the Secret or its key must + be defined + type: boolean + required: + - key + type: object + x-kubernetes-map-type: atomic volume: description: Volume contains information about the root disks that should be used for this worker pool. @@ -314,7 +346,6 @@ spec: - maximum - minimum - name - - userData type: object type: array providerConfig: diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index cb67d0a6..ab0dce13 100644 --- a/example/controller-registration.yaml +++ b/example/controller-registration.yaml @@ -1,11 +1,10 @@ --- -apiVersion: core.gardener.cloud/v1beta1 +apiVersion: core.gardener.cloud/v1 kind: ControllerDeployment metadata: name: provider-ironcore -type: helm -providerConfig: - chart: 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 +helm: + rawChart: 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 values: image: tag: v0.3.3 diff --git a/go.mod b/go.mod index eb3bdb2b..0e0aac23 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/coreos/butane v0.21.0 github.com/coreos/go-systemd/v22 v22.5.0 github.com/gardener/etcd-druid v0.22.4 - github.com/gardener/gardener v1.90.4 + github.com/gardener/gardener v1.99.1 github.com/gardener/machine-controller-manager v0.53.1 github.com/go-logr/logr v1.4.2 github.com/imdario/mergo v0.3.16 @@ -24,16 +24,16 @@ require ( go.uber.org/mock v0.4.0 go.uber.org/zap v1.27.0 golang.org/x/tools v0.23.0 - k8s.io/api v0.29.4 - k8s.io/apiextensions-apiserver v0.29.3 - k8s.io/apimachinery v0.29.4 + k8s.io/api v0.29.6 + k8s.io/apiextensions-apiserver v0.29.6 + k8s.io/apimachinery v0.29.6 k8s.io/autoscaler/vertical-pod-autoscaler v1.1.2 - k8s.io/client-go v0.29.4 - k8s.io/code-generator v0.29.4 - k8s.io/component-base v0.29.4 - k8s.io/kubelet v0.29.3 - k8s.io/utils v0.0.0-20240310230437-4693a0247e57 - sigs.k8s.io/controller-runtime v0.17.3 + k8s.io/client-go v0.29.6 + k8s.io/code-generator v0.29.6 + k8s.io/component-base v0.29.6 + k8s.io/kubelet v0.29.6 + k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 + sigs.k8s.io/controller-runtime v0.17.5 sigs.k8s.io/controller-tools v0.14.0 sigs.k8s.io/yaml v1.4.0 ) @@ -43,6 +43,7 @@ require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/sprig/v3 v3.2.3 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect @@ -57,14 +58,15 @@ require ( github.com/evanphx/json-patch v5.7.0+incompatible // 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.7.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.15.0 // indirect github.com/gardener/hvpa-controller/api v0.15.0 // indirect github.com/go-logr/zapr v1.3.0 // indirect github.com/go-openapi/errors v0.20.4 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonpointer v0.20.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.3 // indirect + github.com/go-openapi/swag v0.22.4 // 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 @@ -99,9 +101,9 @@ require ( github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.72.0 // 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.5.0 // indirect + github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect @@ -116,32 +118,30 @@ require ( go.uber.org/multierr v1.11.0 // indirect go4.org/netipx v0.0.0-20220812043211-3cc044ffd68d // indirect golang.org/x/crypto v0.25.0 // indirect - golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect golang.org/x/mod v0.19.0 // indirect golang.org/x/net v0.27.0 // indirect - golang.org/x/oauth2 v0.18.0 // indirect + golang.org/x/oauth2 v0.20.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/term v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/protobuf v1.34.1 // 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.3 // indirect - istio.io/api v1.19.8 // indirect - istio.io/client-go v1.19.8 // indirect - k8s.io/apiserver v0.29.4 // indirect + helm.sh/helm/v3 v3.14.4 // indirect + istio.io/api v1.22.2 // indirect + istio.io/client-go v1.22.0 // 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.6 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/metrics v0.29.3 // indirect + k8s.io/metrics v0.29.6 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) diff --git a/go.sum b/go.sum index 0d2a84ac..899bfe05 100644 --- a/go.sum +++ b/go.sum @@ -38,20 +38,32 @@ github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuN github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= +github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= 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/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18= +github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= 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/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY= +github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/aws/aws-sdk-go v1.55.3 h1:0B5hOX+mIx7I5XPOrjrHlKSDQV/+ypFZpIHOx5LOk3E= github.com/aws/aws-sdk-go v1.55.3/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= +github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -98,18 +110,22 @@ 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.7.0 h1:gamNJaXIxwxLMZllLyY0vBPT8fQAkIe9vXLXfIblux0= -github.com/fluent/fluent-operator/v2 v2.7.0/go.mod h1:wmk2MUA7GUGRiz5ZHeOcDXAruVpKtTwh/G0K0df8cro= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +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= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= 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.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.4 h1:pd9G17EkMiR3xDR5jIhSfxElicn3SIavQTw1kq1bxNI= github.com/gardener/etcd-druid v0.22.4/go.mod h1:FROhfVKyWBo4krlPe3R6FIhJRmOmijEWBdEeUP0CJjE= -github.com/gardener/gardener v1.90.4 h1:BpNE4J1kIjRhRw+xPDKyWvhYfqkJC6wTWll10hcisbQ= -github.com/gardener/gardener v1.90.4/go.mod h1:2oopZmb8fQbXXeypRpiY2Nj0kVcobxsMYUn7HOupX84= +github.com/gardener/gardener v1.99.1 h1:c/wVXYgt4j7eHCMwxpQPPpaLXt1BY/IPYStfCtNsR8Q= +github.com/gardener/gardener v1.99.1/go.mod h1:XboPwJptOg9ZfXTjuohGk7X8kxnF0o88gJnz6Ed7Vqc= 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.1 h1:4P9qtzoD+989Lhc8XaI6Zo3X2TaQVXgHHrbEpuhJcrI= @@ -120,6 +136,8 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= 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/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= 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.20.4 h1:unTcVm6PispJsMECE3zWgvG4xTiKda1LIR5rCRWLG6M= @@ -127,8 +145,9 @@ github.com/go-openapi/errors v0.20.4/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuA github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ= +github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= @@ -139,8 +158,9 @@ github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= +github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= 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= @@ -170,19 +190,18 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/cel-go v0.17.7 h1:6ebJFzu1xO2n7TLtN+UBqShGBhlD85bhvglh5DpcfqQ= +github.com/google/cel-go v0.17.7/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -207,6 +226,11 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -314,13 +338,13 @@ 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.72.0 h1:9h7PxMhT1S8lOdadEKJnBh3ELMdO60XkoDV98grYjuM= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.72.0/go.mod h1:4FiLCL664L4dNGeqZewiiD0NS7hhqi/CxyM4UOq5dfM= +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= -github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= -github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= +github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= @@ -347,6 +371,8 @@ github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzu github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA= github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -373,9 +399,34 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 h1:1JFLBqwIgdyHN1ZtgjTBwO+blA6gVOmZurpiMEsETKo= +go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c= +go.etcd.io/etcd/api/v3 v3.5.12/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= +go.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A= +go.etcd.io/etcd/client/pkg/v3 v3.5.12/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= +go.etcd.io/etcd/client/v3 v3.5.12 h1:v5lCPXn1pf1Uu3M4laUE2hp/geOTc5uPcYYsNe1lDxg= +go.etcd.io/etcd/client/v3 v3.5.12/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0= +go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= +go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= @@ -402,8 +453,8 @@ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL 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-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/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= @@ -451,8 +502,8 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr 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.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= -golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= +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= @@ -498,7 +549,6 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 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.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= @@ -552,8 +602,6 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -564,14 +612,19 @@ 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-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= 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/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= 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= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -581,8 +634,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -595,6 +646,8 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -606,37 +659,37 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -helm.sh/helm/v3 v3.14.3 h1:HmvRJlwyyt9HjgmAuxHbHv3PhMz9ir/XNWHyXfmnOP4= -helm.sh/helm/v3 v3.14.3/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= +helm.sh/helm/v3 v3.14.4 h1:6FSpEfqyDalHq3kUr4gOMThhgY55kXUEjdQoyODYnrM= +helm.sh/helm/v3 v3.14.4/go.mod h1:Tje7LL4gprZpuBNTbG34d1Xn5NmRT3OWfBRwpOSer9I= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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.19.8 h1:oe0Ccz8L/sMYBubTu4eoQgNFXpbzTzQ9M97+G3mHWDw= -istio.io/api v1.19.8/go.mod h1:KstZe4bKbXouALUJ5PqpjNEhu5nj90HrDFitZfpNhlU= -istio.io/client-go v1.19.8 h1:HluyTLIuL8oEm0ySTo4IZGEEMvZw413gYH9zI0Jzcj8= -istio.io/client-go v1.19.8/go.mod h1:wpLEk59sC4l97oqEXbj6pMcTJc/MiyTViusixPPITG4= +istio.io/api v1.22.2 h1:b02rTNfbnsEK2HMH/kfuXHTzovSmqcL5cAj2TSklPcQ= +istio.io/api v1.22.2/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.4 h1:WEnF/XdxuCxdG3ayHNRR8yH3cI1B/llkWBma6bq4R3w= -k8s.io/api v0.29.4/go.mod h1:DetSv0t4FBTcEpfA84NJV3g9a7+rSzlUHk5ADAYHUv0= -k8s.io/apiextensions-apiserver v0.29.3 h1:9HF+EtZaVpFjStakF4yVufnXGPRppWFEQ87qnO91YeI= -k8s.io/apiextensions-apiserver v0.29.3/go.mod h1:po0XiY5scnpJfFizNGo6puNU6Fq6D70UJY2Cb2KwAVc= +k8s.io/api v0.29.6 h1:eDxIl8+PeEpwbe2YyS5RXJ9vdn4hnKWMBf4WUJP9DQM= +k8s.io/api v0.29.6/go.mod h1:ZuUPMhJV74DJXapldbg6upaHfiOjrBb+0ffUbBi1jaw= +k8s.io/apiextensions-apiserver v0.29.6 h1:tUu1N6Zt9GT8KVcPF5aGDqfISz1mveM4yFh7eL5bxmE= +k8s.io/apiextensions-apiserver v0.29.6/go.mod h1:iw1EbwZat08I219qrQKoFMHGo7J9KxPqMpVKxCbNbCs= k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.29.4 h1:RaFdJiDmuKs/8cm1M6Dh1Kvyh59YQFDcFuFTSmXes6Q= -k8s.io/apimachinery v0.29.4/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/apimachinery v0.29.6 h1:CLjJ5b0hWW7531n/njRE3rnusw3rhVGCFftPfnG54CI= +k8s.io/apimachinery v0.29.6/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= +k8s.io/apiserver v0.29.6 h1:JxgDbpgahOgqoDOf+zVl2mI+rQcHcLQnK6YhhtsjbNs= +k8s.io/apiserver v0.29.6/go.mod h1:HrQwfPWxhwEa+n8/+5YwSF5yT2WXbeyFjqq6KEXHTX8= 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.4 h1:79ytIedxVfyXV8rpH3jCBW0u+un0fxHDwX5F9K8dPR8= -k8s.io/client-go v0.29.4/go.mod h1:kC1thZQ4zQWYwldsfI088BbK6RkxK+aF5ebV8y9Q4tk= +k8s.io/client-go v0.29.6 h1:5E2ebuB/p0F0THuQatyvhDvPL2SIeqwTPrtnrwKob/8= +k8s.io/client-go v0.29.6/go.mod h1:jHZcrQqDplyv20v7eu+iFM4gTpglZSZoMVcKrh8sRGg= k8s.io/code-generator v0.19.0/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= -k8s.io/code-generator v0.29.4 h1:8ESudFNbY5/9BzB8KOEFG2uV9Q0AQxkc4mrQESr30Ks= -k8s.io/code-generator v0.29.4/go.mod h1:7TYnI0dYItL2cKuhhgPSuF3WED9uMdELgbVXFfn/joE= -k8s.io/component-base v0.29.4 h1:xeKzuuHI/1tjleu5jycDAcYbhAxeGHCQBZUY2eRIkOo= -k8s.io/component-base v0.29.4/go.mod h1:pYjt+oEZP9gtmwSikwAJgfSBikqKX2gOqRat0QjmQt0= +k8s.io/code-generator v0.29.6 h1:Z8T9VMR0mr7V5GG66c6GVAZrIiEy2uFoQwbeVeWLqPA= +k8s.io/code-generator v0.29.6/go.mod h1:7TYnI0dYItL2cKuhhgPSuF3WED9uMdELgbVXFfn/joE= +k8s.io/component-base v0.29.6 h1:XkVJI67FvBgNb/3kKqvaGKokxUrIR0RrksCPNI+JYCs= +k8s.io/component-base v0.29.6/go.mod h1:kIahZm8aw9lV8Vw17LF89REmeBrv5+QEl3v7HsrmITY= 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= @@ -649,21 +702,25 @@ 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/kms v0.29.6 h1:Aa+4zZDqUaFacjNGzCHIC0ilqnEhA1qHqvyn9igirPQ= +k8s.io/kms v0.29.6/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk= +k8s.io/kube-aggregator v0.29.6 h1:jZJjYF58F6kVuGC/kqLfuu7qGHqc2hoVKsDnRj26QRs= +k8s.io/kube-aggregator v0.29.6/go.mod h1:a6z0yORlXVXtGfsVB5PCjh2Soq1S7Wc6fApU6/T2eCE= 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.3 h1:X9h0ZHzc+eUeNTaksbN0ItHyvGhQ7Z0HPjnQD2oHdwU= -k8s.io/kubelet v0.29.3/go.mod h1:jDiGuTkFOUynyBKzOoC1xRSWlgAZ9UPcTYeFyjr6vas= -k8s.io/metrics v0.29.3 h1:nN+eavbMQ7Kuif2tIdTr2/F2ec2E/SIAWSruTZ+Ye6U= -k8s.io/metrics v0.29.3/go.mod h1:kb3tGGC4ZcIDIuvXyUE291RwJ5WmDu0tB4wAVZM6h2I= +k8s.io/kubelet v0.29.6 h1:jXnnBNHK/KNNEJesmlIZmCvlYC3a5/e04BIS9VPM49M= +k8s.io/kubelet v0.29.6/go.mod h1:kGEUqodVM120YTTQLSCTXzZP4XMFDp7qLf7iU3hrRE4= +k8s.io/metrics v0.29.6 h1:kjMGPYxtCi4OO0fUar76y0CiUoeGYDNmUV0LXJIis4Q= +k8s.io/metrics v0.29.6/go.mod h1:vqGzOaYGuNSSAI7GM1+v6L5z8aAUSzui1W0eQB3wVJY= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY= -k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= +k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk= -sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y= +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= sigs.k8s.io/controller-tools v0.14.0 h1:rnNoCC5wSXlrNoBKKzL70LNJKIQKEzT6lloG6/LF73A= sigs.k8s.io/controller-tools v0.14.0/go.mod h1:TV7uOtNNnnR72SpzhStvPkoS/U5ir0nMudrkrC4M9Sc= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/pkg/admission/validator/secretbinding.go b/pkg/admission/validator/secretbinding.go index f327d8ba..d0362ba6 100644 --- a/pkg/admission/validator/secretbinding.go +++ b/pkg/admission/validator/secretbinding.go @@ -9,7 +9,6 @@ import ( extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook" "github.com/gardener/gardener/pkg/apis/core" - kutil "github.com/gardener/gardener/pkg/utils/kubernetes" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "sigs.k8s.io/controller-runtime/pkg/client" @@ -50,7 +49,7 @@ func (sb *secretBinding) Validate(ctx context.Context, newObj, oldObj client.Obj var ( secret = &corev1.Secret{} - secretKey = kutil.Key(secretBinding.SecretRef.Namespace, secretBinding.SecretRef.Name) + secretKey = client.ObjectKey{Namespace: secretBinding.SecretRef.Namespace, Name: secretBinding.SecretRef.Name} ) // Explicitly use the client.Reader to prevent controller-runtime to start Informer for Secrets // under the hood. The latter increases the memory usage of the component. diff --git a/pkg/admission/validator/shoot.go b/pkg/admission/validator/shoot.go index 6fda0fe2..2b5b7dfb 100644 --- a/pkg/admission/validator/shoot.go +++ b/pkg/admission/validator/shoot.go @@ -11,7 +11,6 @@ import ( extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook" "github.com/gardener/gardener/pkg/apis/core" gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1" - kutil "github.com/gardener/gardener/pkg/utils/kubernetes" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/util/validation/field" @@ -144,7 +143,7 @@ func newValidationContext(ctx context.Context, decoder runtime.Decoder, c client } cloudProfile := &gardencorev1beta1.CloudProfile{} - if err := c.Get(ctx, kutil.Key(shoot.Spec.CloudProfileName), cloudProfile); err != nil { + if err := c.Get(ctx, client.ObjectKey{Name: shoot.Spec.CloudProfileName}, cloudProfile); err != nil { return nil, err } diff --git a/pkg/controller/controlplane/valuesprovider.go b/pkg/controller/controlplane/valuesprovider.go index 7e47df5b..3eb5e83c 100644 --- a/pkg/controller/controlplane/valuesprovider.go +++ b/pkg/controller/controlplane/valuesprovider.go @@ -7,6 +7,7 @@ import ( "context" "fmt" "path/filepath" + "strings" extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller" "github.com/gardener/gardener/extensions/pkg/controller/controlplane/genericactuator" @@ -384,7 +385,7 @@ func getCCMChartValues( "enabled": true, "replicas": extensionscontroller.GetControlPlaneReplicas(cluster, scaledDown, 1), "clusterName": cp.Namespace, - "podNetwork": extensionscontroller.GetPodNetwork(cluster), + "podNetwork": strings.Join(extensionscontroller.GetPodNetwork(cluster), ","), "podAnnotations": map[string]interface{}{ "checksum/secret-" + internal.CloudProviderConfigMapName: checksums[internal.CloudProviderConfigMapName], }, diff --git a/pkg/controller/worker/machine_controller_manager.go b/pkg/controller/worker/machine_controller_manager.go index 46b658ba..1419bbb5 100644 --- a/pkg/controller/worker/machine_controller_manager.go +++ b/pkg/controller/worker/machine_controller_manager.go @@ -7,15 +7,15 @@ import ( "context" v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants" - kutil "github.com/gardener/gardener/pkg/utils/kubernetes" corev1 "k8s.io/api/core/v1" + "sigs.k8s.io/controller-runtime/pkg/client" "github.com/ironcore-dev/gardener-extension-provider-ironcore/pkg/ironcore" ) func (w *workerDelegate) GetMachineControllerManagerChartValues(ctx context.Context) (map[string]interface{}, error) { namespace := &corev1.Namespace{} - if err := w.client.Get(ctx, kutil.Key(w.worker.Namespace), namespace); err != nil { + if err := w.client.Get(ctx, client.ObjectKey{Name: w.worker.Namespace}, namespace); err != nil { return nil, err } diff --git a/pkg/controller/worker/machines.go b/pkg/controller/worker/machines.go index 954fdc01..139bec24 100644 --- a/pkg/controller/worker/machines.go +++ b/pkg/controller/worker/machines.go @@ -190,5 +190,5 @@ func (w *workerDelegate) generateMachineClassAndSecrets() ([]*machinecontrollerv func (w *workerDelegate) generateHashForWorkerPool(pool v1alpha1.WorkerPool) (string, error) { // Generate the worker pool hash. - return worker.WorkerPoolHash(pool, w.cluster) + return worker.WorkerPoolHash(pool, w.cluster, nil, nil) } diff --git a/pkg/controller/worker/machines_test.go b/pkg/controller/worker/machines_test.go index b142737f..6fe9835e 100644 --- a/pkg/controller/worker/machines_test.go +++ b/pkg/controller/worker/machines_test.go @@ -53,7 +53,8 @@ var _ = Describe("Machines", func() { err = workerDelegate.DeployMachineClasses(ctx) Expect(err).NotTo(HaveOccurred()) - workerPoolHash, err := worker.WorkerPoolHash(pool, testCluster) + // TODO: Fix machine pool hashing + workerPoolHash, err := worker.WorkerPoolHash(pool, testCluster, nil, nil) Expect(err).NotTo(HaveOccurred()) By("ensuring that the machine class for each pool has been deployed") @@ -119,7 +120,7 @@ var _ = Describe("Machines", func() { It("should generate the machine deployments", func(ctx SpecContext) { By("creating a worker delegate") - workerPoolHash, err := worker.WorkerPoolHash(pool, testCluster) + workerPoolHash, err := worker.WorkerPoolHash(pool, testCluster, nil, nil) Expect(err).NotTo(HaveOccurred()) var ( deploymentName1 = fmt.Sprintf("%s-%s-z%d", w.Namespace, pool.Name, 1) diff --git a/pkg/webhook/controlplane/ensurer.go b/pkg/webhook/controlplane/ensurer.go index 62f93a65..9fffa501 100644 --- a/pkg/webhook/controlplane/ensurer.go +++ b/pkg/webhook/controlplane/ensurer.go @@ -134,7 +134,7 @@ func (e *ensurer) EnsureClusterAutoscalerDeployment(_ context.Context, _ extensi } func ensureMCMCommandLineArgs(c *corev1.Container) { - c.Command = extensionswebhook.EnsureStringWithPrefix(c.Command, "--ironcore-kubeconfig=", "/etc/ironcore/kubeconfig") + c.Args = extensionswebhook.EnsureStringWithPrefix(c.Args, "--ironcore-kubeconfig=", "/etc/ironcore/kubeconfig") } func ensureKubeAPIServerCommandLineArgs(c *corev1.Container) { diff --git a/pkg/webhook/controlplane/ensurer_test.go b/pkg/webhook/controlplane/ensurer_test.go index 3d6c3e48..1fa0786f 100644 --- a/pkg/webhook/controlplane/ensurer_test.go +++ b/pkg/webhook/controlplane/ensurer_test.go @@ -5,6 +5,7 @@ package controlplane import ( "context" + "strconv" "testing" "github.com/Masterminds/semver/v3" @@ -15,6 +16,7 @@ import ( "github.com/gardener/gardener/extensions/pkg/webhook/controlplane/genericmutator" gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1" v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants" + gardenerutils "github.com/gardener/gardener/pkg/utils/gardener" imagevectorutils "github.com/gardener/gardener/pkg/utils/imagevector" testutils "github.com/gardener/gardener/pkg/utils/test" . "github.com/onsi/ginkgo/v2" @@ -29,7 +31,11 @@ import ( "k8s.io/utils/ptr" ) -const namespace = "test" +const ( + namespace = "foo" + portProviderMetrics = 10259 + portNameProviderMetrics = "providermetrics" +) func TestController(t *testing.T) { RegisterFailHandler(Fail) @@ -249,8 +255,7 @@ var _ = Describe("Ensurer", func() { Name: "machine-controller-manager-provider-ironcore", Image: "foo:bar", ImagePullPolicy: corev1.PullIfNotPresent, - Command: []string{ - "./machine-controller", + Args: []string{ "--control-kubeconfig=inClusterConfig", "--machine-creation-timeout=20m", "--machine-drain-timeout=2h", @@ -258,9 +263,9 @@ var _ = Describe("Ensurer", func() { "--machine-safety-apiserver-statuscheck-timeout=30s", "--machine-safety-apiserver-statuscheck-period=1m", "--machine-safety-orphan-vms-period=30m", - "--namespace=" + deployment.Namespace, - "--port=10259", - "--target-kubeconfig=/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig/kubeconfig", + "--namespace=" + namespace, + "--port=" + strconv.Itoa(portProviderMetrics), + "--target-kubeconfig=" + gardenerutils.PathGenericKubeconfig, "--v=3", "--ironcore-kubeconfig=/etc/ironcore/kubeconfig", }, @@ -268,8 +273,8 @@ var _ = Describe("Ensurer", func() { ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/healthz", - Port: intstr.FromInt(10259), - Scheme: "HTTP", + Port: intstr.FromInt32(portProviderMetrics), + Scheme: corev1.URISchemeHTTP, }, }, InitialDelaySeconds: 30, @@ -278,12 +283,16 @@ var _ = Describe("Ensurer", func() { SuccessThreshold: 1, FailureThreshold: 3, }, - VolumeMounts: []corev1.VolumeMount{ - { - Name: "kubeconfig", - MountPath: "/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig", - ReadOnly: true, - }, + Ports: []corev1.ContainerPort{{ + Name: portNameProviderMetrics, + ContainerPort: portProviderMetrics, + Protocol: corev1.ProtocolTCP, + }}, + VolumeMounts: []corev1.VolumeMount{{ + Name: "kubeconfig", + MountPath: gardenerutils.VolumeMountPathGenericKubeconfig, + ReadOnly: true, + }, { Name: "cloudprovider", MountPath: "/etc/ironcore",