From 75d924f1807cf4258f9082ee904efbcfd0cef096 Mon Sep 17 00:00:00 2001 From: jsitu Date: Thu, 29 Sep 2022 16:20:43 -0700 Subject: [PATCH 1/2] added manual helm set up steps for cognito in website --- .../docs/deployment/cognito/manifest/guide.md | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/website/content/en/docs/deployment/cognito/manifest/guide.md b/website/content/en/docs/deployment/cognito/manifest/guide.md index b535259f74..9a6e6b2467 100644 --- a/website/content/en/docs/deployment/cognito/manifest/guide.md +++ b/website/content/en/docs/deployment/cognito/manifest/guide.md @@ -80,20 +80,35 @@ From this point onwards, we will be creating/updating the DNS records **only in export CognitoLogoutURL="https://$CognitoUserPoolDomain/logout?client_id=$CognitoAppClientId&logout_uri=$signOutURL" ``` 1. Substitute values for setting up Ingress. - 1. ```bash - printf ' - CognitoUserPoolArn='$CognitoUserPoolArn' - CognitoAppClientId='$CognitoAppClientId' - CognitoUserPoolDomain='$CognitoUserPoolDomain' - certArn='$certArn' - ' > awsconfigs/common/istio-ingress/overlays/cognito/params.env - ``` + 1. Kustomize + 1. ```bash + printf ' + CognitoUserPoolArn='$CognitoUserPoolArn' + CognitoAppClientId='$CognitoAppClientId' + CognitoUserPoolDomain='$CognitoUserPoolDomain' + certArn='$certArn' + ' > awsconfigs/common/istio-ingress/overlays/cognito/params.env + ``` + 1. Helm + 1. ```bash + yq e '.alb.certArn = env(certArn)' -i charts/common/ingress/cognito/values.yaml + yq e '.alb.cognito.UserPoolArn = env(CognitoUserPoolArn)' -i charts/common/ingress/cognito/values.yaml + yq e '.alb.cognito.UserPoolDomain = env(CognitoUserPoolDomain)' -i charts/common/ingress/cognito/values.yaml + yq e '.alb.cognito.appClientId = env(CognitoAppClientId)' -i charts/common/ingress/cognito/values.yaml + ``` + + 1. Substitute values for setting up AWS authservice. - 1. ```bash - printf ' - LOGOUT_URL='$CognitoLogoutURL' - ' > awsconfigs/common/aws-authservice/base/params.env - ``` + 1. Kustomize + 1. ```bash + printf ' + LOGOUT_URL='$CognitoLogoutURL' + ' > awsconfigs/common/aws-authservice/base/params.env + ``` + 1. Helm + 1. ```bash + yq e '.LOGOUT_URL = env(CognitoLogoutURL)' -i charts/common/aws-authservice/values.yaml + ``` 1. Follow the [Configure Load Balancer Controller]({{< ref "/docs/add-ons/load-balancer/guide.md#configure-load-balancer-controller" >}}) section of the load balancer guide to setup the resources required the load balancer controller. ## 4.0 Building manifests and deploying Kubeflow From d0a6606b382105372738a19ca20e240c0000d5ec Mon Sep 17 00:00:00 2001 From: jsitu Date: Thu, 29 Sep 2022 17:17:09 -0700 Subject: [PATCH 2/2] modify format to tabplane --- .../docs/deployment/cognito/manifest/guide.md | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/website/content/en/docs/deployment/cognito/manifest/guide.md b/website/content/en/docs/deployment/cognito/manifest/guide.md index 9a6e6b2467..1b615232a2 100644 --- a/website/content/en/docs/deployment/cognito/manifest/guide.md +++ b/website/content/en/docs/deployment/cognito/manifest/guide.md @@ -80,35 +80,37 @@ From this point onwards, we will be creating/updating the DNS records **only in export CognitoLogoutURL="https://$CognitoUserPoolDomain/logout?client_id=$CognitoAppClientId&logout_uri=$signOutURL" ``` 1. Substitute values for setting up Ingress. - 1. Kustomize - 1. ```bash - printf ' - CognitoUserPoolArn='$CognitoUserPoolArn' - CognitoAppClientId='$CognitoAppClientId' - CognitoUserPoolDomain='$CognitoUserPoolDomain' - certArn='$certArn' - ' > awsconfigs/common/istio-ingress/overlays/cognito/params.env - ``` - 1. Helm - 1. ```bash - yq e '.alb.certArn = env(certArn)' -i charts/common/ingress/cognito/values.yaml - yq e '.alb.cognito.UserPoolArn = env(CognitoUserPoolArn)' -i charts/common/ingress/cognito/values.yaml - yq e '.alb.cognito.UserPoolDomain = env(CognitoUserPoolDomain)' -i charts/common/ingress/cognito/values.yaml - yq e '.alb.cognito.appClientId = env(CognitoAppClientId)' -i charts/common/ingress/cognito/values.yaml - ``` + +{{< tabpane persistLang=false >}} +{{< tab header="Kustomize" lang="toml" >}} +printf ' +CognitoUserPoolArn='$CognitoUserPoolArn' +CognitoAppClientId='$CognitoAppClientId' +CognitoUserPoolDomain='$CognitoUserPoolDomain' +certArn='$certArn' +' > awsconfigs/common/istio-ingress/overlays/cognito/params.env +{{< /tab >}} +{{< tab header="Helm" lang="yaml" >}} +yq e '.alb.certArn = env(certArn)' -i charts/common/ingress/cognito/values.yaml +yq e '.alb.cognito.UserPoolArn = env(CognitoUserPoolArn)' -i charts/common/ingress/cognito/values.yaml +yq e '.alb.cognito.UserPoolDomain = env(CognitoUserPoolDomain)' -i charts/common/ingress/cognito/values.yaml +yq e '.alb.cognito.appClientId = env(CognitoAppClientId)' -i charts/common/ingress/cognito/values.yaml +{{< /tab >}} +{{< /tabpane >}} 1. Substitute values for setting up AWS authservice. - 1. Kustomize - 1. ```bash - printf ' - LOGOUT_URL='$CognitoLogoutURL' - ' > awsconfigs/common/aws-authservice/base/params.env - ``` - 1. Helm - 1. ```bash - yq e '.LOGOUT_URL = env(CognitoLogoutURL)' -i charts/common/aws-authservice/values.yaml - ``` +{{< tabpane persistLang=false >}} +{{< tab header="Kustomize" lang="toml" >}} +printf ' +LOGOUT_URL='$CognitoLogoutURL' +' > awsconfigs/common/aws-authservice/base/params.env +{{< /tab >}} +{{< tab header="Helm" lang="yaml" >}} +yq e '.LOGOUT_URL = env(CognitoLogoutURL)' -i charts/common/aws-authservice/values.yaml +{{< /tab >}} +{{< /tabpane >}} + 1. Follow the [Configure Load Balancer Controller]({{< ref "/docs/add-ons/load-balancer/guide.md#configure-load-balancer-controller" >}}) section of the load balancer guide to setup the resources required the load balancer controller. ## 4.0 Building manifests and deploying Kubeflow