diff --git a/pkg/kfapp/aws/aws.go b/pkg/kfapp/aws/aws.go index 36a2db98..28bb8542 100644 --- a/pkg/kfapp/aws/aws.go +++ b/pkg/kfapp/aws/aws.go @@ -450,11 +450,7 @@ func (aws *Aws) Generate(resources kftypes.ResourceEnum) error { return errors.WithStack(err) } - if err := aws.kfDef.SetApplicationParameter("aws-alb-ingress-controller", "clusterName", aws.kfDef.Name); err != nil { - return errors.WithStack(err) - } - - if err := aws.kfDef.SetApplicationParameter("istio-ingress", "namespace", IstioNamespace); err != nil { + if err := aws.kfDef.SetApplicationParameter("aws-alb-ingress-controller", "cluster-name", aws.kfDef.Name); err != nil { return errors.WithStack(err) } @@ -471,10 +467,6 @@ func (aws *Aws) Generate(resources kftypes.ResourceEnum) error { } } else { if pluginSpec.Auth.Cognito != nil { - if err := aws.kfDef.SetApplicationParameter("istio", "clusterRbacConfig", "ON"); err != nil { - return errors.WithStack(err) - } - if err := aws.kfDef.SetApplicationParameter("istio-ingress", "CognitoUserPoolArn", pluginSpec.Auth.Cognito.CognitoUserPoolArn); err != nil { return errors.WithStack(err) } diff --git a/pkg/kfconfig/types.go b/pkg/kfconfig/types.go index 613041f6..5d974aa7 100644 --- a/pkg/kfconfig/types.go +++ b/pkg/kfconfig/types.go @@ -839,8 +839,12 @@ func (c *KfConfig) SetApplicationParameter(appName string, paramName string, val "jupyter-web-app": KfAppsStackName, "metacontroller": "metacontroller", "profiles": KfAppsStackName, + "dex": "dex", // Spartakus is its own application because we want kfctl to be able to remove it. - "spartakus": "spartakus", + "spartakus": "spartakus", + // AWS Specific + "aws-alb-ingress-controller": KfAppsStackName, + "istio-ingress": "istio-ingress", } appNameDir, ok := appToStack[appName] diff --git a/pkg/utils/awsutil.go b/pkg/utils/awsutil.go index cdf3e0e9..28454048 100644 --- a/pkg/utils/awsutil.go +++ b/pkg/utils/awsutil.go @@ -77,7 +77,6 @@ func GetEksctlVersion() (string, error) { return "", err } - log.Infof("Output: %s", output) // [ℹ] version.Info{BuiltAt:"", GitCommit:"", GitTag:"0.1.32"} r := regexp.MustCompile("[0-9]+.[0-9]+.[0-9]+") matchGroups := r.FindStringSubmatch(string(output))