From d5acd464900b198ba6de07098b0354ec9c7cac71 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Wed, 10 Jan 2024 03:40:04 -0500 Subject: [PATCH] upgrade to latest dependencies (#649) bumping knative.dev/pkg de3e9cc...21d8c37: > 21d8c37 Bump K8s dependencies to v0.28.5 and set K8s min-version to 1.27 (# 2928) > a459076 upgrade to latest dependencies (# 2930) bumping knative.dev/networking 7cca4b0...07c412e: > 07c412e upgrade to latest dependencies (# 909) > 59f81e8 Replace deprecated `sets` usages with generic version (# 908) > 964fcff upgrade to latest dependencies (# 907) Signed-off-by: Knative Automation --- go.mod | 14 ++++++------- go.sum | 8 ++++---- .../apis/networking/metadata_validation.go | 2 +- .../pkg/client/clientset/versioned/doc.go | 20 ------------------- .../informers/externalversions/factory.go | 4 ++-- .../v1alpha1/certificate/reconciler.go | 10 +++++----- .../test/conformance/certificate/utils.go | 2 +- vendor/knative.dev/pkg/version/version.go | 2 +- vendor/modules.txt | 14 ++++++------- 9 files changed, 28 insertions(+), 48 deletions(-) delete mode 100644 vendor/knative.dev/networking/pkg/client/clientset/versioned/doc.go diff --git a/go.mod b/go.mod index 04628ec67..08ca53d67 100644 --- a/go.mod +++ b/go.mod @@ -17,12 +17,12 @@ require ( github.com/ghodss/yaml v1.0.0 github.com/google/go-cmp v0.6.0 go.uber.org/zap v1.26.0 - k8s.io/api v0.28.1 - k8s.io/apimachinery v0.28.1 - k8s.io/client-go v0.28.1 + k8s.io/api v0.28.5 + k8s.io/apimachinery v0.28.5 + k8s.io/client-go v0.28.5 knative.dev/hack v0.0.0-20240108153050-3ea694d6dad7 - knative.dev/networking v0.0.0-20240108134621-7cca4b010b25 - knative.dev/pkg v0.0.0-20240108152118-de3e9cc204c9 + knative.dev/networking v0.0.0-20240109202710-07c412e16861 + knative.dev/pkg v0.0.0-20240109155808-21d8c37af23f ) require ( @@ -93,8 +93,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/apiextensions-apiserver v0.28.1 // indirect - k8s.io/code-generator v0.28.1 // indirect + k8s.io/apiextensions-apiserver v0.28.5 // indirect + k8s.io/code-generator v0.28.5 // indirect k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect k8s.io/klog/v2 v2.100.1 // indirect k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect diff --git a/go.sum b/go.sum index 792c82f58..804b1bf00 100644 --- a/go.sum +++ b/go.sum @@ -716,10 +716,10 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/hack v0.0.0-20240108153050-3ea694d6dad7 h1:mICurlRke2mlKP3LmyWYQYl6KZe80rYP5+ag9w2HQLA= knative.dev/hack v0.0.0-20240108153050-3ea694d6dad7/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/networking v0.0.0-20240108134621-7cca4b010b25 h1:2H/mvXGSgfBcpNFUMWC3XCWL5zOrGGvas4RBbclEJ1M= -knative.dev/networking v0.0.0-20240108134621-7cca4b010b25/go.mod h1:ynNh7EoqxkST4jWPw6ZVyI9jwuF68WJNrX65yoAQ7FE= -knative.dev/pkg v0.0.0-20240108152118-de3e9cc204c9 h1:4nsTvrgApGtLTt6Gpo7ulJS03pBI+wSJ8+EOwVamDx0= -knative.dev/pkg v0.0.0-20240108152118-de3e9cc204c9/go.mod h1:YzKN/kzcJPhL+Z4fwuzbaiEnRLIbYvOiZUuCWFJ7PRA= +knative.dev/networking v0.0.0-20240109202710-07c412e16861 h1:rmEXnF2baoXtlsxcE3hxuqUIoRKzyiY1SeZCGFOv8y8= +knative.dev/networking v0.0.0-20240109202710-07c412e16861/go.mod h1:8Cr9FIZbsa9KhhzglMchAd4dSKvp0G+fs0wjvzK1LaE= +knative.dev/pkg v0.0.0-20240109155808-21d8c37af23f h1:F7zv+n+OY+FD8kX6/4CzAFbT+n4QKeJ025jHeOwFBvM= +knative.dev/pkg v0.0.0-20240109155808-21d8c37af23f/go.mod h1:8/u65OwQ+l56FFE1j8BB/rMiy6B9dom4fTrvLFZ/Vqg= 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/vendor/knative.dev/networking/pkg/apis/networking/metadata_validation.go b/vendor/knative.dev/networking/pkg/apis/networking/metadata_validation.go index fbd6c155f..ff081dcd0 100644 --- a/vendor/knative.dev/networking/pkg/apis/networking/metadata_validation.go +++ b/vendor/knative.dev/networking/pkg/apis/networking/metadata_validation.go @@ -25,7 +25,7 @@ import ( ) var ( - allowedAnnotations = sets.NewString( + allowedAnnotations = sets.New[string]( IngressClassAnnotationKey, CertificateClassAnnotationKey, DisableAutoTLSAnnotationKey, diff --git a/vendor/knative.dev/networking/pkg/client/clientset/versioned/doc.go b/vendor/knative.dev/networking/pkg/client/clientset/versioned/doc.go deleted file mode 100644 index e48c2aa44..000000000 --- a/vendor/knative.dev/networking/pkg/client/clientset/versioned/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 The Knative Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -// This package has the automatically generated clientset. -package versioned diff --git a/vendor/knative.dev/networking/pkg/client/informers/externalversions/factory.go b/vendor/knative.dev/networking/pkg/client/informers/externalversions/factory.go index 90494f4bc..679810c32 100644 --- a/vendor/knative.dev/networking/pkg/client/informers/externalversions/factory.go +++ b/vendor/knative.dev/networking/pkg/client/informers/externalversions/factory.go @@ -166,7 +166,7 @@ func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[ref return res } -// InternalInformerFor returns the SharedIndexInformer for obj using an internal +// InformerFor returns the SharedIndexInformer for obj using an internal // client. func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer { f.lock.Lock() @@ -239,7 +239,7 @@ type SharedInformerFactory interface { // ForResource gives generic access to a shared informer of the matching type. ForResource(resource schema.GroupVersionResource) (GenericInformer, error) - // InternalInformerFor returns the SharedIndexInformer for obj using an internal + // InformerFor returns the SharedIndexInformer for obj using an internal // client. InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer diff --git a/vendor/knative.dev/networking/pkg/client/injection/reconciler/networking/v1alpha1/certificate/reconciler.go b/vendor/knative.dev/networking/pkg/client/injection/reconciler/networking/v1alpha1/certificate/reconciler.go index 2c9309fb1..eb1e85867 100644 --- a/vendor/knative.dev/networking/pkg/client/injection/reconciler/networking/v1alpha1/certificate/reconciler.go +++ b/vendor/knative.dev/networking/pkg/client/injection/reconciler/networking/v1alpha1/certificate/reconciler.go @@ -357,14 +357,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo // updateFinalizersFiltered will update the Finalizers of the resource. // TODO: this method could be generic and sync all finalizers. For now it only // updates defaultFinalizerName or its override. -func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1alpha1.Certificate, desiredFinalizers sets.String) (*v1alpha1.Certificate, error) { +func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1alpha1.Certificate, desiredFinalizers sets.Set[string]) (*v1alpha1.Certificate, error) { // Don't modify the informers copy. existing := resource.DeepCopy() var finalizers []string // If there's nothing to update, just return. - existingFinalizers := sets.NewString(existing.Finalizers...) + existingFinalizers := sets.New[string](existing.Finalizers...) if desiredFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) { @@ -380,7 +380,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource } // Remove the finalizer. existingFinalizers.Delete(r.finalizerName) - finalizers = existingFinalizers.List() + finalizers = sets.List(existingFinalizers) } mergePatch := map[string]interface{}{ @@ -414,7 +414,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource * return resource, nil } - finalizers := sets.NewString(resource.Finalizers...) + finalizers := sets.New[string](resource.Finalizers...) // If this resource is not being deleted, mark the finalizer. if resource.GetDeletionTimestamp().IsZero() { @@ -433,7 +433,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1alpha1. return resource, nil } - finalizers := sets.NewString(resource.Finalizers...) + finalizers := sets.New[string](resource.Finalizers...) if reconcileEvent != nil { var event *reconciler.ReconcilerEvent diff --git a/vendor/knative.dev/networking/test/conformance/certificate/utils.go b/vendor/knative.dev/networking/test/conformance/certificate/utils.go index e44db8524..362a21037 100644 --- a/vendor/knative.dev/networking/test/conformance/certificate/utils.go +++ b/vendor/knative.dev/networking/test/conformance/certificate/utils.go @@ -134,7 +134,7 @@ func WaitForCertificateState(ctx context.Context, client *test.NetworkingClients func VerifyChallenges(ctx context.Context, t *testing.T, client *test.Clients, cert *v1alpha1.Certificate) { t.Helper() - certDomains := sets.NewString(cert.Spec.DNSNames...) + certDomains := sets.New(cert.Spec.DNSNames...) for _, challenge := range cert.Status.HTTP01Challenges { if challenge.ServiceName == "" { diff --git a/vendor/knative.dev/pkg/version/version.go b/vendor/knative.dev/pkg/version/version.go index 2d8f6a8e1..c540888b8 100644 --- a/vendor/knative.dev/pkg/version/version.go +++ b/vendor/knative.dev/pkg/version/version.go @@ -33,7 +33,7 @@ const ( // NOTE: If you are changing this line, please also update the minimum kubernetes // version listed here: // https://github.com/knative/docs/blob/main/docs/snippets/prerequisites.md - defaultMinimumVersion = "v1.26.0" + defaultMinimumVersion = "v1.27.0" ) func getMinimumVersion() string { diff --git a/vendor/modules.txt b/vendor/modules.txt index f12178e19..f09a27652 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -401,7 +401,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.28.1 => k8s.io/api v0.27.6 +# k8s.io/api v0.28.5 => k8s.io/api v0.27.6 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admissionregistration/v1 @@ -456,11 +456,11 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.28.1 => k8s.io/apiextensions-apiserver v0.27.6 +# k8s.io/apiextensions-apiserver v0.28.5 => k8s.io/apiextensions-apiserver v0.27.6 ## explicit; go 1.20 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 -# k8s.io/apimachinery v0.28.1 => k8s.io/apimachinery v0.27.6 +# k8s.io/apimachinery v0.28.5 => k8s.io/apimachinery v0.27.6 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -509,7 +509,7 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v0.28.1 => k8s.io/client-go v0.27.6 +# k8s.io/client-go v0.28.5 => k8s.io/client-go v0.27.6 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -815,7 +815,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/code-generator v0.28.1 => k8s.io/code-generator v0.27.6 +# k8s.io/code-generator v0.28.5 => k8s.io/code-generator v0.27.6 ## explicit; go 1.20 k8s.io/code-generator k8s.io/code-generator/cmd/applyconfiguration-gen @@ -908,7 +908,7 @@ k8s.io/utils/trace # knative.dev/hack v0.0.0-20240108153050-3ea694d6dad7 ## explicit; go 1.18 knative.dev/hack -# knative.dev/networking v0.0.0-20240108134621-7cca4b010b25 +# knative.dev/networking v0.0.0-20240109202710-07c412e16861 ## explicit; go 1.18 knative.dev/networking/config knative.dev/networking/pkg/apis/networking @@ -947,7 +947,7 @@ knative.dev/networking/test/test_images/runtime/handlers knative.dev/networking/test/test_images/timeout knative.dev/networking/test/test_images/wsserver knative.dev/networking/test/types -# knative.dev/pkg v0.0.0-20240108152118-de3e9cc204c9 +# knative.dev/pkg v0.0.0-20240109155808-21d8c37af23f ## explicit; go 1.18 knative.dev/pkg/apis knative.dev/pkg/apis/duck