Skip to content
This repository was archived by the owner on Mar 5, 2024. It is now read-only.

Use resolver to create prefix for assumeRoleArn #276

Merged
merged 1 commit into from
Aug 1, 2019
Merged

Use resolver to create prefix for assumeRoleArn #276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
pb "github.com/uswitch/kiam/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme"
Expand Down Expand Up @@ -233,15 +233,16 @@ func NewServer(config *Config) (*KiamServer, error) {
server.namespaces = k8s.NewNamespaceCache(k8s.NewListWatch(client, k8s.ResourceNamespaces), time.Minute)
server.eventRecorder = eventRecorder(client)

stsGateway, err := sts.DefaultGateway(config.AssumeRoleArn, config.Region)
arnResolver, err := newRoleARNResolver(config)
if err != nil {
return nil, err
}

arnResolver, err := newRoleARNResolver(config)
stsGateway, err := sts.DefaultGateway(arnResolver.Resolve(config.AssumeRoleArn), config.Region)
if err != nil {
return nil, err
}

credentialsCache := sts.DefaultCache(
stsGateway, config.SessionName,
config.SessionDuration,
Expand Down