Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Express onboarding fixes #48

Merged
merged 4 commits into from
Oct 9, 2024
Merged

Express onboarding fixes #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
811bdc3
CB-27430 Change the data lake created by Express Onboarding to light …
daszabo Oct 7, 2024
a114ba3
CB-27431 Move AWS Express Onboarding to CDP quickstart branch 0.8.2
daszabo Oct 7, 2024
13a6e3b
CB-27432 azurerm requires subscription ID to be provided explicitly
daszabo Oct 7, 2024
2be1528
CB-27431 Move AWS Express Onboarding to CDP quickstart branch 0.8.3
daszabo Oct 9, 2024
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
28 changes: 22 additions & 6 deletions aws/quickstart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ export TF_VAR_env_prefix="${2:-""}"
export ACCOUNT_ID="${3:-""}"
export CDP_REGION="${4:-"us-west-1"}"
export TF_VAR_deployment_template="${5:-"semi-private"}"
export TF_VAR_ingress_extra_cidrs_and_ports="${6:-"{ cidrs = [\"0.0.0.0/0\"], ports = [443, 22] }"}"
export TF_VAR_ingress_extra_cidrs_and_ports=${6:-"{ cidrs = [\"0.0.0.0/0\"], ports = [443, 22] }"}
export TF_VAR_env_tags='{"deploy_tool": "express-tf", "env_prefix": "'"$2"'"}'
export TF_VAR_create_vpc_endpoints="false"
export TF_VAR_environment_async_creation="true"
export TF_VAR_datalake_async_creation="true"
export TF_VAR_datalake_scale="LIGHT_DUTY"

# Save TF variables to file
output_file="variables.sh"
Expand All @@ -33,31 +34,46 @@ export TF_VAR_aws_region="${TF_VAR_aws_region}"
export TF_VAR_env_prefix="${TF_VAR_env_prefix}"
export ACCOUNT_ID="${ACCOUNT_ID}"
export TF_VAR_deployment_template="${TF_VAR_deployment_template}"
export TF_VAR_env_tags="${TF_VAR_env_tags}"
export TF_VAR_env_tags='${TF_VAR_env_tags}'
export TF_VAR_create_vpc_endpoints="${TF_VAR_create_vpc_endpoints}"
export TF_VAR_environment_async_creation="${TF_VAR_environment_async_creation}"
export TF_VAR_datalake_async_creation="${TF_VAR_datalake_async_creation}"
export TF_VAR_ingress_extra_cidrs_and_ports="${TF_VAR_ingress_extra_cidrs_and_ports}"
export TF_VAR_ingress_extra_cidrs_and_ports='${TF_VAR_ingress_extra_cidrs_and_ports}'
export TF_VAR_datalake_scale="${TF_VAR_datalake_scale}"
EOF

destroy_file="destroy.sh"

cat <<EOF > $destroy_file
cd cdp-tf-quickstarts/aws

source ${HOME}/variables.sh

${HOME}/terraform destroy -auto-approve
EOF

# Make the file executable
chmod +x $output_file
chmod +x $destroy_file

# Install Terraform
curl -fsSL https://releases.hashicorp.com/terraform/1.7.1/terraform_1.7.1_linux_amd64.zip -o terraform.zip
unzip -o terraform.zip -d ${HOME}
rm terraform.zip

# Checkout CDP Quickstart Repository
git clone --branch v0.7.2 https://github.com/cloudera-labs/cdp-tf-quickstarts.git
git clone --branch v0.8.3 https://github.com/cloudera-labs/cdp-tf-quickstarts.git
cd cdp-tf-quickstarts/aws

# Install CDP CLI and Log In
pip install cdpcli

config_file="${HOME}/.cdp/config"
region_config="cdp_region = ${CDP_REGION}"
echo "$region_config" >> "$config_file"
mkdir -p "$(dirname "$config_file")"
cat <<EOF > $config_file
[default]
cdp_region = ${CDP_REGION}
EOF

cdp login --account-id "${ACCOUNT_ID}" --use-device-code

Expand Down
2 changes: 1 addition & 1 deletion azure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ module "cdp_deploy" {
datalake_async_creation = var.datalake_async_creation

# From pre-reqs module output
azure_subscription_id = module.cdp_azure_prereqs.azure_subscription_id
azure_subscription_id = var.azure_subscription_id == null ? module.cdp_azure_prereqs.azure_subscription_id : var.azure_subscription_id
azure_tenant_id = module.cdp_azure_prereqs.azure_tenant_id

azure_resource_group_name = module.cdp_azure_prereqs.azure_resource_group_name
Expand Down
30 changes: 24 additions & 6 deletions azure/quickstart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ export TF_VAR_env_prefix="${2:-""}"
export ACCOUNT_ID="${3:-""}"
export CDP_REGION="${4:-"us-west-1"}"
export TF_VAR_deployment_template="${5:-"semi-private"}"
export TF_VAR_ingress_extra_cidrs_and_ports="${6:-"{ cidrs = [\"0.0.0.0/0\"], ports = [443, 22] }"}"
export TF_VAR_ingress_extra_cidrs_and_ports=${6:-"{ cidrs = [\"0.0.0.0/0\"], ports = [443, 22] }"}
export TF_VAR_env_tags='{"deploy_tool": "express-tf", "env_prefix": "'"$2"'"}'
export TF_VAR_environment_async_creation="true"
export TF_VAR_datalake_async_creation="true"
export TF_VAR_datalake_scale="LIGHT_DUTY"
export TF_VAR_azure_subscription_id="$(az account show --query id --output tsv)"

# Save TF variables to file
output_file="variables.sh"
Expand All @@ -32,25 +34,41 @@ export TF_VAR_azure_region="${TF_VAR_azure_region}"
export TF_VAR_env_prefix="${TF_VAR_env_prefix}"
export ACCOUNT_ID="${ACCOUNT_ID}"
export TF_VAR_deployment_template="${TF_VAR_deployment_template}"
export TF_VAR_env_tags="${TF_VAR_env_tags}"
export TF_VAR_env_tags='${TF_VAR_env_tags}'
export TF_VAR_environment_async_creation="${TF_VAR_environment_async_creation}"
export TF_VAR_datalake_async_creation="${TF_VAR_datalake_async_creation}"
export TF_VAR_ingress_extra_cidrs_and_ports="${TF_VAR_ingress_extra_cidrs_and_ports}"
export TF_VAR_ingress_extra_cidrs_and_ports='${TF_VAR_ingress_extra_cidrs_and_ports}'
export TF_VAR_datalake_scale="${TF_VAR_datalake_scale}"
export TF_VAR_azure_subscription_id="${TF_VAR_azure_subscription_id}"
EOF

destroy_file="destroy.sh"

cat <<EOF > $destroy_file
cd cdp-tf-quickstarts/azure

source ${HOME}/variables.sh

${HOME}/terraform destroy -auto-approve
EOF

# Make the file executable
chmod +x $output_file
chmod +x $destroy_file

# Checkout CDP Quickstart Repository
git clone --branch v0.7.2 https://github.com/cloudera-labs/cdp-tf-quickstarts.git
git clone --branch v0.8.3 https://github.com/cloudera-labs/cdp-tf-quickstarts.git
cd cdp-tf-quickstarts/azure

# Install CDP CLI and Log In
pip install cdpcli

config_file="${HOME}/.cdp/config"
region_config="cdp_region = ${CDP_REGION}"
echo "$region_config" >> "$config_file"
mkdir -p "$(dirname "$config_file")"
cat <<EOF > $config_file
[default]
cdp_region = ${CDP_REGION}
EOF

cdp login --account-id "${ACCOUNT_ID}" --use-device-code

Expand Down
8 changes: 8 additions & 0 deletions azure/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ variable "datalake_recipes" {
default = null
}

variable "azure_subscription_id" {
type = string

description = "The subscription where the environment should be deployed to"

default = null
}

# ------- Network Resources -------
variable "ingress_extra_cidrs_and_ports" {
type = object({
Expand Down
28 changes: 22 additions & 6 deletions gcp/quickstart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,39 +20,55 @@ export TF_VAR_env_prefix="${3:-""}"
export ACCOUNT_ID="${4:-""}"
export CDP_REGION="${5:-"us-west-1"}"
export TF_VAR_deployment_template="${6:-"semi-private"}"
export TF_VAR_ingress_extra_cidrs_and_ports="${7:-"{ cidrs = [\"0.0.0.0/0\"], ports = [443, 22] }"}"
export TF_VAR_ingress_extra_cidrs_and_ports=${6:-"{ cidrs = [\"0.0.0.0/0\"], ports = [443, 22] }"}
export TF_VAR_env_tags='{"deploy_tool": "express-tf", "env_prefix": "'"$2"'"}'
export TF_VAR_environment_async_creation="true"
export TF_VAR_datalake_async_creation="true"
export TF_VAR_datalake_scale="LIGHT_DUTY"

# Save TF variables to file
output_file="variables.sh"

cat <<EOF > $output_file
export TF_VAR_gcp_project="${TF_VAR_gcp_project}"
export TF_VAR_gcp_region="${TF_VAR_gcp_region}"
export TF_VAR_env_prefix="${TF_VAR_env_prefix}"
export TF_VAR_env_prefix='${TF_VAR_env_prefix}'
export ACCOUNT_ID="${ACCOUNT_ID}"
export TF_VAR_deployment_template="${TF_VAR_deployment_template}"
export TF_VAR_env_tags="${TF_VAR_env_tags}"
export TF_VAR_environment_async_creation="${TF_VAR_environment_async_creation}"
export TF_VAR_datalake_async_creation="${TF_VAR_datalake_async_creation}"
export TF_VAR_ingress_extra_cidrs_and_ports="${TF_VAR_ingress_extra_cidrs_and_ports}"
export TF_VAR_ingress_extra_cidrs_and_ports='${TF_VAR_ingress_extra_cidrs_and_ports}'
export TF_VAR_datalake_scale="${TF_VAR_datalake_scale}"
EOF

destroy_file="destroy.sh"

cat <<EOF > $destroy_file
cd cdp-tf-quickstarts/gcp

source ${HOME}/variables.sh

${HOME}/terraform destroy -auto-approve
EOF

# Make the file executable
chmod +x $output_file
chmod +x $destroy_file

# Checkout CDP Quickstart Repository
git clone --branch v0.7.2 https://github.com/cloudera-labs/cdp-tf-quickstarts.git
git clone --branch v0.8.3 https://github.com/cloudera-labs/cdp-tf-quickstarts.git
cd cdp-tf-quickstarts/gcp

# Install CDP CLI and Log In
pip install cdpcli

config_file="${HOME}/.cdp/config"
region_config="cdp_region = ${CDP_REGION}"
echo "$region_config" >> "$config_file"
mkdir -p "$(dirname "$config_file")"
cat <<EOF > $config_file
[default]
cdp_region = ${CDP_REGION}
EOF

cdp login --account-id "${ACCOUNT_ID}" --use-device-code

Expand Down
Loading