From 4d9165d056b3edade031daa5a9833f4f199d18f5 Mon Sep 17 00:00:00 2001 From: Ellis Tarn Date: Wed, 30 Nov 2022 15:11:06 -0800 Subject: [PATCH] chore: cleaned up a few log lines --- go.mod | 18 ++--- go.sum | 41 +++++------ pkg/cloudprovider/cloudprovider.go | 2 +- pkg/cloudprovider/instancetypes_test.go | 9 +-- pkg/cloudprovider/launchtemplate.go | 2 +- pkg/cloudprovider/launchtemplate_test.go | 85 ++++------------------ pkg/cloudprovider/suite_test.go | 5 +- pkg/context/context.go | 4 +- pkg/controllers/controllers.go | 2 +- pkg/controllers/interruption/controller.go | 2 +- test/go.mod | 18 ++--- test/go.sum | 41 +++++------ 12 files changed, 79 insertions(+), 150 deletions(-) diff --git a/go.mod b/go.mod index 9ba369ba7b07..a3e77a21ce0d 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Pallinder/go-randomdata v1.2.0 github.com/avast/retry-go v3.0.0+incompatible github.com/aws/aws-sdk-go v1.44.135 - github.com/aws/karpenter-core v0.0.2-0.20221125213814-604edd172c9d + github.com/aws/karpenter-core v0.0.2-0.20221201175819-53f644f67509 github.com/go-playground/validator/v10 v10.11.1 github.com/imdario/mergo v0.3.13 github.com/mitchellh/hashstructure/v2 v2.0.2 @@ -18,12 +18,12 @@ require ( github.com/samber/lo v1.34.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 - k8s.io/api v0.25.2 - k8s.io/apiextensions-apiserver v0.25.2 - k8s.io/apimachinery v0.25.2 - k8s.io/client-go v0.25.2 - k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed - knative.dev/pkg v0.0.0-20221031132215-6eb8f1845a9d + k8s.io/api v0.25.4 + k8s.io/apiextensions-apiserver v0.25.4 + k8s.io/apimachinery v0.25.4 + k8s.io/client-go v0.25.4 + k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 + knative.dev/pkg v0.0.0-20221123154742-05b694ec4d3a sigs.k8s.io/controller-runtime v0.13.0 ) @@ -99,8 +99,8 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/component-base v0.25.2 // indirect - k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f // indirect + k8s.io/component-base v0.25.4 // indirect + k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect diff --git a/go.sum b/go.sum index 04db01f8fa4d..386402b5d8ac 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,8 @@ github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHS github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/aws/aws-sdk-go v1.44.135 h1:DJJP/CkEpgafA5p5jlY9VzDRyKrfABVixzIxrK/3tWU= github.com/aws/aws-sdk-go v1.44.135/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/karpenter-core v0.0.2-0.20221125213814-604edd172c9d h1:XcHoB0/BaxKQSmKoJ5GlY0wPAgS2xVX51WjC/b2+uo4= -github.com/aws/karpenter-core v0.0.2-0.20221125213814-604edd172c9d/go.mod h1:P5jLwvZ5aRXr9PuW+8tUyBJq9k6cgN12ZD7X2F3/H+k= +github.com/aws/karpenter-core v0.0.2-0.20221201175819-53f644f67509 h1:EZZRRsxGtsVvaRm1P48RXqkZiMWDwf7vZJ9xhhANCzc= +github.com/aws/karpenter-core v0.0.2-0.20221201175819-53f644f67509/go.mod h1:qWQu8B7Tc2sPDNdIG9JZRl642ofccXtgj89is04Z5U8= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -135,7 +135,6 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= @@ -369,7 +368,6 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= 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/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= @@ -408,7 +406,7 @@ go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/automaxprocs v1.4.0 h1:CpDZl6aOlLhReez+8S3eEotD7Jx0Os++lemPlMULQP0= go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= @@ -869,25 +867,24 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.25.2 h1:v6G8RyFcwf0HR5jQGIAYlvtRNrxMJQG1xJzaSeVnIS8= -k8s.io/api v0.25.2/go.mod h1:qP1Rn4sCVFwx/xIhe+we2cwBLTXNcheRyYXwajonhy0= -k8s.io/apiextensions-apiserver v0.25.2 h1:8uOQX17RE7XL02ngtnh3TgifY7EhekpK+/piwzQNnBo= -k8s.io/apiextensions-apiserver v0.25.2/go.mod h1:iRwwRDlWPfaHhuBfQ0WMa5skdQfrE18QXJaJvIDLvE8= -k8s.io/apimachinery v0.25.2 h1:WbxfAjCx+AeN8Ilp9joWnyJ6xu9OMeS/fsfjK/5zaQs= -k8s.io/apimachinery v0.25.2/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA= -k8s.io/client-go v0.25.2 h1:SUPp9p5CwM0yXGQrwYurw9LWz+YtMwhWd0GqOsSiefo= -k8s.io/client-go v0.25.2/go.mod h1:i7cNU7N+yGQmJkewcRD2+Vuj4iz7b30kI8OcL3horQ4= -k8s.io/component-base v0.25.2 h1:Nve/ZyHLUBHz1rqwkjXm/Re6IniNa5k7KgzxZpTfSQY= -k8s.io/component-base v0.25.2/go.mod h1:90W21YMr+Yjg7MX+DohmZLzjsBtaxQDDwaX4YxDkl60= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f h1:dltw7bAn8bCrQ2CmzzhgoieUZEbWqrvIGVdHGioP5nY= -k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/api v0.25.4 h1:3YO8J4RtmG7elEgaWMb4HgmpS2CfY1QlaOz9nwB+ZSs= +k8s.io/api v0.25.4/go.mod h1:IG2+RzyPQLllQxnhzD8KQNEu4c4YvyDTpSMztf4A0OQ= +k8s.io/apiextensions-apiserver v0.25.4 h1:7hu9pF+xikxQuQZ7/30z/qxIPZc2J1lFElPtr7f+B6U= +k8s.io/apiextensions-apiserver v0.25.4/go.mod h1:bkSGki5YBoZWdn5pWtNIdGvDrrsRWlmnvl9a+tAw5vQ= +k8s.io/apimachinery v0.25.4 h1:CtXsuaitMESSu339tfhVXhQrPET+EiWnIY1rcurKnAc= +k8s.io/apimachinery v0.25.4/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= +k8s.io/client-go v0.25.4 h1:3RNRDffAkNU56M/a7gUfXaEzdhZlYhoW8dgViGy5fn8= +k8s.io/client-go v0.25.4/go.mod h1:8trHCAC83XKY0wsBIpbirZU4NTUpbuhc2JnI7OruGZw= +k8s.io/component-base v0.25.4 h1:n1bjg9Yt+G1C0WnIDJmg2fo6wbEU1UGMRiQSjmj7hNQ= +k8s.io/component-base v0.25.4/go.mod h1:nnZJU8OP13PJEm6/p5V2ztgX2oyteIaAGKGMYb2L2cY= +k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 h1:hWRbsoRWt44OEBnYUd4ceLy4ofBoh+p9vauWp/I5Gdg= +k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/pkg v0.0.0-20221031132215-6eb8f1845a9d h1:BRSonjQw4u63gaWeoE5i2724FF3K7teFf8DcmwjGdAQ= -knative.dev/pkg v0.0.0-20221031132215-6eb8f1845a9d/go.mod h1:j5kO7gKmWGj2DJpefCEiPbItToiYf+2bCtI+A6REkQo= +k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8= +k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +knative.dev/pkg v0.0.0-20221123154742-05b694ec4d3a h1:mTDxXL+zRBMz7BcdM3WOgw9FVbmkIN/3cvEj4MeS8zI= +knative.dev/pkg v0.0.0-20221123154742-05b694ec4d3a/go.mod h1:fckNBPf9bu5/p1RbnOhEauX7r+kfN1zSQupEVtkaYBs= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go index 24f27d648016..7617f0393fa1 100644 --- a/pkg/cloudprovider/cloudprovider.go +++ b/pkg/cloudprovider/cloudprovider.go @@ -74,7 +74,7 @@ func New(ctx awscontext.Context) *CloudProvider { if err != nil { logging.FromContext(ctx).Debugf("unable to detect the IP of the kube-dns service, %s", err) } else { - logging.FromContext(ctx).With("dns-ip", kubeDNSIP).Debugf("discovered DNS IP") + logging.FromContext(ctx).With("kube-dns-ip", kubeDNSIP).Debugf("discovered kube dns") } ec2api := ec2.New(ctx.Session) if err := checkEC2Connectivity(ctx, ec2api); err != nil { diff --git a/pkg/cloudprovider/instancetypes_test.go b/pkg/cloudprovider/instancetypes_test.go index 48c1e82bb904..cc9f2ff43bba 100644 --- a/pkg/cloudprovider/instancetypes_test.go +++ b/pkg/cloudprovider/instancetypes_test.go @@ -27,7 +27,6 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/sets" - corev1 "k8s.io/client-go/kubernetes/typed/core/v1" "knative.dev/pkg/ptr" "github.com/aws/karpenter/pkg/test" @@ -35,7 +34,6 @@ import ( "github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5" coretest "github.com/aws/karpenter-core/pkg/test" - "github.com/aws/karpenter-core/pkg/controllers/provisioning" . "github.com/aws/karpenter-core/pkg/test/expectations" awssettings "github.com/aws/karpenter/pkg/apis/config/settings" @@ -144,13 +142,8 @@ var _ = Describe("Instance Types", func() { } }) It("should fail to launch AWS Pod ENI if the command line option enabling it isn't set", func() { - settingsStore[awssettings.ContextKey] = test.Settings(test.SettingOptions{ - EnablePodENI: lo.ToPtr(false), - }) + settingsStore[awssettings.ContextKey] = test.Settings(test.SettingOptions{EnablePodENI: lo.ToPtr(false)}) ctx = settingsStore.InjectSettings(ctx) - - prov = provisioning.NewProvisioner(ctx, env.Client, corev1.NewForConfigOrDie(env.Config), recorder, cloudProvider, cluster, coretest.SettingsStore{}) - provisioningController = provisioning.NewController(env.Client, prov, recorder) ExpectApplied(ctx, env.Client, provisioner) for _, pod := range ExpectProvisioned(ctx, env.Client, recorder, provisioningController, prov, coretest.UnschedulablePod(coretest.PodOptions{ diff --git a/pkg/cloudprovider/launchtemplate.go b/pkg/cloudprovider/launchtemplate.go index 5538a5558c64..8dbab2ad949e 100644 --- a/pkg/cloudprovider/launchtemplate.go +++ b/pkg/cloudprovider/launchtemplate.go @@ -262,7 +262,7 @@ func (p *LaunchTemplateProvider) Invalidate(ctx context.Context, ltName string, func (p *LaunchTemplateProvider) hydrateCache(ctx context.Context) { clusterName := awssettings.FromContext(ctx).ClusterName ctx = logging.WithLogger(ctx, logging.FromContext(ctx).With("tag-key", karpenterManagedTagKey, "tag-value", clusterName)) - logging.FromContext(ctx).Debugf("hydrating the launch template cache with tags matching") + logging.FromContext(ctx).Debugf("hydrating the launch template cache") if err := p.ec2api.DescribeLaunchTemplatesPagesWithContext(ctx, &ec2.DescribeLaunchTemplatesInput{ Filters: []*ec2.Filter{{Name: aws.String(fmt.Sprintf("tag:%s", karpenterManagedTagKey)), Values: []*string{aws.String(clusterName)}}}, }, func(output *ec2.DescribeLaunchTemplatesOutput, _ bool) bool { diff --git a/pkg/cloudprovider/launchtemplate_test.go b/pkg/cloudprovider/launchtemplate_test.go index 4323f53b7b1b..ad7b3186377e 100644 --- a/pkg/cloudprovider/launchtemplate_test.go +++ b/pkg/cloudprovider/launchtemplate_test.go @@ -15,7 +15,6 @@ limitations under the License. package cloudprovider import ( - "context" "encoding/base64" "errors" "fmt" @@ -36,8 +35,6 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - corev1 "k8s.io/client-go/kubernetes/typed/core/v1" - "knative.dev/pkg/logging" "sigs.k8s.io/controller-runtime/pkg/client" awssettings "github.com/aws/karpenter/pkg/apis/config/settings" @@ -48,7 +45,6 @@ import ( "github.com/aws/karpenter-core/pkg/apis/config/settings" "github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5" "github.com/aws/karpenter-core/pkg/controllers/provisioning" - "github.com/aws/karpenter-core/pkg/operator/injection" coretest "github.com/aws/karpenter-core/pkg/test" . "github.com/aws/karpenter-core/pkg/test/expectations" ) @@ -316,9 +312,6 @@ var _ = Describe("LaunchTemplates", func() { }) ctx = settingsStore.InjectSettings(ctx) - prov = provisioning.NewProvisioner(injection.WithOptions(ctx, opts), env.Client, corev1.NewForConfigOrDie(env.Config), recorder, cloudProvider, cluster, settingsStore) - provisioningController = provisioning.NewController(env.Client, prov, recorder) - ExpectApplied(ctx, env.Client, test.Provisioner(coretest.ProvisionerOptions{Provider: provider})) pod := ExpectProvisioned(ctx, env.Client, recorder, provisioningController, prov, coretest.UnschedulablePod())[0] ExpectScheduled(ctx, env.Client, pod) @@ -352,7 +345,6 @@ var _ = Describe("LaunchTemplates", func() { }) ctx = settingsStore.InjectSettings(ctx) - prov = provisioning.NewProvisioner(ctx, env.Client, corev1.NewForConfigOrDie(env.Config), recorder, cloudProvider, cluster, settingsStore) provisioningController = provisioning.NewController(env.Client, prov, recorder) ExpectApplied(ctx, env.Client, test.Provisioner(coretest.ProvisionerOptions{Provider: provider})) @@ -707,10 +699,8 @@ var _ = Describe("LaunchTemplates", func() { }) Context("User Data", func() { It("should not specify --use-max-pods=false when using ENI-based pod density", func() { - prov = provisioning.NewProvisioner(ctx, env.Client, corev1.NewForConfigOrDie(env.Config), recorder, cloudProvider, cluster, settingsStore) - controllerWithOpts := provisioning.NewController(env.Client, prov, recorder) ExpectApplied(ctx, env.Client, test.Provisioner(coretest.ProvisionerOptions{Provider: provider})) - pod := ExpectProvisioned(ctx, env.Client, recorder, controllerWithOpts, prov, coretest.UnschedulablePod())[0] + pod := ExpectProvisioned(ctx, env.Client, recorder, provisioningController, prov, coretest.UnschedulablePod())[0] ExpectScheduled(ctx, env.Client, pod) Expect(fakeEC2API.CalledWithCreateLaunchTemplateInput.Len()).To(Equal(1)) input := fakeEC2API.CalledWithCreateLaunchTemplateInput.Pop() @@ -718,18 +708,11 @@ var _ = Describe("LaunchTemplates", func() { Expect(string(userData)).NotTo(ContainSubstring("--use-max-pods false")) }) It("should specify --use-max-pods=false when not using ENI-based pod density", func() { - settingsStore = coretest.SettingsStore{ - settings.ContextKey: test.Settings(), - awssettings.ContextKey: test.Settings(test.SettingOptions{ - EnableENILimitedPodDensity: lo.ToPtr(false), - }), - } + settingsStore[awssettings.ContextKey] = test.Settings(test.SettingOptions{EnableENILimitedPodDensity: lo.ToPtr(false)}) ctx = settingsStore.InjectSettings(ctx) - prov = provisioning.NewProvisioner(ctx, env.Client, corev1.NewForConfigOrDie(env.Config), recorder, cloudProvider, cluster, settingsStore) - controllerWithOpts := provisioning.NewController(env.Client, prov, recorder) ExpectApplied(ctx, env.Client, test.Provisioner(coretest.ProvisionerOptions{Provider: provider})) - pod := ExpectProvisioned(ctx, env.Client, recorder, controllerWithOpts, prov, coretest.UnschedulablePod())[0] + pod := ExpectProvisioned(ctx, env.Client, recorder, provisioningController, prov, coretest.UnschedulablePod())[0] ExpectScheduled(ctx, env.Client, pod) Expect(fakeEC2API.CalledWithCreateLaunchTemplateInput.Len()).To(Equal(1)) input := fakeEC2API.CalledWithCreateLaunchTemplateInput.Pop() @@ -1001,17 +984,9 @@ var _ = Describe("LaunchTemplates", func() { }) Context("Bottlerocket", func() { It("should merge in custom user data", func() { - settingsStore = coretest.SettingsStore{ - settings.ContextKey: test.Settings(), - awssettings.ContextKey: test.Settings(test.SettingOptions{ - EnableENILimitedPodDensity: lo.ToPtr(false), - }), - } + settingsStore[awssettings.ContextKey] = test.Settings(test.SettingOptions{EnableENILimitedPodDensity: lo.ToPtr(false)}) ctx = settingsStore.InjectSettings(ctx) - prov = provisioning.NewProvisioner(ctx, env.Client, corev1.NewForConfigOrDie(env.Config), recorder, cloudProvider, cluster, settingsStore) - controllerWithOpts := provisioning.NewController(env.Client, prov, recorder) - provider.AMIFamily = &v1alpha1.AMIFamilyBottlerocket content, _ := os.ReadFile("testdata/br_userdata_input.golden") nodeTemplate := test.AWSNodeTemplate(v1alpha1.AWSNodeTemplateSpec{ @@ -1026,7 +1001,7 @@ var _ = Describe("LaunchTemplates", func() { }) ExpectApplied(ctx, env.Client, newProvisioner) Expect(env.Client.Get(ctx, client.ObjectKeyFromObject(newProvisioner), newProvisioner)).To(Succeed()) - pod := ExpectProvisioned(ctx, env.Client, recorder, controllerWithOpts, prov, coretest.UnschedulablePod(coretest.PodOptions{ + pod := ExpectProvisioned(ctx, env.Client, recorder, provisioningController, prov, coretest.UnschedulablePod(coretest.PodOptions{ Tolerations: []v1.Toleration{{Operator: v1.TolerationOpExists}}, }))[0] ExpectScheduled(ctx, env.Client, pod) @@ -1037,22 +1012,12 @@ var _ = Describe("LaunchTemplates", func() { // Newlines are always added for missing TOML fields, so strip them out before comparisons. actualUserData := strings.Replace(string(userData), "\n", "", -1) expectedUserData := strings.Replace(fmt.Sprintf(string(content), newProvisioner.Name), "\n", "", -1) - logging.FromContext(context.Background()).Info(expectedUserData) - logging.FromContext(context.Background()).Info(actualUserData) Expect(expectedUserData).To(Equal(actualUserData)) }) It("should bootstrap when custom user data is empty", func() { - settingsStore = coretest.SettingsStore{ - settings.ContextKey: test.Settings(), - awssettings.ContextKey: test.Settings(test.SettingOptions{ - EnableENILimitedPodDensity: lo.ToPtr(false), - }), - } + settingsStore[awssettings.ContextKey] = test.Settings(test.SettingOptions{EnableENILimitedPodDensity: lo.ToPtr(false)}) ctx = settingsStore.InjectSettings(ctx) - prov = provisioning.NewProvisioner(ctx, env.Client, corev1.NewForConfigOrDie(env.Config), recorder, cloudProvider, cluster, settingsStore) - controllerWithOpts := provisioning.NewController(env.Client, prov, recorder) - provider.AMIFamily = &v1alpha1.AMIFamilyBottlerocket nodeTemplate := test.AWSNodeTemplate(v1alpha1.AWSNodeTemplateSpec{ UserData: nil, @@ -1066,7 +1031,7 @@ var _ = Describe("LaunchTemplates", func() { }) ExpectApplied(ctx, env.Client, newProvisioner) Expect(env.Client.Get(ctx, client.ObjectKeyFromObject(newProvisioner), newProvisioner)).To(Succeed()) - pod := ExpectProvisioned(ctx, env.Client, recorder, controllerWithOpts, prov, coretest.UnschedulablePod(coretest.PodOptions{ + pod := ExpectProvisioned(ctx, env.Client, recorder, provisioningController, prov, coretest.UnschedulablePod(coretest.PodOptions{ Tolerations: []v1.Toleration{{Operator: v1.TolerationOpExists}}, }))[0] ExpectScheduled(ctx, env.Client, pod) @@ -1079,21 +1044,13 @@ var _ = Describe("LaunchTemplates", func() { Expect(expectedUserData).To(Equal(actualUserData)) }) It("should not bootstrap when provider ref points to a non-existent resource", func() { - settingsStore = coretest.SettingsStore{ - settings.ContextKey: test.Settings(), - awssettings.ContextKey: test.Settings(test.SettingOptions{ - EnableENILimitedPodDensity: lo.ToPtr(false), - }), - } + settingsStore[awssettings.ContextKey] = test.Settings(test.SettingOptions{EnableENILimitedPodDensity: lo.ToPtr(false)}) ctx = settingsStore.InjectSettings(ctx) - prov = provisioning.NewProvisioner(ctx, env.Client, corev1.NewForConfigOrDie(env.Config), recorder, cloudProvider, cluster, settingsStore) - controllerWithOpts := provisioning.NewController(env.Client, prov, recorder) - provider.AMIFamily = &v1alpha1.AMIFamilyBottlerocket newProvisioner := test.Provisioner(coretest.ProvisionerOptions{ProviderRef: &v1alpha5.ProviderRef{Name: "doesnotexist"}}) ExpectApplied(ctx, env.Client, newProvisioner) - pod := ExpectProvisioned(ctx, env.Client, recorder, controllerWithOpts, prov, coretest.UnschedulablePod())[0] + pod := ExpectProvisioned(ctx, env.Client, recorder, provisioningController, prov, coretest.UnschedulablePod())[0] // This will not be scheduled since we were pointed to a non-existent awsnodetemplate resource. ExpectNotScheduled(ctx, env.Client, pod) }) @@ -1223,17 +1180,9 @@ var _ = Describe("LaunchTemplates", func() { }) Context("AL2 Custom UserData", func() { It("should merge in custom user data", func() { - settingsStore = coretest.SettingsStore{ - settings.ContextKey: test.Settings(), - awssettings.ContextKey: test.Settings(test.SettingOptions{ - EnableENILimitedPodDensity: lo.ToPtr(false), - }), - } + settingsStore[awssettings.ContextKey] = test.Settings(test.SettingOptions{EnableENILimitedPodDensity: lo.ToPtr(false)}) ctx = settingsStore.InjectSettings(ctx) - prov = provisioning.NewProvisioner(ctx, env.Client, corev1.NewForConfigOrDie(env.Config), recorder, cloudProvider, cluster, settingsStore) - controllerWithOpts := provisioning.NewController(env.Client, prov, recorder) - content, _ := os.ReadFile("testdata/al2_userdata_input.golden") nodeTemplate := test.AWSNodeTemplate(v1alpha1.AWSNodeTemplateSpec{ UserData: aws.String(string(content)), @@ -1242,7 +1191,7 @@ var _ = Describe("LaunchTemplates", func() { ExpectApplied(ctx, env.Client, nodeTemplate) newProvisioner := test.Provisioner(coretest.ProvisionerOptions{ProviderRef: &v1alpha5.ProviderRef{Name: nodeTemplate.Name}}) ExpectApplied(ctx, env.Client, newProvisioner) - pod := ExpectProvisioned(ctx, env.Client, recorder, controllerWithOpts, prov, coretest.UnschedulablePod())[0] + pod := ExpectProvisioned(ctx, env.Client, recorder, provisioningController, prov, coretest.UnschedulablePod())[0] ExpectScheduled(ctx, env.Client, pod) Expect(fakeEC2API.CalledWithCreateLaunchTemplateInput.Len()).To(Equal(1)) input := fakeEC2API.CalledWithCreateLaunchTemplateInput.Pop() @@ -1252,16 +1201,8 @@ var _ = Describe("LaunchTemplates", func() { Expect(expectedUserData).To(Equal(string(userData))) }) It("should handle empty custom user data", func() { - settingsStore = coretest.SettingsStore{ - settings.ContextKey: test.Settings(), - awssettings.ContextKey: test.Settings(test.SettingOptions{ - EnableENILimitedPodDensity: lo.ToPtr(false), - }), - } + settingsStore[awssettings.ContextKey] = test.Settings(test.SettingOptions{EnableENILimitedPodDensity: lo.ToPtr(false)}) ctx = settingsStore.InjectSettings(ctx) - - prov = provisioning.NewProvisioner(ctx, env.Client, corev1.NewForConfigOrDie(env.Config), recorder, cloudProvider, cluster, settingsStore) - controllerWithOpts := provisioning.NewController(env.Client, prov, recorder) nodeTemplate := test.AWSNodeTemplate(v1alpha1.AWSNodeTemplateSpec{ UserData: nil, AWS: *provider, @@ -1269,7 +1210,7 @@ var _ = Describe("LaunchTemplates", func() { ExpectApplied(ctx, env.Client, nodeTemplate) newProvisioner := test.Provisioner(coretest.ProvisionerOptions{ProviderRef: &v1alpha5.ProviderRef{Name: nodeTemplate.Name}}) ExpectApplied(ctx, env.Client, newProvisioner) - pod := ExpectProvisioned(ctx, env.Client, recorder, controllerWithOpts, prov, coretest.UnschedulablePod())[0] + pod := ExpectProvisioned(ctx, env.Client, recorder, provisioningController, prov, coretest.UnschedulablePod())[0] ExpectScheduled(ctx, env.Client, pod) Expect(fakeEC2API.CalledWithCreateLaunchTemplateInput.Len()).To(Equal(1)) input := fakeEC2API.CalledWithCreateLaunchTemplateInput.Pop() diff --git a/pkg/cloudprovider/suite_test.go b/pkg/cloudprovider/suite_test.go index 855d39640e4e..6ea21df1b67e 100644 --- a/pkg/cloudprovider/suite_test.go +++ b/pkg/cloudprovider/suite_test.go @@ -141,10 +141,11 @@ var _ = BeforeSuite(func() { fakeClock = clock.NewFakeClock(time.Now()) cluster = state.NewCluster(ctx, fakeClock, env.Client, cloudProvider) recorder = coretest.NewEventRecorder() - prov = provisioning.NewProvisioner(ctx, env.Client, env.KubernetesInterface.CoreV1(), recorder, cloudProvider, cluster, coretest.SettingsStore{}) + prov = provisioning.NewProvisioner(ctx, env.Client, env.KubernetesInterface.CoreV1(), recorder, cloudProvider, cluster) provisioningController = provisioning.NewController(env.Client, prov, recorder) env.CRDDirectoryPaths = append(env.CRDDirectoryPaths, RelativeToRoot("charts/karpenter/crds")) + provisioning.WaitForClusterSync = false }) var _ = AfterSuite(func() { @@ -159,7 +160,6 @@ var _ = BeforeEach(func() { awssettings.ContextKey: test.Settings(), } ctx = settingsStore.InjectSettings(ctx) - provider = &v1alpha1.AWS{ AMIFamily: aws.String(v1alpha1.AMIFamilyAL2), SubnetSelector: map[string]string{"*": "*"}, @@ -174,6 +174,7 @@ var _ = BeforeEach(func() { }}, }) + recorder.Reset() fakeEC2API.Reset() fakePricingAPI.Reset() launchTemplateCache.Flush() diff --git a/pkg/context/context.go b/pkg/context/context.go index edf64fe956b8..df071a4924f1 100644 --- a/pkg/context/context.go +++ b/pkg/context/context.go @@ -63,11 +63,11 @@ func NewOrDie(ctx cloudprovider.Context) Context { ), ))) if *sess.Config.Region == "" { - logging.FromContext(ctx).Debug("AWS region not configured, asking EC2 instance metadata service") + logging.FromContext(ctx).Debug("retrieving region from IMDS") region, err := ec2metadata.New(sess).Region() *sess.Config.Region = lo.Must(region, err, "failed to get region from metadata server") } - logging.FromContext(ctx).With("region", *sess.Config.Region).Debugf("using AWS region") + logging.FromContext(ctx).With("region", *sess.Config.Region).Debugf("discovered region") return Context{ Context: ctx, Session: sess, diff --git a/pkg/controllers/controllers.go b/pkg/controllers/controllers.go index 337713698332..d64df135191b 100644 --- a/pkg/controllers/controllers.go +++ b/pkg/controllers/controllers.go @@ -25,7 +25,7 @@ import ( ) func NewControllers(ctx awscontext.Context) []controller.Controller { - logging.FromContext(ctx).Infof("Initializing with version %s", project.Version) + logging.FromContext(ctx).With("version", project.Version).Debugf("discovered version") return []controller.Controller{ interruption.NewController(ctx.KubeClient, ctx.Clock, ctx.EventRecorder, interruption.NewSQSProvider(sqs.New(ctx.Session)), ctx.UnavailableOfferingsCache), } diff --git a/pkg/controllers/interruption/controller.go b/pkg/controllers/interruption/controller.go index af6a50986854..40d4b3a16369 100644 --- a/pkg/controllers/interruption/controller.go +++ b/pkg/controllers/interruption/controller.go @@ -88,7 +88,7 @@ func (c *Controller) Reconcile(ctx context.Context, _ reconcile.Request) (reconc } ctx = logging.WithLogger(ctx, logging.FromContext(ctx).With("queue", settings.FromContext(ctx).InterruptionQueueName)) if c.cm.HasChanged(settings.FromContext(ctx).InterruptionQueueName, nil) { - logging.FromContext(ctx).Infof("watching interruption queue") + logging.FromContext(ctx).Debugf("watching interruption queue") } sqsMessages, err := c.sqsProvider.GetSQSMessages(ctx) if err != nil { diff --git a/test/go.mod b/test/go.mod index 7145ea437460..231524ec87c7 100644 --- a/test/go.mod +++ b/test/go.mod @@ -7,15 +7,15 @@ require ( github.com/aws/aws-sdk-go v1.44.135 github.com/aws/aws-sdk-go-v2/config v1.17.10 github.com/aws/karpenter v0.18.0 - github.com/aws/karpenter-core v0.0.2-0.20221125213814-604edd172c9d + github.com/aws/karpenter-core v0.0.2-0.20221201175819-53f644f67509 github.com/onsi/ginkgo/v2 v2.5.0 github.com/onsi/gomega v1.24.1 github.com/samber/lo v1.34.0 go.uber.org/multierr v1.8.0 - k8s.io/api v0.25.2 - k8s.io/apimachinery v0.25.2 - k8s.io/client-go v0.25.2 - knative.dev/pkg v0.0.0-20221031132215-6eb8f1845a9d + k8s.io/api v0.25.4 + k8s.io/apimachinery v0.25.4 + k8s.io/client-go v0.25.4 + knative.dev/pkg v0.0.0-20221123154742-05b694ec4d3a sigs.k8s.io/controller-runtime v0.13.0 ) @@ -93,11 +93,11 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.25.2 // indirect - k8s.io/component-base v0.25.2 // indirect - k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f // indirect + k8s.io/apiextensions-apiserver v0.25.4 // indirect + k8s.io/component-base v0.25.4 // indirect + k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect - k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect + k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect diff --git a/test/go.sum b/test/go.sum index 8cbe0a3cd743..fce5ae05c05b 100644 --- a/test/go.sum +++ b/test/go.sum @@ -84,8 +84,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.8 h1:jcw6kKZrtNfBPJkaHrscDOZo github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.8/go.mod h1:er2JHN+kBY6FcMfcBBKNGCT3CarImmdFzishsqBmSRI= github.com/aws/aws-sdk-go-v2/service/sts v1.17.1 h1:KRAix/KHvjGODaHAMXnxRk9t0D+4IJVUuS/uwXxngXk= github.com/aws/aws-sdk-go-v2/service/sts v1.17.1/go.mod h1:bXcN3koeVYiJcdDU89n3kCYILob7Y34AeLopUbZgLT4= -github.com/aws/karpenter-core v0.0.2-0.20221125213814-604edd172c9d h1:XcHoB0/BaxKQSmKoJ5GlY0wPAgS2xVX51WjC/b2+uo4= -github.com/aws/karpenter-core v0.0.2-0.20221125213814-604edd172c9d/go.mod h1:P5jLwvZ5aRXr9PuW+8tUyBJq9k6cgN12ZD7X2F3/H+k= +github.com/aws/karpenter-core v0.0.2-0.20221201175819-53f644f67509 h1:EZZRRsxGtsVvaRm1P48RXqkZiMWDwf7vZJ9xhhANCzc= +github.com/aws/karpenter-core v0.0.2-0.20221201175819-53f644f67509/go.mod h1:qWQu8B7Tc2sPDNdIG9JZRl642ofccXtgj89is04Z5U8= github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM= github.com/aws/smithy-go v1.13.4 h1:/RN2z1txIJWeXeOkzX+Hk/4Uuvv7dWtCjbmVJcrskyk= github.com/aws/smithy-go v1.13.4/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= @@ -134,7 +134,6 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -332,7 +331,6 @@ github.com/samber/lo v1.34.0/go.mod h1:HLeWcJRRyLKp3+/XBJvOrerCQn9mhdKMHyd7IRlge github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= 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/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= @@ -360,7 +358,7 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= @@ -696,25 +694,24 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.25.2 h1:v6G8RyFcwf0HR5jQGIAYlvtRNrxMJQG1xJzaSeVnIS8= -k8s.io/api v0.25.2/go.mod h1:qP1Rn4sCVFwx/xIhe+we2cwBLTXNcheRyYXwajonhy0= -k8s.io/apiextensions-apiserver v0.25.2 h1:8uOQX17RE7XL02ngtnh3TgifY7EhekpK+/piwzQNnBo= -k8s.io/apiextensions-apiserver v0.25.2/go.mod h1:iRwwRDlWPfaHhuBfQ0WMa5skdQfrE18QXJaJvIDLvE8= -k8s.io/apimachinery v0.25.2 h1:WbxfAjCx+AeN8Ilp9joWnyJ6xu9OMeS/fsfjK/5zaQs= -k8s.io/apimachinery v0.25.2/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA= -k8s.io/client-go v0.25.2 h1:SUPp9p5CwM0yXGQrwYurw9LWz+YtMwhWd0GqOsSiefo= -k8s.io/client-go v0.25.2/go.mod h1:i7cNU7N+yGQmJkewcRD2+Vuj4iz7b30kI8OcL3horQ4= -k8s.io/component-base v0.25.2 h1:Nve/ZyHLUBHz1rqwkjXm/Re6IniNa5k7KgzxZpTfSQY= -k8s.io/component-base v0.25.2/go.mod h1:90W21YMr+Yjg7MX+DohmZLzjsBtaxQDDwaX4YxDkl60= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f h1:dltw7bAn8bCrQ2CmzzhgoieUZEbWqrvIGVdHGioP5nY= -k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/api v0.25.4 h1:3YO8J4RtmG7elEgaWMb4HgmpS2CfY1QlaOz9nwB+ZSs= +k8s.io/api v0.25.4/go.mod h1:IG2+RzyPQLllQxnhzD8KQNEu4c4YvyDTpSMztf4A0OQ= +k8s.io/apiextensions-apiserver v0.25.4 h1:7hu9pF+xikxQuQZ7/30z/qxIPZc2J1lFElPtr7f+B6U= +k8s.io/apiextensions-apiserver v0.25.4/go.mod h1:bkSGki5YBoZWdn5pWtNIdGvDrrsRWlmnvl9a+tAw5vQ= +k8s.io/apimachinery v0.25.4 h1:CtXsuaitMESSu339tfhVXhQrPET+EiWnIY1rcurKnAc= +k8s.io/apimachinery v0.25.4/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= +k8s.io/client-go v0.25.4 h1:3RNRDffAkNU56M/a7gUfXaEzdhZlYhoW8dgViGy5fn8= +k8s.io/client-go v0.25.4/go.mod h1:8trHCAC83XKY0wsBIpbirZU4NTUpbuhc2JnI7OruGZw= +k8s.io/component-base v0.25.4 h1:n1bjg9Yt+G1C0WnIDJmg2fo6wbEU1UGMRiQSjmj7hNQ= +k8s.io/component-base v0.25.4/go.mod h1:nnZJU8OP13PJEm6/p5V2ztgX2oyteIaAGKGMYb2L2cY= +k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 h1:hWRbsoRWt44OEBnYUd4ceLy4ofBoh+p9vauWp/I5Gdg= +k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/pkg v0.0.0-20221031132215-6eb8f1845a9d h1:BRSonjQw4u63gaWeoE5i2724FF3K7teFf8DcmwjGdAQ= -knative.dev/pkg v0.0.0-20221031132215-6eb8f1845a9d/go.mod h1:j5kO7gKmWGj2DJpefCEiPbItToiYf+2bCtI+A6REkQo= +k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8= +k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +knative.dev/pkg v0.0.0-20221123154742-05b694ec4d3a h1:mTDxXL+zRBMz7BcdM3WOgw9FVbmkIN/3cvEj4MeS8zI= +knative.dev/pkg v0.0.0-20221123154742-05b694ec4d3a/go.mod h1:fckNBPf9bu5/p1RbnOhEauX7r+kfN1zSQupEVtkaYBs= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=