fix: backport fixes from release-1.0 branch

They were discovered as we tagged 1.0.0 version: * wrong deprecated version * incompatibility in extension compatibility checks Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Mar 4, 2022 · 59681b8 · 59681b8
1 parent 0aa23cb
commit 59681b8
Show file tree

Hide file tree

Showing 5 changed files with 1,194 additions and 1,194 deletions.
diff --git a/api/machine/machine.proto b/api/machine/machine.proto
@@ -82,12 +82,12 @@ message ApplyConfigurationRequest {
   bytes data = 1;
   // replaced by mode
   bool on_reboot = 2 [
-    (common.remove_deprecated_field) = "v0.16",
+    (common.remove_deprecated_field) = "v1.1",
     deprecated = true
   ];
   // replaced by mode
   bool immediate = 3 [
-    (common.remove_deprecated_field) = "v0.16",
+    (common.remove_deprecated_field) = "v1.1",
     deprecated = true
   ];
   Mode mode = 4;

diff --git a/cmd/talosctl/pkg/talos/helpers/mode.go b/cmd/talosctl/pkg/talos/helpers/mode.go
@@ -101,7 +101,7 @@ func AddModeFlags(mode *Mode, command *cobra.Command) {
 		command.Flags().MarkDeprecated(flag, deprecationWarning) //nolint:errcheck
 	}
 
-	// TODO: remove in v0.16
+	// TODO: remove in v1.1
 	deprecatedFlag(&mode.OnReboot, "on-reboot", "apply the config on reboot", "Use --mode=staged instead")
 	deprecatedFlag(&mode.Immediate, "immediate", "apply the config immediately (without a reboot)", "Use --mode=no-reboot instead")
 

diff --git a/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go b/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go
@@ -141,7 +141,7 @@ func (s *Server) ApplyConfiguration(ctx context.Context, in *machine.ApplyConfig
 	mode := in.Mode.String()
 	modeDetails := ""
 
-	// TODO: remove in v0.16
+	// TODO: remove in v1.1
 	switch {
 	case in.Immediate: //nolint:staticcheck
 		in.Mode = machine.ApplyConfigurationRequest_NO_REBOOT

diff --git a/internal/pkg/extensions/validate.go b/internal/pkg/extensions/validate.go
@@ -43,7 +43,7 @@ func (ext *Extension) validateConstraints() error {
 			return fmt.Errorf("error parsing Talos version constraint: %w", err)
 		}
 
-		if !versionConstraint.Check(talosVersion) {
+		if !versionConstraint.Check(talosVersion.Core()) {
 			return fmt.Errorf("version constraint %s can't be satisfied with Talos version %s", versionConstraint, talosVersion)
 		}
 	}