Allow configuration of max snapshots during install (#851)

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
rancher · Sep 25, 2024 · 3df501d · 3df501d
1 parent 7ba0a1e
commit 3df501d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/.obs/chartfile/elemental-operator-crds-helm/templates/crds.yaml b/.obs/chartfile/elemental-operator-crds-helm/templates/crds.yaml
@@ -867,12 +867,19 @@ spec:
                             type: boolean
                           snapshotter:
                             default:
+                              maxSnaps: 2
                               type: loopdevice
                             properties:
+                              maxSnaps:
+                                default: 2
+                                description: MaxSnaps sets the maximum amount of snapshots
+                                  to keep
+                                minimum: 2
+                                type: integer
                               type:
                                 default: loopdevice
-                                description: Type sets the snapshotter type a new
-                                  installation, available options are 'loopdevice'
+                                description: Type sets the snapshotter type for a
+                                  new installation, available options are 'loopdevice'
                                   and 'btrfs'
                                 type: string
                             type: object

diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go
@@ -53,15 +53,20 @@ type Install struct {
 	// +optional
 	ConfigDir string `json:"config-dir,omitempty" yaml:"config-dir,omitempty"`
 	// +optional
-	// +kubebuilder:default:={"type": "loopdevice"}
+	// +kubebuilder:default:={"type": "loopdevice", "maxSnaps": 2}
 	Snapshotter SnapshotterConfig `json:"snapshotter,omitempty" yaml:"snapshotter,omitempty"`
 }
 
 type SnapshotterConfig struct {
-	// Type sets the snapshotter type a new installation, available options are 'loopdevice' and 'btrfs'
+	// Type sets the snapshotter type for a new installation, available options are 'loopdevice' and 'btrfs'
 	// +optional
 	// +kubebuilder:default:=loopdevice
 	Type string `json:"type,omitempty" yaml:"type,omitempty"`
+	// MaxSnaps sets the maximum amount of snapshots to keep
+	// +optional
+	// +kubebuilder:default:=2
+	// +kubebuilder:validation:Minimum:=2
+	MaxSnaps int `json:"maxSnaps,omitempty" yaml:"maxSnaps,omitempty"`
 }
 
 type Reset struct {

diff --git a/config/crd/bases/elemental.cattle.io_machineregistrations.yaml b/config/crd/bases/elemental.cattle.io_machineregistrations.yaml
@@ -97,12 +97,19 @@ spec:
                             type: boolean
                           snapshotter:
                             default:
+                              maxSnaps: 2
                               type: loopdevice
                             properties:
+                              maxSnaps:
+                                default: 2
+                                description: MaxSnaps sets the maximum amount of snapshots
+                                  to keep
+                                minimum: 2
+                                type: integer
                               type:
                                 default: loopdevice
-                                description: Type sets the snapshotter type a new
-                                  installation, available options are 'loopdevice'
+                                description: Type sets the snapshotter type for a
+                                  new installation, available options are 'loopdevice'
                                   and 'btrfs'
                                 type: string
                             type: object

diff --git a/pkg/elementalcli/elementalcli.go b/pkg/elementalcli/elementalcli.go
@@ -101,6 +101,7 @@ func mapToInstallEnv(conf elementalv1.Install) []string {
 	variables = append(variables, formatEV("ELEMENTAL_REBOOT", strconv.FormatBool(conf.Reboot)))
 	variables = append(variables, formatEV("ELEMENTAL_EJECT_CD", strconv.FormatBool(conf.EjectCD)))
 	variables = append(variables, formatEV("ELEMENTAL_SNAPSHOTTER_TYPE", conf.Snapshotter.Type))
+	variables = append(variables, formatEV("ELEMENTAL_SNAPSHOTTER_MAX_SNAPS", fmt.Sprintf("%d", conf.Snapshotter.MaxSnaps)))
 	variables = append(variables, formatEV("ELEMENTAL_CLOUD_INIT_PATHS", TempCloudInitDir))
 	return variables
 }