Merge pull request #33 from cloudera/hotfix/2.1.0

Hotfix/2.1.0

Author: kuldeepsahu1105

ClouderaPublicCloudOnBoarding/AWS/README.adoc

@@ -91,7 +91,7 @@ image::build/images/gen_access_key_1.png[access_key1, 360, 240]
 ksahu@Kuldeeps-MacBook-Air build % cdp configure
 CDP Access Key ID [None]: CDPEXAMPLEACCESSKEY
 CDP Private Key [None]: myPSEcdpPrivateKEy/Sample123456xyz
-CDP Region [None]: <Enter>
+CDP Region [us-west-1]: <Enter_OR_Provide_Override_Value>
 CDP Endpoint URL (blank for public cloud) [None]: <Enter>
 ksahu@Kuldeeps-MacBook-Air build % 
 

ClouderaPublicCloudOnBoarding/AWS/build/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.0] - 2024-11-15
+
+### Changed
+- Updated code to parameterize the cdp-tf-quickstart version while building the Docker image, could be passed externally as docker build-args
+
 ## [2.0.0] - 2024-10-09
 
 ### Added

ClouderaPublicCloudOnBoarding/AWS/build/Dockerfile

@@ -3,12 +3,14 @@
 FROM ubuntu:22.04
 
 ARG TF_VER=1.9.3
+ARG TF_QUICKSTART_VERSION=v0.8.5
 # Directory for storing scripts.
 RUN mkdir -p /opt/cdp-public-cloud-automation
 
 # Setting Up Environment Variable.
 ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
 ENV HOME_DIR="/opt/cdp-public-cloud-automation"
+ENV TF_QUICKSTART_VERSION=${TF_QUICKSTART_VERSION}
 
 # Installing Required Packages.
 RUN apt-get update && \

ClouderaPublicCloudOnBoarding/AWS/build/entrypoint/hol-functions.sh

@@ -2,7 +2,7 @@
 # *************************************************************************************************************#
 # Setting required path and variables.
 
-TF_QUICKSTART_VERSION=0.8.0
+#TF_QUICKSTART_VERSION=v0.8.0
 USER_CONFIG_FILE="/userconfig/configfile"
 KEYGEN_TF_CONFIG_DIR=$HOME_DIR/cdp-wrkshps-quickstarts/keypair_gen
 KC_TF_CONFIG_DIR=$HOME_DIR/cdp-wrkshps-quickstarts/cdp-kc-config/keycloak_terraform_config
@@ -616,7 +616,7 @@ provision_cdp() {
    sleep 10
    USER_NAMESPACE=$workshop_name
    mkdir -p /userconfig/.$USER_NAMESPACE
-   git clone https://github.com/cloudera-labs/cdp-tf-quickstarts.git -b v$TF_QUICKSTART_VERSION --single-branch --depth 1 /userconfig/.$USER_NAMESPACE/cdp-tf-quickstarts &>/dev/null
+   git clone https://github.com/cloudera-labs/cdp-tf-quickstarts.git -b $TF_QUICKSTART_VERSION --single-branch --depth 1 /userconfig/.$USER_NAMESPACE/cdp-tf-quickstarts &>/dev/null
    cd /userconfig/.$USER_NAMESPACE/cdp-tf-quickstarts
    git sparse-checkout init --cone
    git sparse-checkout set aws