Skip to content

Commit

Permalink
gofmt: run go fmt github.com/kubeflow/kubeflow/bootstrap/cmd/... (#1762)
Browse files Browse the repository at this point in the history
  • Loading branch information
@r2d4 @k8s-ci-robot
r2d4 authored and k8s-ci-robot committed Oct 12, 2018
1 parent fcc01b3 commit 0a8d32a
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 109 deletions.
47 changes: 23 additions & 24 deletions bootstrap/cmd/bootstrap/app/gcpUtils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ import (
"fmt"
"time"

"golang.org/x/net/context"
"google.golang.org/api/deploymentmanager/v2"
"golang.org/x/oauth2"
"github.com/ghodss/yaml"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"golang.org/x/oauth2"
"google.golang.org/api/cloudresourcemanager/v1"
"google.golang.org/api/deploymentmanager/v2"
"io/ioutil"
"path"
"strings"
)

type Resource struct {
Name string `json:"name"`
Type string `json:"type"`
Name string `json:"name"`
Type string `json:"type"`
Properties map[string]interface{} `json:"properties"`
}

type DmConf struct {
Imports interface{} `json:"imports"`
Resources []Resource `json:"resources"`
Imports interface{} `json:"imports"`
Resources []Resource `json:"resources"`
}

type IamBinding struct {
Expand All @@ -38,13 +38,13 @@ type IamConf struct {
type ApplyIamRequest struct {
Project string `json:"project"`
Cluster string `json:"cluster"`
Email string `json:"email"`
Token string `json:"token"`
Action string `json:"action`
Email string `json:"email"`
Token string `json:"token"`
Action string `json:"action`
}

// TODO: handle concurrent & repetitive deployment requests.
func (s *ksServer)InsertDeployment(ctx context.Context, req CreateRequest) error {
func (s *ksServer) InsertDeployment(ctx context.Context, req CreateRequest) error {
regPath := s.knownRegistries["kubeflow"].RegUri
var dmconf DmConf
err := LoadConfig(path.Join(regPath, "../deployment/gke/deployment_manager_configs/cluster-kubeflow.yaml"), &dmconf)
Expand Down Expand Up @@ -83,7 +83,7 @@ func (s *ksServer)InsertDeployment(ctx context.Context, req CreateRequest) error
Imports: []*deploymentmanager.ImportFile{
{
Content: string(templateData),
Name: "cluster.jinja",
Name: "cluster.jinja",
},
},
},
Expand All @@ -95,7 +95,7 @@ func (s *ksServer)InsertDeployment(ctx context.Context, req CreateRequest) error
return nil
}

func (s *ksServer)GetDeploymentStatus(ctx context.Context, req CreateRequest) (string, error) {
func (s *ksServer) GetDeploymentStatus(ctx context.Context, req CreateRequest) (string, error) {
ts := oauth2.StaticTokenSource(&oauth2.Token{
AccessToken: req.Token,
})
Expand All @@ -113,10 +113,10 @@ func (s *ksServer)GetDeploymentStatus(ctx context.Context, req CreateRequest) (s
// Clear existing bindings for auto-generated service accounts of current deployment.
// Those bindings could be leftover from previous actions.
func GetClearServiceAccountpolicy(currentPolicy *cloudresourcemanager.Policy, req ApplyIamRequest) cloudresourcemanager.Policy {
serviceAccounts := map[string]bool {
serviceAccounts := map[string]bool{
fmt.Sprintf("serviceAccount:%v-admin@%v.iam.gserviceaccount.com", req.Cluster, req.Project): true,
fmt.Sprintf("serviceAccount:%v-user@%v.iam.gserviceaccount.com", req.Cluster, req.Project): true,
fmt.Sprintf("serviceAccount:%v-vm@%v.iam.gserviceaccount.com", req.Cluster, req.Project): true,
fmt.Sprintf("serviceAccount:%v-user@%v.iam.gserviceaccount.com", req.Cluster, req.Project): true,
fmt.Sprintf("serviceAccount:%v-vm@%v.iam.gserviceaccount.com", req.Cluster, req.Project): true,
}
newPolicy := cloudresourcemanager.Policy{}
for _, binding := range currentPolicy.Bindings {
Expand Down Expand Up @@ -148,7 +148,7 @@ func PrepareAccount(account string) string {

func GetUpdatedPolicy(currentPolicy *cloudresourcemanager.Policy, iamConf *IamConf, req ApplyIamRequest) cloudresourcemanager.Policy {
// map from role to members.
policyMap := map[string]map[string]bool {}
policyMap := map[string]map[string]bool{}
for _, binding := range currentPolicy.Bindings {
policyMap[binding.Role] = make(map[string]bool)
for _, member := range binding.Members {
Expand All @@ -157,11 +157,11 @@ func GetUpdatedPolicy(currentPolicy *cloudresourcemanager.Policy, iamConf *IamCo
}

// Replace placeholder with actual identity.
saMapping := map[string]string {
saMapping := map[string]string{
"set-kubeflow-admin-service-account": PrepareAccount(fmt.Sprintf("%v-admin@%v.iam.gserviceaccount.com", req.Cluster, req.Project)),
"set-kubeflow-user-service-account": PrepareAccount(fmt.Sprintf("%v-user@%v.iam.gserviceaccount.com", req.Cluster, req.Project)),
"set-kubeflow-vm-service-account": PrepareAccount(fmt.Sprintf("%v-vm@%v.iam.gserviceaccount.com", req.Cluster, req.Project)),
"set-kubeflow-iap-account": PrepareAccount(req.Email),
"set-kubeflow-user-service-account": PrepareAccount(fmt.Sprintf("%v-user@%v.iam.gserviceaccount.com", req.Cluster, req.Project)),
"set-kubeflow-vm-service-account": PrepareAccount(fmt.Sprintf("%v-vm@%v.iam.gserviceaccount.com", req.Cluster, req.Project)),
"set-kubeflow-iap-account": PrepareAccount(req.Email),
}
for _, binding := range iamConf.IamBindings {
for _, member := range binding.Members {
Expand Down Expand Up @@ -196,7 +196,7 @@ func GetUpdatedPolicy(currentPolicy *cloudresourcemanager.Policy, iamConf *IamCo
return newPolicy
}

func (s *ksServer)ApplyIamPolicy(ctx context.Context, req ApplyIamRequest) error {
func (s *ksServer) ApplyIamPolicy(ctx context.Context, req ApplyIamRequest) error {
// Get the iam change from config.
regPath := s.knownRegistries["kubeflow"].RegUri
templatePath := path.Join(regPath, "../deployment/gke/deployment_manager_configs/iam_bindings_template.yaml")
Expand Down Expand Up @@ -224,8 +224,7 @@ func (s *ksServer)ApplyIamPolicy(ctx context.Context, req ApplyIamRequest) error
// Get current policy
saPolicy, err := resourceManager.Projects.GetIamPolicy(
req.Project,
&cloudresourcemanager.GetIamPolicyRequest{
}).Do()
&cloudresourcemanager.GetIamPolicyRequest{}).Do()
if err != nil {
log.Warningf("Cannot get current policy: %v", err)
time.Sleep(3 * time.Second)
Expand Down
13 changes: 6 additions & 7 deletions bootstrap/cmd/bootstrap/app/initHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ package app

import (
"github.com/go-kit/kit/endpoint"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"golang.org/x/oauth2"
log "github.com/sirupsen/logrus"
"google.golang.org/api/cloudresourcemanager/v1"
)

const IAM_ADMIN_ROLE = "roles/resourcemanager.projectIamAdmin"

type InitProjectRequest struct {
Project string
Project string
ProjectNumber string
Token string
Token string
}

// TODO: migrate service enabling logic to initHandler
Expand Down Expand Up @@ -47,8 +47,7 @@ func (s *ksServer) BindRole(ctx context.Context, project string, token string, s

saPolicy, err := resourcManger.Projects.GetIamPolicy(
project,
&cloudresourcemanager.GetIamPolicyRequest{
}).Do()
&cloudresourcemanager.GetIamPolicyRequest{}).Do()

if err != nil {
log.Errorf("Cannot get current ploicy: %v", err)
Expand All @@ -57,7 +56,7 @@ func (s *ksServer) BindRole(ctx context.Context, project string, token string, s
saPolicy.Bindings = append(saPolicy.Bindings,
&cloudresourcemanager.Binding{
Members: []string{"serviceAccount:" + serviceAccount},
Role: IAM_ADMIN_ROLE,
Role: IAM_ADMIN_ROLE,
})
_, err = resourcManger.Projects.SetIamPolicy(
project,
Expand All @@ -69,4 +68,4 @@ func (s *ksServer) BindRole(ctx context.Context, project string, token string, s
return err
}
return nil
}
}
19 changes: 10 additions & 9 deletions bootstrap/cmd/bootstrap/app/k8sAuth.go
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package app

import (
"golang.org/x/net/context"
"encoding/base64"

"cloud.google.com/go/container/apiv1"
"google.golang.org/api/option"
"golang.org/x/net/context"
"golang.org/x/oauth2"
"google.golang.org/api/option"
containerpb "google.golang.org/genproto/googleapis/container/v1"
"k8s.io/client-go/rest"
"encoding/base64"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/api/rbac/v1"
)
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
)

func buildClusterConfig(ctx context.Context, token string, project string, zone string,
clusterId string) (*rest.Config, error) {
Expand All @@ -23,7 +24,7 @@ func buildClusterConfig(ctx context.Context, token string, project string, zone
}
req := &containerpb.GetClusterRequest{
ProjectId: project,
Zone: zone,
Zone: zone,
ClusterId: clusterId,
}
resp, err := c.GetCluster(ctx, req)
Expand All @@ -32,9 +33,9 @@ func buildClusterConfig(ctx context.Context, token string, project string, zone
}
caDec, _ := base64.StdEncoding.DecodeString(resp.MasterAuth.ClusterCaCertificate)
return &rest.Config{
Host: "https://" + resp.Endpoint,
Host: "https://" + resp.Endpoint,
BearerToken: token,
TLSClientConfig: rest.TLSClientConfig {
TLSClientConfig: rest.TLSClientConfig{
CAData: []byte(string(caDec)),
},
}, nil
Expand Down
Loading

0 comments on commit 0a8d32a

Please sign in to comment.