Merge pull request #6307 from k0sproject/backport-5699-to-release-1.32

juanluisvaladas · web-flow · commit 15176a3dceb9 · 2025-08-20T13:53:51.000+02:00
[Backport release-1.32] Fix ostests terraform script
diff --git a/hack/ostests/modules/k0sctl/main.tf b/hack/ostests/modules/k0sctl/main.tf
@@ -17,7 +17,7 @@ resource "terraform_data" "k0sctl_apply" {
     }
 
     command = <<-EOF
-      printf %s "$K0SCTL_CONFIG" | env -u SSH_AUTH_SOCK SSH_KNOWN_HOSTS='' "$K0SCTL_EXECUTABLE_PATH" apply --disable-telemetry -c -
+      printf %s "$K0SCTL_CONFIG" | env -u SSH_AUTH_SOCK SSH_KNOWN_HOSTS='' "$K0SCTL_EXECUTABLE_PATH" apply -c -
       EOF
   }
 }
@@ -65,7 +65,7 @@ data "external" "k0s_kubeconfig" {
     "env", "sh", "-ec",
     <<-EOS
       jq '.k0sctl_config | fromjson' |
-        { env -u SSH_AUTH_SOCK SSH_KNOWN_HOSTS='' "$1" kubeconfig --disable-telemetry -c - || echo ~~~FAIL; } |
+        { env -u SSH_AUTH_SOCK SSH_KNOWN_HOSTS='' "$1" kubeconfig -c - || echo ~~~FAIL; } |
         jq --raw-input --slurp "$2"
     EOS
     , "--",

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ resource "terraform_data" "k0sctl_apply" {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`command = <<-EOF`
`20`		`- printf %s "$K0SCTL_CONFIG" \| env -u SSH_AUTH_SOCK SSH_KNOWN_HOSTS='' "$K0SCTL_EXECUTABLE_PATH" apply --disable-telemetry -c -`
	`20`	`+ printf %s "$K0SCTL_CONFIG" \| env -u SSH_AUTH_SOCK SSH_KNOWN_HOSTS='' "$K0SCTL_EXECUTABLE_PATH" apply -c -`
`21`	`21`	`EOF`
`22`	`22`	`}`
`23`	`23`	`}`
`@@ -65,7 +65,7 @@ data "external" "k0s_kubeconfig" {`
`65`	`65`	`"env", "sh", "-ec",`
`66`	`66`	`<<-EOS`
`67`	`67`	`jq '.k0sctl_config \| fromjson' \|`
`68`		`- { env -u SSH_AUTH_SOCK SSH_KNOWN_HOSTS='' "$1" kubeconfig --disable-telemetry -c - \|\| echo ~~~FAIL; } \|`
	`68`	`+ { env -u SSH_AUTH_SOCK SSH_KNOWN_HOSTS='' "$1" kubeconfig -c - \|\| echo ~~~FAIL; } \|`
`69`	`69`	`jq --raw-input --slurp "$2"`
`70`	`70`	`EOS`
`71`	`71`	`, "--",`