diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e2c9299a..80756f72 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -7,7 +7,7 @@ version: "3.7" services: rover: - image: aztfmod/rover:1.4.2-2303.2414 + image: aztfmod/rover:1.7.4-2402.2908 user: vscode labels: diff --git a/.env.terraform b/.env.terraform index 4395fb17..9311c6a2 100644 --- a/.env.terraform +++ b/.env.terraform @@ -1,6 +1,5 @@ -1.8.0-alpha20240228 -1.7.4 +1.8.0-beta1 +1.7.5 1.6.6 1.5.7 1.4.7 -1.3.10 diff --git a/.github/workflows/update_components.yml b/.github/workflows/update_components.yml index c9c1b82f..79e8b7b4 100644 --- a/.github/workflows/update_components.yml +++ b/.github/workflows/update_components.yml @@ -32,7 +32,7 @@ jobs: - name: Get Latest Kubectl Version id: get-latest-versionKubectl-version run: | - version=$(curl -sL https://storage.googleapis.com/kubernetes-release/release/stable.txt | cut -c 2-) + version=$(curl -s https://api.github.com/repos/kubernetes/kubernetes/releases/latest | jq -r '.tag_name' | cut -d'.' -f1,2) echo "versionKubectl=$version" >> $GITHUB_OUTPUT - name: Get Latest Kubelogin Version @@ -104,7 +104,7 @@ jobs: - name: Update latest Terraform Versions id: get-latest-terraform-versions run: | - versionsTerraform=$(curl -s https://api.github.com/repos/hashicorp/terraform/releases | jq -r '.[] | select(.draft == false) | .tag_name' | sort -rV | awk -F. '!a[$1"."$2]++{print substr($0,2)}') + versionsTerraform=$(curl -s https://api.github.com/repos/hashicorp/terraform/releases | jq -r '.[] | select(.draft == false) | .tag_name' | sort -rV | awk -F. '!a[$1"."$2]++{print substr($0,2)}' | head -n 5) echo "${versionsTerraform}" > .env.terraform sed -i '$a\' .env.terraform @@ -112,8 +112,8 @@ jobs: run: | versionDockerCompose=${{ steps.get-latest-docker-compose-version.outputs.versionDockerCompose }} versionGolang=${{ steps.get-latest-golang-version.outputs.versionGolang }} - versionKubectl=${{ steps.get-latest-kubectl-version.outputs.versionKubectl }} versionKubelogin=${{ steps.get-latest-kubelogin-version.outputs.versionKubelogin }} + versionKubectl=${{ steps.get-latest-versionKubectl-version.outputs.versionKubectl }} versionPacker=${{ steps.get-latest-packer-version.outputs.versionPacker }} versionPowershell=${{ steps.get-latest-powershell-version.outputs.versionPowershell }} versionVault=${{ steps.get-latest-vault-version.outputs.versionVault }} @@ -127,8 +127,8 @@ jobs: sed -i "s/versionDockerCompose=\"[^\"]*\"/versionDockerCompose=\"$versionDockerCompose\"/g" docker-bake.override.hcl sed -i "s/versionGolang=\"[^\"]*\"/versionGolang=\"$versionGolang\"/g" docker-bake.override.hcl - sed -i "s/versionKubectl=\"[^\"]*\"/versionKubectl=\"$versionKubectl\"/g" docker-bake.override.hcl sed -i "s/versionKubelogin=\"[^\"]*\"/versionKubelogin=\"$versionKubelogin\"/g" docker-bake.override.hcl + sed -i "s/versionKubectl=\"[^\"]*\"/versionKubectl=\"$versionKubectl\"/g" docker-bake.override.hcl sed -i "s/versionPacker=\"[^\"]*\"/versionPacker=\"$versionPacker\"/g" docker-bake.override.hcl sed -i "s/versionPowershell=\"[^\"]*\"/versionPowershell=\"$versionPowershell\"/g" docker-bake.override.hcl sed -i "s/versionVault=\"[^\"]*\"/versionVault=\"$versionVault\"/g" docker-bake.override.hcl diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 066298d6..415319a6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ repos: # hooks: # - id: docker-compose-check - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-merge-conflict - id: trailing-whitespace diff --git a/Dockerfile b/Dockerfile index 675f6098..b0d3ce13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -116,8 +116,8 @@ RUN apt-get update && \ # # Kubernetes repo # - curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /etc/apt/keyrings/kubernetes-archive-keyring.gpg && \ - echo "deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list && \ + curl -fsSL https://pkgs.k8s.io/core:/stable:/v${versionKubectl}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v${versionKubectl}/deb/ /" | sudo tee /etc/apt/sources.list.d/kubernetes.list && \ # # Github shell curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg && \ diff --git a/docker-bake.override.hcl b/docker-bake.override.hcl index cb31e3b4..b31f1ab3 100644 --- a/docker-bake.override.hcl +++ b/docker-bake.override.hcl @@ -1,15 +1,15 @@ # Base image tools version extensionsAzureCli="resource-graph" -versionDockerCompose="2.24.6" -versionGolang="1.22.0" -versionKubectl="" +versionDockerCompose="2.24.7" +versionGolang="1.22.1" +versionKubectl="1.29" versionKubelogin="0.1.1" -versionPacker="1.10.1" +versionPacker="1.10.2" versionPowershell="7.4.1" versionTerraformDocs="0.16.0" versionVault="1.15.6" versionAnsible="2.16.4" -versionTerrascan="1.18.12" +versionTerrascan="1.19.1" versionTfupdate="0.8.1" # Agents versions