Browse Source

register oidc plugin with client-go

Alexander Belanger 5 năm trước cách đây
mục cha
commit
11251beebf
3 tập tin đã thay đổi với 5 bổ sung18 xóa
  1. 2 0
      go.sum
  2. 3 16
      internal/kubernetes/config.go
  3. 0 2
      internal/kubernetes/kubeconfig.go

+ 2 - 0
go.sum

@@ -1850,6 +1850,8 @@ k8s.io/cli-runtime v0.18.8/go.mod h1:7EzWiDbS9PFd0hamHHVoCY4GrokSTPSL32MA4rzIu0M
 k8s.io/client-go v0.16.8/go.mod h1:WmPuN0yJTKHXoklExKxzo3jSXmr3EnN+65uaTb5VuNs=
 k8s.io/client-go v0.18.8 h1:SdbLpIxk5j5YbFr1b7fq8S7mDgDjYmUxSbszyoesoDM=
 k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU=
+k8s.io/client-go v1.5.1 h1:XaX/lo2/u3/pmFau8HN+sB5C/b4dc4Dmm2eXjBH4p1E=
+k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
 k8s.io/cloud-provider v0.18.8/go.mod h1:cn9AlzMPVIXA4HHLVbgGUigaQlZyHSZ7WAwDEFNrQSs=
 k8s.io/cluster-bootstrap v0.18.8/go.mod h1:guq0Uc+QwazHgpS1yAw5Z7yUlBCtGppbgWQkbN3lxIY=
 k8s.io/code-generator v0.16.8/go.mod h1:wFdrXdVi/UC+xIfLi+4l9elsTT/uEF61IfcN2wOLULQ=

+ 3 - 16
internal/kubernetes/config.go

@@ -18,6 +18,9 @@ import (
 	"k8s.io/client-go/restmapper"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/homedir"
+
+	// add oidc provider here
+	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
 )
 
 // GetAgentOutOfClusterConfig creates a new Agent using the OutOfClusterConfig
@@ -79,22 +82,6 @@ func (conf *OutOfClusterConfig) ToRESTConfig() (*rest.Config, error) {
 		return nil, err
 	}
 
-	// if conf.ServiceAccount.AuthMechanism == models.GCP {
-	// 	creds, err := google.CredentialsFromJSON(
-	// 		context.Background(),
-	// 		conf.ServiceAccount.KeyData,
-	// 		"https://www.googleapis.com/auth/cloud-platform",
-	// 	)
-
-	// 	if err != nil {
-	// 		return nil, err
-	// 	}
-
-	// 	restConf.Transport = &oauth2.Transport{
-	// 		Source: creds.TokenSource,
-	// 	}
-	// }
-
 	rest.SetKubernetesDefaults(restConf)
 	return restConf, nil
 }

+ 0 - 2
internal/kubernetes/kubeconfig.go

@@ -3,7 +3,6 @@ package kubernetes
 import (
 	"context"
 	"errors"
-	"fmt"
 	"strings"
 
 	"github.com/porter-dev/porter/internal/models"
@@ -336,7 +335,6 @@ func createRawConfigFromServiceAccount(
 		authInfoMap[authInfoName].Username = sa.Username
 		authInfoMap[authInfoName].Password = sa.Password
 	case models.Bearer:
-		fmt.Println("AUTH MECHANISM IS BEARER WITH TOKEN", sa.Token)
 		authInfoMap[authInfoName].Token = sa.Token
 	case models.OIDC:
 		authInfoMap[authInfoName].AuthProvider = &api.AuthProviderConfig{