Merge remote-tracking branch 'origin/main' into k0s-1-28-9

Author: laverya

cmd/embedded-cluster/restore.go

@@ -239,7 +239,7 @@ func newS3BackupStore() *s3BackupStore {
 	store.region = prompts.New().Input("Region:", "", true)
 	store.bucket = prompts.New().Input("Bucket:", "", true)
 	store.prefix = prompts.New().Input("Prefix (press Enter to skip):", "", false)
-	store.accessKeyID = prompts.New().Password("Access key ID:")
+	store.accessKeyID = prompts.New().Input("Access key ID:", "", true)
 	store.secretAccessKey = prompts.New().Password("Secret access key:")
 	logrus.Info("")
 	return store

go.mod

@@ -14,8 +14,8 @@ require (
 	github.com/jedib0t/go-pretty v4.3.0+incompatible
 	github.com/k0sproject/dig v0.2.0
 	github.com/k0sproject/k0s v1.28.10-0.20240418084644-c99e4b437507
-	github.com/replicatedhq/embedded-cluster-kinds v1.2.3
-	github.com/replicatedhq/embedded-cluster-operator v0.32.2
+	github.com/replicatedhq/embedded-cluster-kinds v1.2.4
+	github.com/replicatedhq/embedded-cluster-operator v0.32.3
 	github.com/replicatedhq/embedded-cluster-utils v1.0.0
 	github.com/replicatedhq/kotskinds v0.0.0-20240523174825-f4d441adb453
 	github.com/replicatedhq/troubleshoot v0.92.2

go.sum

@@ -251,10 +251,10 @@ github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lne
 github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/replicatedhq/embedded-cluster-kinds v1.2.3 h1:1gfmGqeY7lplGozv9j3p4G2mvoRdh4fNSGcLB9mZ+fc=
-github.com/replicatedhq/embedded-cluster-kinds v1.2.3/go.mod h1:NIwwkFGoNHIxx+5mHRihvQU6RqZ/xt/A5RzaHpBh2ZY=
-github.com/replicatedhq/embedded-cluster-operator v0.32.2 h1:nckM7HWOuEbPTwlIYej24klxG0XIA78zZ8/ZLeCmSMI=
-github.com/replicatedhq/embedded-cluster-operator v0.32.2/go.mod h1:PIAxMn2neZgjSgIfGt1zIhdfl6mRSur1xGcn5t94KaA=
+github.com/replicatedhq/embedded-cluster-kinds v1.2.4 h1:jt4iriW2Y1YAhQXf1HH7N8tGj7dNup6im25gMQElnTc=
+github.com/replicatedhq/embedded-cluster-kinds v1.2.4/go.mod h1:YognvIhVsE5CevfCU0XLTMUCIAiXhWyYhwbU0EwCnvA=
+github.com/replicatedhq/embedded-cluster-operator v0.32.3 h1:rkeQsr8Un2tVkXjhrKD4TkL1+Z2awURe95ZYspW3EqI=
+github.com/replicatedhq/embedded-cluster-operator v0.32.3/go.mod h1:TKqiiXrsqwfA8BxVnUXtuTpMpkla9QESep+q0TBglGw=
 github.com/replicatedhq/embedded-cluster-utils v1.0.0 h1:Axdni1nYfl5zeOP9g5U79yvN8cRdClyU6hz0wV1Hmdc=
 github.com/replicatedhq/embedded-cluster-utils v1.0.0/go.mod h1:4JmMC2CwMCLxq05GEW3XSPPVotqyamAF/omrbB3pH+c=
 github.com/replicatedhq/kotskinds v0.0.0-20240523174825-f4d441adb453 h1:g8CQQ9R4gjIdoHuBX1LN1hmF3Omq2JfA040JfpfNVC8=