From af531520d99e44ff2ef61811397b98023d377ee1 Mon Sep 17 00:00:00 2001 From: Murali Krishnasamy Date: Wed, 1 Nov 2023 17:34:56 -0400 Subject: [PATCH] added metadata for dash --- Dockerfile | 20 ++++++++++++++++++++ libs/platforms/rosa/terraform/terraform.py | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1b9510a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +FROM python:3.11 as runtime +USER root +RUN curl -L https://go.dev/dl/go1.18.2.linux-amd64.tar.gz -o go1.18.2.linux-amd64.tar.gz +RUN tar -C /usr/local -xzf go1.18.2.linux-amd64.tar.gz +ENV PATH=$PATH:/usr/local/go/bin +RUN python3 -m pip install --upgrade pip || true +RUN yes | pip3 install openshift --upgrade || true +RUN apt-get -y update +RUN apt-get -y install jq +RUN curl -L $(curl -s https://api.github.com/repos/openshift/rosa/releases/latest | jq -r ".assets[] | select(.name == \"rosa-linux-amd64\") | .browser_download_url") --output /usr/local/bin/rosa +RUN curl -L $(curl -s https://api.github.com/repos/openshift-online/ocm-cli/releases/latest | jq -r ".assets[] | select(.name == \"ocm-linux-amd64\") | .browser_download_url") --output /usr/local/bin/ocm +RUN chmod +x /usr/local/bin/rosa && chmod +x /usr/local/bin/ocm +RUN /usr/local/bin/rosa download openshift-client +RUN tar xzvf openshift-client-linux.tar.gz +RUN mv oc kubectl /usr/local/bin/ +RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" +RUN unzip awscliv2.zip +RUN ./aws/install +RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash +COPY . / diff --git a/libs/platforms/rosa/terraform/terraform.py b/libs/platforms/rosa/terraform/terraform.py index dded024..31baad3 100644 --- a/libs/platforms/rosa/terraform/terraform.py +++ b/libs/platforms/rosa/terraform/terraform.py @@ -310,6 +310,9 @@ def create_cluster(self, platform, cluster_name): cluster_info = platform.environment["clusters"][cluster_name] cluster_info["uuid"] = self.environment["uuid"] cluster_info["install_method"] = "terraform" + cluster_info["per_template_count"] = platform.environment['clusters_per_apply'] + cluster_info["tf_count"] = platform.environment['clusters_per_apply_count'] + cluster_info["total_count"] = platform.environment['cluster_count'] self.logging.info(f"Creating cluster {cluster_info['index']} on ROSA with name {cluster_name} and {cluster_info['workers']} workers") cluster_info["path"] = platform.environment["path"] + "/" + cluster_name os.mkdir(cluster_info["path"])