Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rover components #376

Merged
merged 10 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions .env.terraform
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
1.8.0-alpha20240228
1.8.0-beta1
1.7.4
arnaudlh marked this conversation as resolved.
Show resolved Hide resolved
1.6.6
1.5.7
1.4.7
1.3.10
8 changes: 4 additions & 4 deletions .github/workflows/update_components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -104,16 +104,16 @@ 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

- name: Update other components
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 }}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
10 changes: 5 additions & 5 deletions docker-bake.override.hcl
Original file line number Diff line number Diff line change
@@ -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
Expand Down