Skip to content
This repository has been archived by the owner on Aug 17, 2023. It is now read-only.

Bugfixes: Fixing AWS infra_configs change, and logging error in aws.go #498

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfixes: Fixing AWS infra_configs change, and logging error in aws.go #498

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d22be2e
aws-bugfix: aws_config directory related error messages are now displ…
Jul 22, 2021
32e6ec7
bugfix: kfctl is now correctly looking for aws/infra_configs under `d…
Jul 22, 2021
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
22 changes: 18 additions & 4 deletions pkg/kfapp/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const (
PATH = "path"
BASIC_AUTH_SECRET = "kubeflow-login"
// Path in manifests repo to where the additional configs are located
CONFIG_LOCAL_PATH = "aws/infra_configs"
CONFIG_LOCAL_PATH = "distributions/aws/infra_configs"

ALB_OIDC_SECRET = "alb-oidc-secret"

Expand Down Expand Up @@ -308,23 +308,36 @@ func (aws *Aws) generateInfraConfigs() error {
log.Infof("Creating AWS infrastructure configs in directory %v", destDir)
destDirErr := os.MkdirAll(destDir, os.ModePerm)
if destDirErr != nil {
return destDirErr
log.Errorf("There was a problem creating the directory; %v", destDirErr)
return &kfapis.KfError{
Code: destDirErr.(*kfapis.KfError).Code,
Message: fmt.Sprintf("Could not create directory %v: %v",
destDir, destDirErr.(*kfapis.KfError).Message),
}
}
} else {
log.Infof("AWS infrastructure configs already exist in directory %v", destDir)
}

// List all the files under source directory
log.Infof("Reading source directory: %v", sourceDir)
files, err := ioutil.ReadDir(sourceDir)
if err != nil {
return err
log.Errorf("There was a problem reading the source directory; %v", err)
return &kfapis.KfError{
Code: err.(*kfapis.KfError).Code,
Message: fmt.Sprintf("Could not list files in source directory %v: %v",
sourceDir, err.(*kfapis.KfError).Message),
}
}

log.Infof("Copying aws_config files...")
for _, file := range files {
sourceFile := filepath.Join(sourceDir, file.Name())
destFile := filepath.Join(destDir, file.Name())
copyErr := copyFile(sourceFile, destFile)
if copyErr != nil {
log.Errorf("There was a problem copying file: %v to %v: %v", sourceFile, destFile, copyErr)
return &kfapis.KfError{
Code: copyErr.(*kfapis.KfError).Code,
Message: fmt.Sprintf("Could not copy %v to %v: %v",
Expand All @@ -335,6 +348,7 @@ func (aws *Aws) generateInfraConfigs() error {

// 2. Reading from cluster_config.yaml and replace placeholders with values in aws.kfDef.Spec.
clusterConfigFile := filepath.Join(destDir, CLUSTER_CONFIG_FILE)
log.Infof("Updating cluster_config from file: %v", clusterConfigFile)
if err := aws.updateClusterConfig(clusterConfigFile); err != nil {
return err
}
Expand Down Expand Up @@ -927,7 +941,7 @@ func (aws *Aws) deleteIamRolePolicy(roleName, policyName string) error {

// attachIamInlinePolicy attach inline policy to IAM role
func (aws *Aws) attachIamInlinePolicy(roleName, policyName, policyDocumentPath string) error {
log.Infof("Attaching inline policy %s for iam role %s", policyName, roleName)
log.Infof("Attaching inline policy %s for iam role %s: from file: %s", policyName, roleName, policyDocumentPath)
policyDocumentJSONBytes, _ := ioutil.ReadFile(policyDocumentPath)

input := &iam.PutRolePolicyInput{
Expand Down