edit version regex to allow +rke2r1 in version string eg. v1.33.6+rke2r1

schmidax · schmidax · commit 03aa75eee90b · 2025-12-19T10:30:35.000+01:00
Signed-off-by: Axel Schmidt &lt;axel.schmidt@rz.uni-augsburg.de&gt;
diff --git a/pkg/clusterstack/config.go b/pkg/clusterstack/config.go
@@ -79,7 +79,7 @@ func GetCsctlConfig(path string) (*CsctlConfig, error) {
 	}
 
 	// Validate kubernetes version
-	matched, err := regexp.MatchString(`^v\d+\.\d+\.\d+$`, cs.Config.KubernetesVersion)
+	matched, err := regexp.MatchString(`^v\d+\.\d+\.\d+$|^v\d+\.\d+\.\d+\+rke2r\d+$`, cs.Config.KubernetesVersion)
 	if err != nil {
 		return nil, fmt.Errorf("failed to kubernetes match regex: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func GetCsctlConfig(path string) (*CsctlConfig, error) {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`// Validate kubernetes version`
`82`		- matched, err := regexp.MatchString(`^v\d+\.\d+\.\d+$`, cs.Config.KubernetesVersion)
	`82`	+ matched, err := regexp.MatchString(`^v\d+\.\d+\.\d+$\|^v\d+\.\d+\.\d+\+rke2r\d+$`, cs.Config.KubernetesVersion)
`83`	`83`	`if err != nil {`
`84`	`84`	`return nil, fmt.Errorf("failed to kubernetes match regex: %w", err)`
`85`	`85`	`}`