Release 1.0.3-GA (#148)

* Fix: removed docker secrets * updated the grafana_secrete * Feat: updated image tags according to release 1.1.0 * Issue #171 feat: update job to deployment for jobmanagers * #90 fix: Add default value for published_date in tables (#94) * fix: remove restart policy from flink deployment manifest (#96) * #196 Fix:Remove default region. (#95) * fix: #196 remove default value for region * update: #196 missing variable in variables.tf file * #196 update: example on how provide region * #196 update: comments on how to provide region * Separation of redis into dedup & meta/denorm. (#92) * feat: Separation of redis into dedup & meta/denorm. * feat: Separation of redis into dedup & meta/denorm. * feat: Separation of redis into dedup & meta/denorm. * feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * develop into release 1.3.0 (#97) * #90 fix: Add default value for published_date in tables (#94) * fix: remove restart policy from flink deployment manifest (#96) * #196 Fix:Remove default region. (#95) * fix: #196 remove default value for region * update: #196 missing variable in variables.tf file * #196 update: example on how provide region * #196 update: comments on how to provide region * Separation of redis into dedup & meta/denorm. (#92) * feat: Separation of redis into dedup & meta/denorm. * feat: Separation of redis into dedup & meta/denorm. * feat: Separation of redis into dedup & meta/denorm. * feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. * #58 feat: Separation of redis into dedup & meta/denorm. --------- Co-authored-by: Praveen Veleneni <[email protected]> Co-authored-by: Manoj Krishna <[email protected]> Co-authored-by: Sowmya N Dixit <[email protected]> * #126 feat: add new property to datasources table (#99) * #126 feat: add new property to datasources table * #126 fix: allow property to be nullable * #0000 - feat: Fix masterdata stats ingestion spec (#100) * #0000 - feat: Fix masterdata stats ingestion spec * #0000 - feat: Add latency and processing times * #0000 - feat: Flink helm configuration changes (#103) * #0000 - feat: Flink helm configuration changes * #0000 - feat: Ingestion spec changes for system-events * #0000 - feat: Remove outdated ingestion specs * #0000 - feat: Secor changes for unified failed topic (#104) * feat: azure terraform changes to provision cluster (#106) * feat: azure terraform changes to provision cluster * cleanup azure terraform code * update node count and instance size for azure (#107) * Issue #305 feat: exclude system-events for the datasource validation (#108) * Issue #0000 fix: system events ingestion spec typo fix (#105) * Issue #0000 fix: system events ingestion spec typo fix * Issue #0000 fix: system-events ingestion spec update to add dataset_type * #0 fix: add unique relation for source config table (#110) * feat new image tags (#112) * * #0000 - feat: Fix masterdata stats ingestion spec * #0000 - feat: Add latency and processing times * * #0000 - feat: Flink helm configuration changes * #0000 - feat: Ingestion spec changes for system-events * #0000 - feat: Remove outdated ingestion specs * #000: Rebased the develop with release-1.0.0-GA * #0000 - feat: Import error dashboard (#119) * [ Secor Timzone ] - Infra automation changes to take the timezone property (#120) * #000: Configuring the helm to handle the instance level timezone * Removed the unwanted timezone properties * #203: Removed the commented code * #226 Feat: Update postgres migrations to add system settings and default values (#121) * #226 fix: add system_settings table * #226 fix: Add data encryption key to PostgreSQL migration * #226 fix: move system settings new migration script * update tags for ga release and fix undeclared variable in secor (#122) * System Telemetry Events Ingestion Spec and Backup Configurations (#118) * #223: Configured the auto submission of telemetry events ingestion spec and configured the secor backup for system telemetry events * #223: Updated the secor jobs variabl by including system-telemetry-events process * #203: typo error fix * #203: Configured the flag to submit the ingestion spec * #203: Configured the flag to submit the ingestion spec * #67 fix: add grant permissions for created table (#123) * #172 feat: add outputs for kafka service (#130) * #172 feat: add outputs for kafka service (#132) * #245 feat: Update Druid, PostgreSQL, and Superset versions (#133) * #0 feat: Update Druid, PostgreSQL, and Superset versions * #245 fix: Grant all privileges on schema to superset and druid_raw * #245 fix: Update database ownership in migration scripts * #241 Enhance Infrastructure Flexibility, Deployment Reliability, and Observability (#131) * #241:feat: Infra automation script * #241 feat: Toggle vpc creation, Toggle velero user creation * update: #241 main.tf for velero user creation * remove: #241 revert automation script changes * update: #241 Toggle to change service type and dataset api cm bug fix * #241:feat: Updated the infra setup shell script * #241:doc: Updated the setup doc file * #241:doc: Updated the setup doc file and removed commented code * #241:doc: Added the Prerequisites section * feat: #241 Toggle to enable cloudwatch logs for EKS * feat: #241 Deployment changes to provision infra * feat: # 241 Deployment script for provisioning infra * clean: #241 remove unwanted code. * update: #241 update helm version in shell script and remove overrides.tfvars file * enhance: #241 Enhance shell script create a tfvars from setup.conf file * fix: #241 typo in displayed message, fix terraform installation command * update: #241 eks cluster version * update: #241 kuberentes service type * update: #241 kubernetes service type to loadbalancer * Update helm version --------- Co-authored-by: Manjunath Davanam <[email protected]> * update: AKS cluster version (#134) * bug fix: #241 region typo and modify shell script (#135) * bug fix: #241 region typo and modify shell script * Bug fix: #241 modify velero module * Installation fixes (#138) * fix: installation-fixes and enhancements * update: [1/2] Enabling cluster logs by default. [2/2] Creating vpc, kong ingress, velero user by default * feat: Enable kafka connector and fix class name for kafka connector * update: add decrypt command * upgrade: eks version * dummy commit to reflect changes * dummy commit to reflect changes * modify desired node capacity * revert node capacity changes * #0000 upgrade eks add ons (#144) * #0000 update granularity for system events and system telemetry events (#145) * #0000 update granularity for system events and system telemetry events * code refactoring Signed-off-by: SurabhiAngadi <[email protected]> * code refactoring Signed-off-by: SurabhiAngadi <[email protected]> * feat: added cluster-overrides.tfvars Signed-off-by: SurabhiAngadi <[email protected]> --------- Signed-off-by: SurabhiAngadi <[email protected]> Co-authored-by: SurabhiAngadi <[email protected]> * fix: Update default max.message.bytes configuration of kafka topic to 10mb. (#147) * Installation fixes (#146) * #000:feat: Updated the obsrv automation script * #000:feat: Updated the obsrv automation script * #000:feat: Updated the configurations * #00 fix: update gcp automation scripts * #00 fix: update gcp installation instructions * feat: azure os helm chart * #0000 update aks node count. --------- Co-authored-by: Ravi Mula <[email protected]> Co-authored-by: ManojKrishnaChintaluri <[email protected]> --------- Signed-off-by: SurabhiAngadi <[email protected]> Co-authored-by: GayathriSrividya <[email protected]> Co-authored-by: divyagovindaiah <[email protected]> Co-authored-by: Manjunath Davanam <[email protected]> Co-authored-by: Praveen <[email protected]> Co-authored-by: Manoj Krishna <[email protected]> Co-authored-by: Sowmya N Dixit <[email protected]> Co-authored-by: Anand Parthasarathy <[email protected]> Co-authored-by: Ravinder Kumar <[email protected]> Co-authored-by: SurabhiAngadi <[email protected]> Co-authored-by: ManojKrishnaChintaluri <[email protected]>
Sanketika-Obsrv · Feb 16, 2024 · 352c533 · 352c533
1 parent 5d9c6b8
commit 352c533
Show file tree

Hide file tree

Showing 888 changed files with 176,842 additions and 168 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,9 +13,7 @@ crash.*.log
 # password, private keys, and other secrets. These should not be part of version
 # control as they are data points which are potentially sensitive and subject
 # to change depending on the environment.
-*.tfvars
 *.tfvars.json
-!overrides.tfvars
 
 # Ignore override files as they are usually used to override resources locally and so
 # are not checked in

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ terragrunt apply
 
 ```
 gcloud init
-gcloud auth login
+gcloud auth application-default login
 ```
 
 3. Install additional dependencies to authenticate with GKE. Please see [Installing the gke-gcloud-auth-plugin](https://cloud.google.com/kubernetes-engine/docs/how-to/cluster-access-for-kubectl) for reference.
@@ -49,7 +49,7 @@ gcloud components install gke-gcloud-auth-plugin
 4. Create a project and export it as variable. Please see [Creating and Managing Projects](https://cloud.google.com/resource-manager/docs/creating-managing-projects) for reference.
 
 ```
-export GOOGLE_CLOUD_PROJECT=myproject
+export GOOGLE_PROJECT_ID=myproject
 export GOOGLE_TERRAFORM_BACKEND_BUCKET=mybucket
 ```
 
@@ -60,8 +60,8 @@ In order to complete the installation, please run the below steps in the same te
 ```
 cd terraform/gcp
 terragrunt init
-terragrunt plan
-terragrunt apply
+terragrunt plan --var-file=vars/cluster_overrides.tfvars
+terragrunt apply --var-file=vars/cluster_overrides.tfvars
 ```
 
 ## Azure

diff --git a/automation-scripts/infra-setup/obsrv.conf b/automation-scripts/infra-setup/obsrv.conf
@@ -0,0 +1,7 @@
+# setup.conf
+AWS_ACCESS_KEY_ID=""
+AWS_SECRET_ACCESS_KEY=""
+AWS_DEFAULT_REGION="us-east-2"
+KUBE_CONFIG_PATH="$HOME/.kube/obsrv_config"
+AWS_TERRAFORM_BACKEND_BUCKET_NAME="obsrv-tfstate"
+AWS_TERRAFORM_BACKEND_BUCKET_REGION="us-east-2"
diff --git a/automation-scripts/infra-setup/obsrv.sh b/automation-scripts/infra-setup/obsrv.sh
@@ -0,0 +1,201 @@
+#!/bin/bash
+
+# Function to install Obsrv
+install_obsrv() {
+    echo "Obsrv installation has started.."
+    terragrunt init
+    terragrunt apply -target module.eks -var-file=vars/cluster_overrides.tfvars -auto-approve
+    terragrunt apply -target module.get_kubeconfig -var-file=vars/cluster_overrides.tfvars -auto-approve
+    terragrunt apply -var-file=vars/cluster_overrides.tfvars -auto-approve
+    echo "Installation completed successfully!"
+}
+
+# Function to destroy Obsrv
+destroy_obsrv() {
+    echo "Destroying Obsrv..."
+    terragrunt destroy -var-file=vars/cluster_overrides.tfvars -auto-approve
+    echo "Obsrv has been successfully destroyed."
+}
+
+version_compare() {
+    local version1="$1"
+    local version2="$2"
+    IFS='.' read v1_major v1_minor v1_patch <<< "$version1"
+    IFS='.' read v2_major v2_minor v2_patch <<< "$version2"
+
+    if [ "$v1_major" -gt "$v2_major" ] || [ "$v1_major" -eq "$v2_major" -a "$v1_minor" -gt "$v2_minor" ] || [ "$v1_major" -eq "$v2_major" -a "$v1_minor" -eq "$v2_minor" -a "$v1_patch" -ge "$v2_patch" ]; then
+        echo true  
+    else
+        echo false
+    fi
+}
+
+# Function to get installed version
+get_installed_version() {
+    local version_command="$1"
+    if [ -n "$version_command" ]; then
+        installed_version=$(eval "$version_command")
+        echo "$installed_version"
+    else
+        echo "0.0.0" 
+    fi
+}
+
+
+install_tool() {
+    local tool_name="$1"
+    local install_command="$2"
+    local version_command="$3"
+    local required_version="$4"
+
+    installed_version=$(get_installed_version "$version_command")
+    compare_result=$(version_compare "$installed_version" "$required_version")
+    if [ "$compare_result" == "true" ]; then
+        echo "$tool_name is already installed with supported version $installed_version"
+        return
+    else
+        echo "$tool_name tool version $required_version is missing, but the installed version is $installed_version. Would you like to install the stable version of $tool_name? (yes/no)"
+        read -r response
+
+        if [ "$response" == "yes" ]; then
+            echo "Installing $tool_name..."
+            eval "$install_command"
+
+            # Check if the installation was successful
+            if [ $? -eq 0 ]; then
+                echo "$tool_name installed successfully."
+                if [ -n "$version_command" ]; then
+                    installed_version=$(get_installed_version "$version_command")
+                    echo "Version: $installed_version"
+                fi
+            else
+                echo "Error: Failed to install $tool_name. Please install it manually before proceeding."
+                exit 1
+            fi
+        else
+            echo "Skipping installation of $tool_name."
+        fi
+    fi    
+}
+
+# Function to validate and install required tools
+validate_and_install_tools() {
+    # Define all the required tools with version
+    tool_versions=(
+        "aws:2.13.8"
+        "helm:3.10.2"
+        "terraform:1.5.7"
+        "terrahelp:0.7.5"
+        "terragrunt:0.45.6"
+    )
+
+    for tool_version in "${tool_versions[@]}"; do
+        IFS=':' read -r tool required_version <<< "$tool_version"
+        case $tool in
+            "aws")
+                aws_version="aws --version | awk 'NR==1{print \$1}' | cut -d'/' -f2"
+                install_tool "$tool" 'curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip && sudo ./aws/install -i /usr/local/aws-cli -b /usr/local/bin' "$aws_version" "$required_version"
+                ;;
+            "helm")
+                helm_version="helm version --short | awk -F'[v+]' '/v/{print \$2}'"
+                install_tool "$tool" 'curl https://get.helm.sh/helm-v3.10.2-linux-amd64.tar.gz -o helm.tar.gz && tar -zxvf helm.tar.gz && sudo mv linux-amd64/helm /usr/local/bin/' "$helm_version" "$required_version"
+                ;;
+            "terraform")
+                terraform_version='terraform version | awk '\''/Terraform/{gsub(/[^0-9.]/, "", $2); print $2}'\'''
+                install_tool "terraform" 'curl -LO "https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_linux_amd64.zip" -o "terraform.zip" && unzip terraform_1.5.7_linux_amd64.zip && sudo mv terraform /usr/local/bin/' "$terraform_version" "$required_version"
+                ;;
+            "terrahelp")
+                terrahelp_version='terrahelp --version | awk '\''/terrahelp version/ {print $3}'\'''
+                install_tool "$tool" 'curl -OL https://github.com/opencredo/terrahelp/releases/download/v0.4.3/terrahelp-linux-amd64 && mv terrahelp-linux-amd64 /usr/local/bin/terrahelp && chmod +x /usr/local/bin/terrahelp' "$terrahelp_version" "$required_version"
+                ;;
+            "terragrunt")
+                terragrunt_version='terragrunt --version | awk '\''/terragrunt version/ {gsub(/v/, "", $3); print $3}'\'''
+                install_tool "$tool" 'curl -OL https://github.com/gruntwork-io/terragrunt/releases/download/v0.45.8/terragrunt_linux_amd64 && mv terragrunt_linux_amd64 /usr/local/bin/terragrunt && chmod +x /usr/local/bin/terragrunt' "$terragrunt_version" "$required_version"
+                ;;
+        esac
+    done
+
+    echo "All required tools are installed. Proceeding with the rest of the script..."
+}
+
+# Main script
+if [ $# -lt 1 ]; then
+    echo "Usage: $0 [install|destroy] --config <config_file> [--install_dependencies true|false]"
+    exit 1
+fi
+
+action=""
+config_file=""
+install_dependencies="false"
+
+# Parse command-line arguments
+while [[ $# -gt 0 ]]; do
+    key="$1"
+    case $key in
+        install|destroy)
+            action="$1"
+            ;;
+        --config)
+            config_file="$2"
+            shift
+            ;;
+        --install_dependencies)
+            install_dependencies="$2"
+            shift
+            ;;
+        *)
+            echo "Invalid option: $key"
+            exit 1
+            ;;
+    esac
+    shift
+done
+
+# Validate action
+if [ -z "$action" ]; then
+    echo "Error: Action (install/destroy) not specified."
+    exit 1
+fi
+
+# Validate config file
+if [ -z "$config_file" ]; then
+    echo "Error: Config file not provided."
+    exit 1
+elif [ ! -f "$config_file" ]; then
+    echo "Error: Config file '$config_file' not found."
+    exit 1
+fi
+
+# Source the config file
+source "$config_file" || { echo "Error: Failed to load $config_file."; exit 1; }
+
+# Set up AWS environment variables
+echo "Environment is updated with secrets"
+export AWS_TERRAFORM_BACKEND_BUCKET_NAME=$AWS_TERRAFORM_BACKEND_BUCKET_NAME
+export AWS_TERRAFORM_BACKEND_BUCKET_REGION=$AWS_TERRAFORM_BACKEND_BUCKET_REGION
+export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
+export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
+export AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION
+export KUBE_CONFIG_PATH=$KUBE_CONFIG_PATH
+export KUBECONFIG=$KUBE_CONFIG_PATH
+
+# Install dependencies if required
+if [[ "$install_dependencies" == "true" ]]; then
+    validate_and_install_tools
+fi
+
+# Proceed with the specified action
+cd ../../terraform/aws
+case "$action" in
+    install)
+        install_obsrv
+        ;;
+    destroy)
+        destroy_obsrv
+        ;;
+    *)
+        echo "Invalid command. Usage: $0 [install|destroy] --config <config_file> [--install_dependencies true|false]"
+        exit 1
+        ;;
+esac
+
diff --git a/automation-scripts/infra-setup/setup.conf b/automation-scripts/infra-setup/setup.conf
@@ -1,23 +1,7 @@
 # setup.conf
