From 8d00a7475bc3f3a2c2bce8276cb6487a033890ae Mon Sep 17 00:00:00 2001 From: isaac Date: Thu, 21 Dec 2023 09:22:27 +1030 Subject: [PATCH 1/4] Bump kubectl and related tools --- ubuntu.22.04/Dockerfile | 12 ++++++------ ubuntu.22.04/README.md | 12 ++++++------ ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ubuntu.22.04/Dockerfile b/ubuntu.22.04/Dockerfile index d2123fb..13f17c6 100644 --- a/ubuntu.22.04/Dockerfile +++ b/ubuntu.22.04/Dockerfile @@ -1,19 +1,19 @@ FROM ubuntu:22.04 ARG Aws_Cli_Version=2.13.31 -ARG Aws_Iam_Authenticator_Version=0.5.3 -ARG Aws_Powershell_Version=4.1.2 +ARG Aws_Iam_Authenticator_Version=0.5.9 +ARG Aws_Powershell_Version=4.1.412 ARG Azure_Cli_Version=2.51.0-1~jammy ARG Azure_Powershell_Version=4.5.0 ARG Dotnet_Sdk_Version=6.0 ARG Ecs_Cli_Version=1.20.0 -ARG Eks_Cli_Version=0.25.0 -ARG Google_Cloud_Cli_Version=412.0.0-0 +ARG Eks_Cli_Version=0.156.0 +ARG Google_Cloud_Cli_Version=445.0.0-0 ARG Google_Cloud_Gke_Cloud_Auth_Plugin_Version=412.0.0-0 ARG Helm_Version=v3.7.1 ARG Java_Jdk_Version=11.0.21+9-0ubuntu1~22.04 -ARG Kubectl_Version=1.18.8-00 -ARG Kubelogin_Version=v0.0.25 +ARG Kubectl_Version=1.28.1-00 +ARG Kubelogin_Version=v0.0.30 ARG Octopus_Cli_Version=1.7.1 ARG Octopus_Cli_Legacy_Version=9.1.7 ARG Octopus_Client_Version=11.6.3644 diff --git a/ubuntu.22.04/README.md b/ubuntu.22.04/README.md index cf7e035..87976ab 100644 --- a/ubuntu.22.04/README.md +++ b/ubuntu.22.04/README.md @@ -25,19 +25,19 @@ ## Installed Software - Aws CLI 2.13.31 -- Aws Iam Authenticator 0.5.3 -- Aws Powershell 4.1.2 +- Aws Iam Authenticator 0.5.9 +- Aws Powershell 4.1.412 - Azure CLI 2.51.0-1~jammy - Azure Powershell 4.5.0 - Dotnet Sdk 3.1.401-1 - Ecs CLI 1.20.0 -- Eks CTL 0.25.0 -- Google Cloud CLI 412.0.0-0 +- Eks CTL 0.156.0 +- Google Cloud CLI 445.0.0-0 - Google Cloud GKE auth plugin 412.0.0-0 - Helm v3.7.1 - Java Jdk 11.0.20.1+1-0ubuntu1~22.04 -- Kubectl 1.18.8-00 -- Kubelogin v0.0.25 +- Kubectl 1.28.1-00 +- Kubelogin v0.0.30 - Octopus CLI 1.7.1 - Octopus CLI Legacy 9.1.7 - Octopus Client 11.6.3644 diff --git a/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 b/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 index 05d78ee..5722f14 100644 --- a/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 +++ b/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 @@ -23,7 +23,7 @@ Describe 'installed dependencies' { } It 'has aws powershell module installed' { - (Get-Module AWSPowerShell.NetCore -ListAvailable).Version.ToString() | should -be '4.1.2.0' + (Get-Module AWSPowerShell.NetCore -ListAvailable).Version.ToString() | should -be '4.1.412.0' } It 'has az installed' { @@ -46,12 +46,12 @@ Describe 'installed dependencies' { } It 'has kubectl installed' { - kubectl version --client | Should -match '1.18.8' + kubectl version --client | Should -match '1.28.1' $LASTEXITCODE | Should -be 0 } It 'has kubelogin installed' { - kubelogin --version | Select-Object -First 1 -Skip 1 | Should -match 'v0.0.25' + kubelogin --version | Select-Object -First 1 -Skip 1 | Should -match 'v0.0.30' $LASTEXITCODE | Should -be 0 } @@ -77,7 +77,7 @@ Describe 'installed dependencies' { } It 'has gcloud installed' { - gcloud --version | Select -First 1 | Should -be 'Google Cloud SDK 412.0.0' + gcloud --version | Select -First 1 | Should -be 'Google Cloud SDK 445.0.0' $LASTEXITCODE | Should -be 0 } @@ -97,7 +97,7 @@ Describe 'installed dependencies' { } It 'has eksctl installed' { - eksctl version | Should -match '0.25.0' + eksctl version | Should -match '0.156.0' $LASTEXITCODE | Should -be 0 } From c94c4bfdd4f07123b367425f89dd1fc9d93efaea Mon Sep 17 00:00:00 2001 From: "veo.chen" Date: Tue, 9 Jan 2024 13:55:51 +1300 Subject: [PATCH 2/4] v --- ubuntu.22.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu.22.04/Dockerfile b/ubuntu.22.04/Dockerfile index 13f17c6..e84da28 100644 --- a/ubuntu.22.04/Dockerfile +++ b/ubuntu.22.04/Dockerfile @@ -7,7 +7,7 @@ ARG Azure_Cli_Version=2.51.0-1~jammy ARG Azure_Powershell_Version=4.5.0 ARG Dotnet_Sdk_Version=6.0 ARG Ecs_Cli_Version=1.20.0 -ARG Eks_Cli_Version=0.156.0 +ARG Eks_Cli_Version=v0.156.0 ARG Google_Cloud_Cli_Version=445.0.0-0 ARG Google_Cloud_Gke_Cloud_Auth_Plugin_Version=412.0.0-0 ARG Helm_Version=v3.7.1 From 5e74be26e4b2109340091befb184903df3d544c3 Mon Sep 17 00:00:00 2001 From: "veo.chen" Date: Tue, 9 Jan 2024 16:12:56 +1300 Subject: [PATCH 3/4] kubectl prints multiple lines --- ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 b/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 index 5722f14..bdb5868 100644 --- a/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 +++ b/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 @@ -46,7 +46,7 @@ Describe 'installed dependencies' { } It 'has kubectl installed' { - kubectl version --client | Should -match '1.28.1' + kubectl version --client | Select-Object -First 1 | Should -match '1.28.1' $LASTEXITCODE | Should -be 0 } From 6730caa80000aab3c7c3dc68617e55573437061a Mon Sep 17 00:00:00 2001 From: "veo.chen" Date: Wed, 10 Jan 2024 09:56:45 +1300 Subject: [PATCH 4/4] fix version test for aws powershell --- ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 b/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 index bdb5868..bd378be 100644 --- a/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 +++ b/ubuntu.22.04/spec/ubuntu.22.04.tests.ps1 @@ -23,7 +23,7 @@ Describe 'installed dependencies' { } It 'has aws powershell module installed' { - (Get-Module AWSPowerShell.NetCore -ListAvailable).Version.ToString() | should -be '4.1.412.0' + (Get-Module AWSPowerShell.NetCore -ListAvailable).Version.ToString() | should -be '4.1.412' } It 'has az installed' {