Merge pull request #516 from danpaul81/bump-versions

bump versions

Dockerfile

@@ -1,7 +1,7 @@
-FROM --platform=linux/amd64 golang:1.20-alpine3.18 AS build
-RUN wget -P / https://releases.hashicorp.com/terraform/1.6.1/terraform_1.6.1_linux_amd64.zip
-RUN unzip /terraform_1.6.1_linux_amd64.zip -d /usr/bin/
-RUN wget -P / https://github.com/vmware/govmomi/releases/download/v0.36.1/govc_Linux_x86_64.tar.gz
+FROM --platform=linux/amd64 golang:1.22-alpine3.19 AS build
+RUN wget -P / https://releases.hashicorp.com/terraform/1.8.3/terraform_1.8.3_linux_amd64.zip
+RUN unzip /terraform_1.8.3_linux_amd64.zip -d /usr/bin/
+RUN wget -P / https://github.com/vmware/govmomi/releases/download/v0.37.1/govc_Linux_x86_64.tar.gz
 RUN tar -xzf /govc_Linux_x86_64.tar.gz -C /usr/bin/
 RUN mkdir -p /root/go/src/px-deploy
 COPY go.mod go.sum *.go /root/go/src/px-deploy/
@@ -13,15 +13,14 @@ RUN terraform -chdir=/px-deploy/terraform/gcp/ init
 RUN terraform -chdir=/px-deploy/terraform/vsphere/ init
 
 
-FROM --platform=linux/amd64 alpine:3.18
+FROM --platform=linux/amd64 alpine:3.19
 RUN apk add --no-cache openssh-client-default bash
 RUN echo ServerAliveInterval 300 >/etc/ssh/ssh_config
 RUN echo ServerAliveCountMax 2 >>/etc/ssh/ssh_config
 RUN echo TCPKeepAlive yes >>/etc/ssh/ssh_config
 COPY --from=build /usr/bin/terraform /usr/bin/terraform
 COPY --from=build /usr/bin/govc /usr/bin/govc
 COPY vagrant /px-deploy/vagrant
-#COPY terraform /px-deploy/terraform
 COPY VERSION /
 COPY --from=build /go/bin/px-deploy /root/go/bin/px-deploy
 COPY --from=build /px-deploy/terraform/aws /px-deploy/terraform/aws 

defaults.yml

@@ -3,8 +3,8 @@ platform: k8s
 clusters: 1
 nodes: 3
 #ssh_pub_key: "ssh-rsa XXXXXXXXXXXXXXXXXXXXXX user@example"
-k8s_version: 1.26.4
-px_version: 3.0.4
+k8s_version: 1.28.9
+px_version: 3.1.1
 stop_after: 6
 post_script: show-ip
 quiet: false
@@ -15,14 +15,14 @@ aws_type: t3.large
 aws_ebs: "gp2:50"
 aws_access_key_id: ""
 aws_secret_access_key: "" 
-eks_version: "1.26"
+eks_version: "1.28"
 #aws_ebs: "gp2:20 standard:30"
 
 gcp_region: europe-north1
 gcp_zone: b
 gcp_type: n1-standard-4
 gcp_disks: "pd-standard:50"
-gke_version: "1.28.3"
+gke_version: "1.28.7"
 #gcp_disks: "pd-standard:20 pd-ssd:30"
 #gcp_project: "px-deploy"
 
@@ -35,7 +35,7 @@ azure_client_secret: ""
 azure_client_id: ""
 azure_tenant_id: ""
 azure_subscription_id: ""
-aks_version: "1.27"
+aks_version: "1.28"
 
 vsphere_host: ""
 vsphere_compute_resource: ""
@@ -53,7 +53,7 @@ vsphere_repo: "https://px-deploy.s3.eu-west-1.amazonaws.com/templates/"
 #vsphere_folder: ""
 
 ocp4_domain: ""
-ocp4_version: 4.12.12
+ocp4_version: 4.14.16
 ocp4_pull_secret: ""
 
 #env:

go.mod

@@ -1,64 +1,73 @@
 module github.com/andrewh1978/px-deploy
 
-go 1.18
+go 1.21
+
+toolchain go1.22.0
 
 require (
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0-beta.1
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0
-	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.8.2
-	github.com/aws/aws-sdk-go-v2 v1.21.1
-	github.com/aws/aws-sdk-go-v2/config v1.18.44
-	github.com/aws/aws-sdk-go-v2/credentials v1.13.42
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0
-	github.com/aws/aws-sdk-go-v2/service/eks v1.29.6
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.17.1
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0
+	github.com/aws/aws-sdk-go-v2 v1.26.1
+	github.com/aws/aws-sdk-go-v2/config v1.27.11
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.11
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.160.0
+	github.com/aws/aws-sdk-go-v2/service/eks v1.42.1
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.24.4
 	github.com/go-yaml/yaml v2.1.0+incompatible
-	github.com/google/uuid v1.3.1
+	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-version v1.6.0
 	github.com/imdario/mergo v0.3.16
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/spf13/cobra v1.7.0
-	google.golang.org/api v0.146.0
+	github.com/spf13/cobra v1.8.0
+	google.golang.org/api v0.178.0
 )
 
 require (
-	cloud.google.com/go/compute v1.23.0 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect
-	github.com/aws/smithy-go v1.15.0 // indirect
-	github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
+	cloud.google.com/go/auth v0.4.0 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
+	cloud.google.com/go/compute/metadata v0.3.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect
+	github.com/aws/smithy-go v1.20.2 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
-	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.12.4 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
-	github.com/rivo/uniseg v0.4.4 // indirect
+	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/testify v1.8.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/oauth2 v0.13.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
-	google.golang.org/grpc v1.58.3 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
+	go.opentelemetry.io/otel v1.26.0 // indirect
+	go.opentelemetry.io/otel/metric v1.26.0 // indirect
+	go.opentelemetry.io/otel/trace v1.26.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/oauth2 v0.20.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240429193739-8cf5692501f6 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240506185236-b8a5c65736ae // indirect
+	google.golang.org/grpc v1.63.2 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 )