Merge branch v2.9 into v2.10

2023-03-21 16:51:10 +01:00 · 2023-03-21 16:51:10 +01:00 · 54f6144ef2
commit 54f6144ef2
parent f7be1e97df a020ab640d
6 changed files with 36 additions and 12 deletions
--- a/pkg/provider/nomad/nomad_test.go
+++ b/pkg/provider/nomad/nomad_test.go
@ -89,7 +89,6 @@ func TestProvider_SetDefaults_Endpoint(t *testing.T) {
 			envs: map[string]string{},
 			expected: &EndpointConfig{
 				Address: "http://127.0.0.1:4646",
-				TLS:     &types.ClientTLS{},
 			},
 		},
 		{