From 7e6c799afc025ecc4a9a861b6e2d36908d9eea41 Mon Sep 17 00:00:00 2001 From: Kristoffer Johansson <51340510+krijohs@users.noreply.github.com> Date: Tue, 29 Dec 2020 21:32:31 +0100 Subject: [PATCH] fix: load all supported authentication plugins for k8s client-go (#4802) Signed-off-by: kristoffer johansson --- cmd/argo/main.go | 8 ++------ cmd/argoexec/main.go | 8 ++------ cmd/workflow-controller/main.go | 6 +++--- test/e2e/fixtures/e2e_suite.go | 8 ++------ 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/cmd/argo/main.go b/cmd/argo/main.go index 7f45d54b17f8..097df59eebc7 100644 --- a/cmd/argo/main.go +++ b/cmd/argo/main.go @@ -5,12 +5,8 @@ import ( "os" "github.com/argoproj/argo/cmd/argo/commands" - // load the azure plugin (required to authenticate against AKS clusters). - _ "k8s.io/client-go/plugin/pkg/client/auth/azure" - // load the gcp plugin (required to authenticate against GKE clusters). - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" - // load the oidc plugin (required to authenticate with OpenID Connect). - _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" + // load authentication plugin for obtaining credentials from cloud providers. + _ "k8s.io/client-go/plugin/pkg/client/auth" ) func main() { diff --git a/cmd/argoexec/main.go b/cmd/argoexec/main.go index 99c6b4d30694..ce3b4726b194 100644 --- a/cmd/argoexec/main.go +++ b/cmd/argoexec/main.go @@ -5,12 +5,8 @@ import ( "os" "github.com/argoproj/argo/cmd/argoexec/commands" - // load the azure plugin (required to authenticate against AKS clusters). - _ "k8s.io/client-go/plugin/pkg/client/auth/azure" - // load the gcp plugin (required to authenticate against GKE clusters). - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" - // load the oidc plugin (required to authenticate with OpenID Connect). - _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" + // load authentication plugin for obtaining credentials from cloud providers. + _ "k8s.io/client-go/plugin/pkg/client/auth" ) func main() { diff --git a/cmd/workflow-controller/main.go b/cmd/workflow-controller/main.go index e184d45ca466..d8d554898410 100644 --- a/cmd/workflow-controller/main.go +++ b/cmd/workflow-controller/main.go @@ -13,9 +13,9 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "k8s.io/client-go/kubernetes" - _ "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" + + // load authentication plugin for obtaining credentials from cloud providers. + _ "k8s.io/client-go/plugin/pkg/client/auth" "k8s.io/client-go/tools/clientcmd" wfclientset "github.com/argoproj/argo/pkg/client/clientset/versioned" diff --git a/test/e2e/fixtures/e2e_suite.go b/test/e2e/fixtures/e2e_suite.go index c1c810c8d91c..c1b3dcdbca6f 100644 --- a/test/e2e/fixtures/e2e_suite.go +++ b/test/e2e/fixtures/e2e_suite.go @@ -10,12 +10,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/dynamic" - // load the azure plugin (required to authenticate against AKS clusters). - _ "k8s.io/client-go/plugin/pkg/client/auth/azure" - // load the gcp plugin (required to authenticate against GKE clusters). - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" - // load the oidc plugin (required to authenticate with OpenID Connect). - _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" + // load authentication plugin for obtaining credentials from cloud providers. + _ "k8s.io/client-go/plugin/pkg/client/auth" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"