-AWS_ACCESS_KEY_ID="access_key"
-AWS_SECRET_ACCESS_KEY="secret_key"
-AWS_DEFAULT_REGION="region"
-KUBE_CONFIG_PATH="$HOME/.kube/config"
-AWS_TERRAFORM_BACKEND_BUCKET_NAME="bucket_name"
-AWS_TERRAFORM_BACKEND_BUCKET_REGION="region" # eu-west-1
-# Other prompt configuration
-EKS_NODES_SUBNET_IDS='[""]'
-EKS_MASTER_SUBNET_IDS='[""]'
-VELERO_AWS_ACCESS_KEY_ID="access_key"
-VELERO_AWS_SECRET_ACCESS_KEY="secret_key"
-SERVICE_TYPE="LoadBalancer"
-VPC_ID=""
-AVAILABILITY_ZONES='[""]' # ["eu-west-1a","eu-west-1b","eu-west-1c"]
-BUILDING_BLOCK="" # obsrv
-ENV="" # dev
-REGION="" # eu-west-1
-TIMEZONE="UTC"
-ALLOW_VPC_CREATION=true # It will creates VPC, Subnets.
-ALLOW_VELERO_USER_CREATION=true # It will create velero user
-ALLOW_KONG_INGRESS_SETUP=true # It will setup kong ingress
-# Add more variables as needed
+AWS_ACCESS_KEY_ID=""
+AWS_SECRET_ACCESS_KEY=""
+AWS_DEFAULT_REGION="us-east-2"
+KUBE_CONFIG_PATH="$HOME/.kube/obsrv_config"
+AWS_TERRAFORM_BACKEND_BUCKET_NAME="obsrv-tfstate"
+AWS_TERRAFORM_BACKEND_BUCKET_REGION="us-east-2" # eu-west-1
diff --git a/automation-scripts/infra-setup/setup.sh b/automation-scripts/infra-setup/setup.sh
@@ -128,60 +128,75 @@ setup_kube_config() {
 
 # Check if the config file is provided as a command-line argument
 if [ $# -eq 0 ]; then
-    echo "Usage: $0 <config_file>"
+   echo "Usage: $0 <config_file> install_dependencies=<true/false>"
     exit 1
 fi
 
 # Store the configuration file path
 config_file="$1"
+install_tools="$2"
+
+for arg in "$@"; do
+    case "$arg" in
+        *=*)
+            key=${arg%%=*}
+            value=${arg#*=}
+            case "$key" in
+                install_dependencies)
+                    if [[ "$value" == "true" || "$value" == "false" ]]; then
+                        install_tools="$value"
+                    else
+                        echo "Invalid value for $key: $value. Should be 'true' or 'false'."
+                        exit 1
+                    fi
+                    ;;
+                *)
+                    echo "Invalid parameter: $key"
+                    exit 1
+                    ;;
+            esac
+            ;;
+        *)
+            config_file="$arg"
+            ;;
+    esac
+done
+
 
 # Check if the config file exists
 if [ ! -f "$config_file" ]; then
     echo "Error: Config file '$config_file' not found."
     exit 1
 fi
 
