Skip to content

vmbackup: add eula flag for upgrade tests #2049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndrewChubatiuk merged 1 commit into from
Apr 10, 2026
+22 −6
Merged

vmbackup: add eula flag for upgrade tests #2049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ aliases:
**Update note 1**: deprecated env variables for Prometheus CRs conversion `VM_ENABLEDPROMETHEUSCONVERTER_PODMONITOR`, `VM_ENABLEDPROMETHEUSCONVERTER_SERVICESCRAPE`, `VM_ENABLEDPROMETHEUSCONVERTER_PROMETHEUSRULE`, `VM_ENABLEDPROMETHEUSCONVERTER_PROBE`, `VM_ENABLEDPROMETHEUSCONVERTER_SCRAPECONFIG`. Use `-controller.disableReconcileFor` command-line flag with comma-separated list of controller names, that should be disabled.
**Update note 2**: removed `operator_prometheus_converter_watch_events_total` metric since migration of Prometheus object watchers to controllers made this counter obsolete.
**Update note 3**: made `controller.prometheusCRD.resyncPeriod` command line flag noop, which was relevant to Prometheus object watchers.
**Update note 4**: `-eula` flag is not set by default anymore for VMBackup and VMRestore. To avoid VMCluster/VMSingle rollouts set `spec.vmstorage.vmBackup.acceptEula: true` for VMCluster and `spec.vmBackup.acceptEula: true"` for VMSingle and replace it with `spec.license` during VMSingle/VMCluster upgrade.

* Dependency: [vmoperator](https://docs.victoriametrics.com/operator/): Updated default versions for VM apps to [v1.139.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.139.0) version
* Dependency: [vmoperator](https://docs.victoriametrics.com/operator/): Updated default versions for VL apps to [v1.49.0](https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/v1.49.0).
Expand Down
24 changes: 18 additions & 6 deletions internal/controller/operator/factory/build/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,21 @@ func VMBackupManager(
fmt.Sprintf("-snapshot.createURL=%s", snapshotCreateURL),
fmt.Sprintf("-snapshot.deleteURL=%s", snapshotDeleteURL),
}

if cr.AcceptEULA {
args = append(args, "-eula")
}
if cr.LogLevel != nil {
args = append(args, fmt.Sprintf("-loggerLevel=%s", *cr.LogLevel))
}
if cr.LogFormat != nil {
args = append(args, fmt.Sprintf("-loggerFormat=%s", *cr.LogFormat))
}
for arg, value := range cr.ExtraArgs {
args = append(args, fmt.Sprintf("-%s=%s", arg, value))
for key, value := range cr.ExtraArgs {
arg := fmt.Sprintf("-%s", key)
if len(value) != 0 {
arg = fmt.Sprintf("%s=%s", arg, value)
}
args = append(args, arg)
}
if cr.Concurrency != nil {
args = append(args, fmt.Sprintf("-concurrency=%d", *cr.Concurrency))
Expand Down Expand Up @@ -169,15 +175,21 @@ func VMRestore(
args := []string{
fmt.Sprintf("-storageDataPath=%s", storagePath),
}

if cr.AcceptEULA {
args = append(args, "-eula")
}
if cr.LogLevel != nil {
args = append(args, fmt.Sprintf("-loggerLevel=%s", *cr.LogLevel))
}
if cr.LogFormat != nil {
args = append(args, fmt.Sprintf("-loggerFormat=%s", *cr.LogFormat))
}
for arg, value := range cr.ExtraArgs {
args = append(args, fmt.Sprintf("-%s=%s", arg, value))
for key, value := range cr.ExtraArgs {
arg := fmt.Sprintf("-%s", key)
if len(value) != 0 {
arg = fmt.Sprintf("%s=%s", arg, value)
}
args = append(args, arg)
}
if cr.Concurrency != nil {
args = append(args, fmt.Sprintf("-concurrency=%d", *cr.Concurrency))
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/upgrade/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,7 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
Image: vmv1beta1.Image{
Tag: "v1.136.0-enterprise",
},
AcceptEULA: true,
}
cr.Spec.License = &vmv1beta1.License{
KeyRef: &corev1.SecretKeySelector{
Expand All @@ -841,6 +842,7 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
Image: vmv1beta1.Image{
Tag: "v1.136.0-enterprise",
},
AcceptEULA: true,
}
cr.Spec.License = &vmv1beta1.License{
KeyRef: &corev1.SecretKeySelector{
Expand All @@ -863,6 +865,7 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
Image: vmv1beta1.Image{
Tag: "v1.136.0-enterprise",
},
AcceptEULA: true,
}
cr.Spec.License = &vmv1beta1.License{
KeyRef: &corev1.SecretKeySelector{
Expand Down
Loading