From cb62673d67d17051e0d334e7b368cced28191415 Mon Sep 17 00:00:00 2001 From: Duciwuci Date: Wed, 24 Jul 2024 17:16:58 +0200 Subject: [PATCH] Upgrade Gardener to v1.98 and adapt new WorkerPoolHash function --- ...gardener.cloud_operatingsystemconfigs.yaml | 35 ---- ...crd-extensions.gardener.cloud_workers.yaml | 5 + example/controller-registration.yaml | 7 +- go.mod | 71 ++++---- go.sum | 151 +++++++++--------- pkg/controller/worker/machine_dependencies.go | 5 +- pkg/controller/worker/machines.go | 3 +- pkg/controller/worker/machines_test.go | 6 +- pkg/equinixmetal/secret_test.go | 5 +- 9 files changed, 132 insertions(+), 156 deletions(-) diff --git a/example/20-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml b/example/20-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml index 1a5543b9..44723dff 100644 --- a/example/20-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml +++ b/example/20-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml @@ -160,15 +160,6 @@ spec: 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". - Deprecated: This field is deprecated and has no further usage. - TODO(rfranzke): Remove this field after v1.95 got released. - type: string type: description: Type contains the instance of the resource's kind. type: string @@ -250,14 +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. - Deprecated: This field is deprecated and has no further usage. - TODO(rfranzke): Remove this field after v1.95 got released. - type: string conditions: description: Conditions represents the latest available observations of a Seed's current state. @@ -428,15 +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. - Deprecated: This field is deprecated and has no further usage. - TODO(rfranzke): Remove this field after v1.95 got released. - items: - type: string - type: array lastError: description: LastError holds information about the last occurred error during an operation. @@ -540,15 +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. - Deprecated: This field is deprecated and has no further usage. - TODO(rfranzke): Remove this field after v1.95 got released. - 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 097e6a68..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 diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index 790e453a..fac82120 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-equinix-metal -type: helm -providerConfig: - chart: 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 +helm: + rawChart: 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 values: image: tag: v2.11.0-dev diff --git a/go.mod b/go.mod index 8825a244..063af20d 100644 --- a/go.mod +++ b/go.mod @@ -8,26 +8,26 @@ require ( github.com/ahmetb/gen-crd-api-reference-docs v0.3.0 github.com/coreos/go-systemd/v22 v22.5.0 github.com/gardener/etcd-druid v0.22.0 - github.com/gardener/gardener v1.95.1 + github.com/gardener/gardener v1.98.4 github.com/gardener/machine-controller-manager v0.53.0 github.com/go-logr/logr v1.4.1 - github.com/onsi/ginkgo/v2 v2.17.1 - github.com/onsi/gomega v1.33.0 + github.com/onsi/ginkgo/v2 v2.19.0 + github.com/onsi/gomega v1.33.1 github.com/packethost/packngo v0.16.1-0.20210713122321-c19a3d83e65d github.com/pkg/errors v0.9.1 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 - github.com/spf13/cobra v1.8.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 go.uber.org/mock v0.4.0 - golang.org/x/tools v0.21.0 - k8s.io/api v0.29.4 - k8s.io/apiextensions-apiserver v0.29.4 - k8s.io/apimachinery v0.29.4 - k8s.io/autoscaler/vertical-pod-autoscaler v1.1.1 - 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.4 + golang.org/x/tools v0.22.0 + 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.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 @@ -39,6 +39,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 @@ -49,14 +50,14 @@ require ( github.com/fatih/color v1.16.0 // indirect github.com/fluent/fluent-operator/v2 v2.8.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/gardener/cert-management v0.14.2 // 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.20.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.4 // 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 @@ -65,8 +66,8 @@ 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-20210720184732-4bb14d4b1be1 // indirect - github.com/google/uuid v1.4.0 // 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 github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -92,7 +93,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.45.0 // indirect @@ -104,40 +105,42 @@ require ( github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect - github.com/spf13/viper v1.18.2 // indirect + github.com/spf13/viper v1.19.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.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/crypto v0.24.0 // indirect + golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + golang.org/x/mod v0.18.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/oauth2 v0.20.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/sys v0.21.0 // indirect + golang.org/x/term v0.21.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/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/ini.v1 v1.67.0 // 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 + istio.io/api v1.22.1 // indirect + istio.io/client-go v1.22.0 // indirect + k8s.io/apiserver v0.29.6 // indirect + k8s.io/cluster-bootstrap v0.29.6 // indirect + k8s.io/component-helpers v0.29.6 // 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.4 // indirect + k8s.io/metrics v0.29.6 // indirect sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231015215740-bf15e44028f9 // 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 22c78322..89c66be6 100644 --- a/go.sum +++ b/go.sum @@ -44,6 +44,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= @@ -59,7 +61,7 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -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/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= @@ -94,12 +96,12 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo 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.14.2 h1:dlrPblsUIIjMaDPfZyYXvO3OKDkAlHSjbdZO1c6HASQ= -github.com/gardener/cert-management v0.14.2/go.mod h1:dfhuPXJn+yy9OoSSxY/HAMiwzD2IOqoM+UMx16QTkvI= +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.0 h1:DVe+Zjrb93r9vI1uUiCTMHBffIUoMAKhNzFZNC6hsQ8= github.com/gardener/etcd-druid v0.22.0/go.mod h1:FROhfVKyWBo4krlPe3R6FIhJRmOmijEWBdEeUP0CJjE= -github.com/gardener/gardener v1.95.1 h1:vPZhov+6fyPMQG+nc8seHrTSLGgTpwYZzj3JAJbmtY0= -github.com/gardener/gardener v1.95.1/go.mod h1:dPyPIfT8n77FopQO/z1CXplkBGV5oN4LAQDhr5obOVI= +github.com/gardener/gardener v1.98.4 h1:GG4iOEPsV2nWBQ4w/c6fpqYfTkLmBpaTk2GHAA0qiyI= +github.com/gardener/gardener v1.98.4/go.mod h1:EfvKbBF53a52Wz16/Qe8hhpTZTaJ/P+CRWRr35BVVq0= 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= @@ -133,8 +135,8 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh 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 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= @@ -183,12 +185,12 @@ 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-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +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.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= @@ -210,7 +212,6 @@ github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= @@ -289,16 +290,16 @@ 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/packethost/packngo v0.16.1-0.20210713122321-c19a3d83e65d h1:tpfZ3Au3AuhwNZRXIvysXdFRAN6UpwGU0t7UpEy5KlA= github.com/packethost/packngo v0.16.1-0.20210713122321-c19a3d83e65d/go.mod h1:YrtUNN9IRjjqN6zK+cy2IYoi3EjHfoWTWxJkI1I1Vk0= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= 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= @@ -306,8 +307,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= @@ -339,17 +340,18 @@ 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= -github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= -github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= +github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= +github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= 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= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -358,8 +360,9 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ 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= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -393,15 +396,15 @@ golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a/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.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= 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-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= +golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= 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= @@ -419,8 +422,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.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= 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= @@ -442,15 +445,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.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= 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= @@ -484,21 +487,21 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/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.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.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.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= 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.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= 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= @@ -531,8 +534,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.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= 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= @@ -559,10 +562,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= @@ -610,30 +611,34 @@ 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.1 h1:dzjmBYq6PEWAF7Kn7Dy5mI+RbJd49I41DEZLjYKfdZM= +istio.io/api v1.22.1/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.4 h1:M7hbuHU/ckbibR7yPbe6DyNWgTFKNmZDbdZKD8q1Smk= -k8s.io/apiextensions-apiserver v0.29.4/go.mod h1:TTDC9fB+0kHY2rogf5hgBR03KBKCwED+GHUsXGpR7SM= +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/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.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/cluster-bootstrap v0.29.6 h1:rWSQITJkO9QupnKHuArqkKM3IRzx8p3z+54vvedfjlU= +k8s.io/cluster-bootstrap v0.29.6/go.mod h1:bspoLpuak4Jun/6M7YMn0DEl5ZRSBui9DpyXJohlTOo= 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/component-helpers v0.29.6 h1:kG/tK0gXPXj6n3Oxn5Eul8nYzer3SejZI3ClwiWkreQ= +k8s.io/component-helpers v0.29.6/go.mod h1:Ltb44cbXci9fy9rytWwYsu8vHfi4fjyQdSwk6UlCR4E= 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= @@ -646,15 +651,15 @@ 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.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.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.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-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/pkg/controller/worker/machine_dependencies.go b/pkg/controller/worker/machine_dependencies.go index 22817823..b5965d28 100644 --- a/pkg/controller/worker/machine_dependencies.go +++ b/pkg/controller/worker/machine_dependencies.go @@ -12,7 +12,6 @@ import ( extensionsconfig "github.com/gardener/gardener/extensions/pkg/apis/config" "github.com/gardener/gardener/extensions/pkg/util" v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants" - kutil "github.com/gardener/gardener/pkg/utils/kubernetes" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -84,12 +83,12 @@ func (w *workerDelegate) PostReconcileHook(ctx context.Context) error { deploy = &appsv1.Deployment{} ) - if err := w.client.Get(ctx, kutil.Key(w.worker.Namespace, v1beta1constants.DeploymentNameVPNSeedServer), deploy); err != nil { + if err := w.client.Get(ctx, client.ObjectKey{Namespace: w.worker.Namespace, Name: v1beta1constants.DeploymentNameVPNSeedServer}, deploy); err != nil { if !apierrors.IsNotFound(err) { return fmt.Errorf("failed to get %s deployment: %v", v1beta1constants.DeploymentNameVPNSeedServer, err) } - if err2 := w.client.Get(ctx, kutil.Key(w.worker.Namespace, v1beta1constants.DeploymentNameKubeAPIServer), deploy); err2 != nil { + if err2 := w.client.Get(ctx, client.ObjectKey{Namespace: w.worker.Namespace, Name: v1beta1constants.DeploymentNameKubeAPIServer}, deploy); err2 != nil { return fmt.Errorf("failed to get %s deployment: %v", v1beta1constants.DeploymentNameKubeAPIServer, err2) } vpnSeedContainerName = "vpn-seed" diff --git a/pkg/controller/worker/machines.go b/pkg/controller/worker/machines.go index 801e133a..be145ded 100644 --- a/pkg/controller/worker/machines.go +++ b/pkg/controller/worker/machines.go @@ -71,7 +71,8 @@ func (w *workerDelegate) generateMachineConfig(ctx context.Context) error { } } - workerPoolHash, err := worker.WorkerPoolHash(pool, w.cluster) + // TODO(duciwuci): add ProviderConfig to V2 + workerPoolHash, err := worker.WorkerPoolHash(pool, w.cluster, nil, nil) if err != nil { return err } diff --git a/pkg/controller/worker/machines_test.go b/pkg/controller/worker/machines_test.go index db90078e..e00432ae 100644 --- a/pkg/controller/worker/machines_test.go +++ b/pkg/controller/worker/machines_test.go @@ -253,8 +253,8 @@ var _ = Describe("Machines", func() { }, } - workerPoolHash1, _ = worker.WorkerPoolHash(w.Spec.Pools[0], cluster) - workerPoolHash2, _ = worker.WorkerPoolHash(w.Spec.Pools[1], cluster) + workerPoolHash1, _ = worker.WorkerPoolHash(w.Spec.Pools[0], cluster, nil, nil) + workerPoolHash2, _ = worker.WorkerPoolHash(w.Spec.Pools[1], cluster, nil, nil) workerDelegate, _ = NewWorkerDelegate(c, scheme, chartApplier, "", w, clusterWithoutImages) }) @@ -389,7 +389,7 @@ var _ = Describe("Machines", func() { ReservedDevicesOnly: &reservedDevicesOnly, })} - newHash, err := worker.WorkerPoolHash(w.Spec.Pools[1], cluster) + newHash, err := worker.WorkerPoolHash(w.Spec.Pools[1], cluster, nil, nil) Expect(err).NotTo(HaveOccurred()) var ( diff --git a/pkg/equinixmetal/secret_test.go b/pkg/equinixmetal/secret_test.go index b46ae47e..6757af8a 100644 --- a/pkg/equinixmetal/secret_test.go +++ b/pkg/equinixmetal/secret_test.go @@ -8,7 +8,6 @@ import ( "context" "errors" - kutil "github.com/gardener/gardener/pkg/utils/kubernetes" mockclient "github.com/gardener/gardener/third_party/mock/controller-runtime/client" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -48,7 +47,7 @@ var _ = Describe("Secret", func() { It("should return an error because secret could not be read", func() { fakeErr := errors.New("error") - c.EXPECT().Get(ctx, kutil.Key(namespace, name), gomock.AssignableToTypeOf(&corev1.Secret{})).Return(fakeErr) + c.EXPECT().Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, gomock.AssignableToTypeOf(&corev1.Secret{})).Return(fakeErr) credentials, err := GetCredentialsFromSecretRef(ctx, c, secretRef) @@ -62,7 +61,7 @@ var _ = Describe("Secret", func() { projectID = []byte("bar") ) - c.EXPECT().Get(ctx, kutil.Key(namespace, name), gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(func(_ context.Context, _ client.ObjectKey, secret *corev1.Secret, _ ...client.GetOption) error { + c.EXPECT().Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn(func(_ context.Context, _ client.ObjectKey, secret *corev1.Secret, _ ...client.GetOption) error { secret.Data = map[string][]byte{ APIToken: apiToken, ProjectID: projectID,