From b7e8afc61b3c7dee609bc69abea0efb1a92fa0a1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 22 May 2023 13:01:54 +0200 Subject: [PATCH] cmd/buildx: non-functional k8s.io/client-go/plugin/pkg/client/auth/openstack Kubernetes v1.26 removed the in-tree openstack cloud provider. While buildx has a replace rule to pin the k8s dependencies to an older version, such replace rules are non-transitive, which means that consumers of buildx as a module could potentially end up with non-resolvable dependencies. The used code was already non-functional since c41b006be1078aa358721b9a92e17eab9a51a958 (buildx v0.5.0-rc1); https://github.com/docker/buildx/blob/a6b0959276cd4494eed8caabbc2656f9425f2c77/vendor/k8s.io/client-go/plugin/pkg/client/auth/openstack/openstack_stub.go#L26-L36 See: - https://github.com/kubernetes/kubernetes/commit/9bbf01bae93600d3314bce0acbff1f3a0a42e74b - https://github.com/kubernetes/client-go/commit/98e81a77843e9ef2ad5c98a6919e450028610631 Signed-off-by: Sebastiaan van Stijn --- cmd/buildx/main.go | 1 - .../client/auth/openstack/openstack_stub.go | 36 ------------------- vendor/modules.txt | 1 - 3 files changed, 38 deletions(-) delete mode 100644 vendor/k8s.io/client-go/plugin/pkg/client/auth/openstack/openstack_stub.go diff --git a/cmd/buildx/main.go b/cmd/buildx/main.go index 790b8def..2881b816 100644 --- a/cmd/buildx/main.go +++ b/cmd/buildx/main.go @@ -21,7 +21,6 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/azure" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" - _ "k8s.io/client-go/plugin/pkg/client/auth/openstack" _ "github.com/docker/buildx/driver/docker" _ "github.com/docker/buildx/driver/docker-container" diff --git a/vendor/k8s.io/client-go/plugin/pkg/client/auth/openstack/openstack_stub.go b/vendor/k8s.io/client-go/plugin/pkg/client/auth/openstack/openstack_stub.go deleted file mode 100644 index 6e404bed..00000000 --- a/vendor/k8s.io/client-go/plugin/pkg/client/auth/openstack/openstack_stub.go +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2020 The Kubernetes 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. -*/ - -package openstack - -import ( - "errors" - - "k8s.io/client-go/rest" - "k8s.io/klog/v2" -) - -func init() { - if err := rest.RegisterAuthProviderPlugin("openstack", newOpenstackAuthProvider); err != nil { - klog.Fatalf("Failed to register openstack auth plugin: %s", err) - } -} - -func newOpenstackAuthProvider(_ string, _ map[string]string, _ rest.AuthProviderConfigPersister) (rest.AuthProvider, error) { - return nil, errors.New(`The openstack auth plugin has been removed. -Please use the "client-keystone-auth" kubectl/client-go credential plugin instead. -See https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/using-client-keystone-auth.md for further details`) -} diff --git a/vendor/modules.txt b/vendor/modules.txt index c3e09ab0..5b1ace93 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1214,7 +1214,6 @@ k8s.io/client-go/plugin/pkg/client/auth/azure k8s.io/client-go/plugin/pkg/client/auth/exec k8s.io/client-go/plugin/pkg/client/auth/gcp k8s.io/client-go/plugin/pkg/client/auth/oidc -k8s.io/client-go/plugin/pkg/client/auth/openstack k8s.io/client-go/rest k8s.io/client-go/rest/watch k8s.io/client-go/third_party/forked/golang/template