+# Check if the boolean value is true or false
+if [ "$install_tools" = "true" ]; then
+    echo "Will verify and install the tool or you can manually still install all the tools..."
+    validate_tools
+fi
+
+if [ -z "$config_file" ]; then
+  echo "Usage: $0 <config_file> install_dependencies=<true/false>"
+  exit 1
+fi
+
 # Read and set variables from the config file
 source "$config_file"
 
 # Set up AWS environment variables
-echo "Setup Infra configurations"
+echo "Environment is updated with secrets"
 export AWS_TERRAFORM_BACKEND_BUCKET_NAME=$AWS_TERRAFORM_BACKEND_BUCKET_NAME
 export AWS_TERRAFORM_BACKEND_BUCKET_REGION=$AWS_TERRAFORM_BACKEND_BUCKET_REGION
 export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
 export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
 export AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION
 export KUBE_CONFIG_PATH=$KUBE_CONFIG_PATH
-tfvars_file="../../terraform/aws/vars/overrides.tfvars"
-
-# Create the tfvars file
-cat <<EOF > "$tfvars_file"
-eks_nodes_subnet_ids = $EKS_NODES_SUBNET_IDS
-eks_master_subnet_ids = $EKS_MASTER_SUBNET_IDS
-velero_aws_access_key_id = "$VELERO_AWS_ACCESS_KEY_ID"
-velero_aws_secret_access_key = "$VELERO_AWS_SECRET_ACCESS_KEY"
-service_type = "$SERVICE_TYPE"
-vpc_id = "$VPC_ID"
-availability_zones = $AVAILABILITY_ZONES
-building_block  = "$BUILDING_BLOCK"
-env = "$ENV"
-region = "$REGION"
-timezone = "$TIMEZONE"
-create_vpc = "$ALLOW_VPC_CREATION"
-create_velero_user = "$ALLOW_VELERO_USER_CREATION"
-create_kong_ingress = "$ALLOW_KONG_INGRESS_SETUP"
-EOF
-
-echo "terraform.tfvars file created successfully at $tfvars_file."
-
-validate_tools
-#setup_kube_config - TODO - Required to verify 
-
-# Script related to terraform and deployment will start from here
+export KUBECONFIG=$KUBE_CONFIG_PATH
+
+
 cd ../../terraform/aws
-terrahelp decrypt  -simple-key=<decryption_key> -file=vars/dev.tfvars
+echo "Obsrv installation has started.."
 terragrunt init
-terragrunt apply -target module.eks -var "create_vpc=$ALLOW_VPC_CREATION" -var "create_velero_user=$ALLOW_VELERO_USER_CREATION"  -var-file=vars/dev.tfvars -var-file=vars/overrides.tfvars -auto-approve
-terragrunt apply -target module.get_kubeconfig -var "create_vpc=$ALLOW_VPC_CREATION" -var "create_velero_user=$ALLOW_VELERO_USER_CREATION"  -var-file=vars/dev.tfvars -var-file=vars/overrides.tfvars -auto-approve
-terragrunt apply  -var "create_vpc=$ALLOW_VPC_CREATION" -var "create_velero_user=$ALLOW_VELERO_USER_CREATION"  -var-file=vars/dev.tfvars -var-file=vars/overrides.tfvars -auto-approve
-
+terragrunt apply -target module.eks -var-file=vars/cluster_overrides.tfvars -auto-approve
+terragrunt apply -target module.get_kubeconfig -var-file=vars/cluster_overrides.tfvars -auto-approve
+terragrunt apply -var-file=vars/cluster_overrides.tfvars -auto-approve