Merge fcad6b410f into 6275399327

minor fixes
2024-11-29 18:33:05 +00:00 · 2024-11-21 18:46:03 +01:00 · 2024-11-21 18:45:50 +01:00
2 changed files with 5 additions and 1 deletions
--- a/integration/embedded_derp_test.go
+++ b/integration/embedded_derp_test.go
@ -245,7 +245,7 @@ func (s *EmbeddedDERPServerScenario) CreateHeadscaleEnv(
 			err = s.CreateTailscaleIsolatedNodesInUser(
 				hash,
 				userName,
-				"head",
+				tsic.VersionHead,
 				clientCount.WebsocketDERP,
 				tsic.WithWebsocketDERP(true),
 			)
--- a/integration/tsic/tsic.go
+++ b/integration/tsic/tsic.go
@ -194,6 +194,10 @@ func WithNetfilter(state string) Option {
 // Attempts to use it with any other version is a bug in the calling code.
 func WithBuildTag(tag string) Option {
 	return func(tsic *TailscaleInContainer) {
+		if tsic.version != VersionHead {
+			panic(errInvalidClientConfig)
+		}
+
 		tsic.buildConfig.tags = append(
 			tsic.buildConfig.tags, tag,
 		)
Author	SHA1	Message	Date
enoperm	f62107b6a8	Merge `fcad6b410f` into `6275399327`	2024-11-21 18:46:03 +01:00
Csaba Sarkadi	fcad6b410f	minor fixes	2024-11-21 18:45:50 +01:00