Revert back to prior image and sleep

kylos101 · kylos101 · commit 4922066e8ca9 · 2024-02-05T15:07:03.000Z
diff --git a/dev/preview/infrastructure/modules/gce/variables.tf b/dev/preview/infrastructure/modules/gce/variables.tf
@@ -44,7 +44,7 @@ variable "harvester_ingress_ip" {
 variable "vm_image" {
   type        = string
   description = "The VM image"
-  default     = "gitpod-k3s-202402021944"
+  default     = "gitpod-k3s-202312131438"
 }
 
 variable "cert_issuer" {
diff --git a/dev/preview/infrastructure/modules/harvester/variables.tf b/dev/preview/infrastructure/modules/harvester/variables.tf
@@ -33,7 +33,7 @@ variable "ssh_key" {
 variable "vm_image" {
   type        = string
   description = "The VM image"
-  default     = "gitpod-k3s-202402021944"
+  default     = "gitpod-k3s-202312131438"
 }
 
 variable "harvester_ingress_ip" {
diff --git a/dev/preview/infrastructure/scripts/bootstrap-k3s.sh b/dev/preview/infrastructure/scripts/bootstrap-k3s.sh
@@ -24,7 +24,7 @@ export INSTALL_K3S_SKIP_DOWNLOAD=true
 
 # Seems like this is a bit flaky now, with k3s not always being ready, and the labeling
 # failing occasionally. Sleeping for a bit solves it.
-sleep 30
+sleep 10
 
 # shellcheck disable=SC2154
 # shellcheck disable=SC2086
diff --git a/dev/preview/infrastructure/variables.tf b/dev/preview/infrastructure/variables.tf
@@ -35,7 +35,7 @@ variable "vm_type" {
 variable "vm_image" {
   type        = string
   description = "The VM image"
-  default     = "gitpod-k3s-202402021944"
+  default     = "gitpod-k3s-202312131438"
 }
 
 variable "cert_issuer" {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ variable "harvester_ingress_ip" {`
`44`	`44`	`variable "vm_image" {`
`45`	`45`	`type = string`
`46`	`46`	`description = "The VM image"`
`47`		`- default = "gitpod-k3s-202402021944"`
	`47`	`+ default = "gitpod-k3s-202312131438"`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`variable "cert_issuer" {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ variable "ssh_key" {`
`33`	`33`	`variable "vm_image" {`
`34`	`34`	`type = string`
`35`	`35`	`description = "The VM image"`
`36`		`- default = "gitpod-k3s-202402021944"`
	`36`	`+ default = "gitpod-k3s-202312131438"`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`variable "harvester_ingress_ip" {`