From 5a3fe77b3896204711b0b9cc36a53303db2bec5c Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 25 Aug 2024 10:16:04 +0100 Subject: [PATCH 1/6] Issue #33 - Upgrade the AWS Ansible Collection to version 8.1.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 374651e..40840e1 100644 --- a/Containerfile +++ b/Containerfile @@ -6,7 +6,7 @@ FROM quay.io/ansible/awx-ee:23.7.0 MAINTAINER Paul Podgorsek LABEL description Ansible AWX Execution Environment container with Cloud providers, Terraform, Kubernetes and other common tools. -ENV ANSIBLE_COLLECTION_AWS_VERSION 7.2.0 +ENV ANSIBLE_COLLECTION_AWS_VERSION 8.1.0 ENV ANSIBLE_COLLECTION_AZURE_VERSION v1.19.0 ENV ANSIBLE_COLLECTION_GCP_VERSION v1.3.0 ENV HELM_VERSION v3.14.0 From 8e2f5989f7279bd4311af181cc3119e2a6f388a5 Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 25 Aug 2024 10:23:09 +0100 Subject: [PATCH 2/6] Issue #34 - Upgrade the Azure Ansible Collection to version 2.6.0 --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 40840e1..5c0ff01 100644 --- a/Containerfile +++ b/Containerfile @@ -7,7 +7,7 @@ MAINTAINER Paul Podgorsek LABEL description Ansible AWX Execution Environment container with Cloud providers, Terraform, Kubernetes and other common tools. ENV ANSIBLE_COLLECTION_AWS_VERSION 8.1.0 -ENV ANSIBLE_COLLECTION_AZURE_VERSION v1.19.0 +ENV ANSIBLE_COLLECTION_AZURE_VERSION v2.6.0 ENV ANSIBLE_COLLECTION_GCP_VERSION v1.3.0 ENV HELM_VERSION v3.14.0 ENV JAVA_VERSION 21 @@ -29,7 +29,7 @@ RUN dnf upgrade -y > /dev/null \ RUN pip3 install -r https://raw.githubusercontent.com/ansible-collections/amazon.aws/${ANSIBLE_COLLECTION_AWS_VERSION}/requirements.txt # Cloud: Azure -RUN pip3 install -r https://raw.githubusercontent.com/ansible-collections/azure/${ANSIBLE_COLLECTION_AZURE_VERSION}/requirements-azure.txt +RUN pip3 install -r https://raw.githubusercontent.com/ansible-collections/azure/${ANSIBLE_COLLECTION_AZURE_VERSION}/requirements.txt # Cloud: Google Cloud Platform (GCP) RUN pip3 install -r https://raw.githubusercontent.com/ansible-collections/google.cloud/${ANSIBLE_COLLECTION_GCP_VERSION}/requirements.txt From bb19815a4d6331825f7215426d4635f6ed07814c Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 25 Aug 2024 10:23:38 +0100 Subject: [PATCH 3/6] Issue #35 - Upgrade Helm to version 3.15.4 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 5c0ff01..9ff5248 100644 --- a/Containerfile +++ b/Containerfile @@ -9,7 +9,7 @@ LABEL description Ansible AWX Execution Environment container with Cloud provide ENV ANSIBLE_COLLECTION_AWS_VERSION 8.1.0 ENV ANSIBLE_COLLECTION_AZURE_VERSION v2.6.0 ENV ANSIBLE_COLLECTION_GCP_VERSION v1.3.0 -ENV HELM_VERSION v3.14.0 +ENV HELM_VERSION v3.15.4 ENV JAVA_VERSION 21 ENV POSTGRESQL_VERSION 16 ENV TERRAFORM_VERSION 1.7.3 From 2e655cae1a0f46a45c42476ea802b60e67dd0c8c Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 25 Aug 2024 10:25:49 +0100 Subject: [PATCH 4/6] Issue #36 - Upgrade the base image to version 24.6.1 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 9ff5248..cb3b1d8 100644 --- a/Containerfile +++ b/Containerfile @@ -1,7 +1,7 @@ # The source of the parent container can be found here: # https://github.com/ansible/awx-ee -FROM quay.io/ansible/awx-ee:23.7.0 +FROM quay.io/ansible/awx-ee:24.6.1 MAINTAINER Paul Podgorsek LABEL description Ansible AWX Execution Environment container with Cloud providers, Terraform, Kubernetes and other common tools. From aff74323aef7631d2eea1e38654c44f1a1110528 Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 25 Aug 2024 10:41:24 +0100 Subject: [PATCH 5/6] Issue #37 - Upgrade Terraform to version 1.9.5 --- Containerfile | 6 +++--- README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Containerfile b/Containerfile index cb3b1d8..becbe27 100644 --- a/Containerfile +++ b/Containerfile @@ -3,7 +3,7 @@ FROM quay.io/ansible/awx-ee:24.6.1 -MAINTAINER Paul Podgorsek +MAINTAINER Paul Podgorsek LABEL description Ansible AWX Execution Environment container with Cloud providers, Terraform, Kubernetes and other common tools. ENV ANSIBLE_COLLECTION_AWS_VERSION 8.1.0 @@ -12,7 +12,7 @@ ENV ANSIBLE_COLLECTION_GCP_VERSION v1.3.0 ENV HELM_VERSION v3.15.4 ENV JAVA_VERSION 21 ENV POSTGRESQL_VERSION 16 -ENV TERRAFORM_VERSION 1.7.3 +ENV TERRAFORM_VERSION 1.9.5 USER root @@ -59,7 +59,7 @@ RUN pip3 install psycopg2-binary # Official documentation: https://developer.hashicorp.com/terraform/install RUN yum install -y yum-utils \ && yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo \ - && yum install -y terraform \ + && yum install -y terraform-${TERRAFORM_VERSION}* \ && yum clean all # Fix a bug in the runner's home directory diff --git a/README.md b/README.md index 12c12b6..dd9030a 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ It is based on the official Ansible AWX EE image and mainly includes: * Java 21 * Kubernetes & Helm * PostgreSQL 16 -* Terraform 1.7.3 +* Terraform 1.9.5 From 8d8dfa61053789b05d4cca9c6a5764b36d4fb45d Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 25 Aug 2024 10:42:32 +0100 Subject: [PATCH 6/6] Issue #38 - Kubernetes cannot be downloaded via yum --- conf/kubernetes.repo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/kubernetes.repo b/conf/kubernetes.repo index 65eda50..5d7d570 100644 --- a/conf/kubernetes.repo +++ b/conf/kubernetes.repo @@ -1,7 +1,7 @@ [kubernetes] name=Kubernetes -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 +baseurl=https://pkgs.k8s.io/core:/stable:/v1.31/rpm/ enabled=1 gpgcheck=1 repo_gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg +gpgkey=https://pkgs.k8s.io/core:/stable:/v1.31/rpm/repodata/repomd.xml.key