Skip to content

Next LTS release PR (0.68.8) #2455

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

Open
vrutkovs wants to merge 1 commit into
base: release-0.68
Choose a base branch
from
Open

Next LTS release PR (0.68.8) #2455

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
2 changes: 1 addition & 1 deletion docs/env.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| VM_LOGS_VERSION: `v1.51.0` <a href="#variables-vm-logs-version" id="variables-vm-logs-version">#</a> |
| VM_ANOMALY_VERSION: `v1.29.7` <a href="#variables-vm-anomaly-version" id="variables-vm-anomaly-version">#</a> |
| VM_TRACES_VERSION: `v0.9.4` <a href="#variables-vm-traces-version" id="variables-vm-traces-version">#</a> |
| VM_OPERATOR_VERSION: `v0.68.6` <a href="#variables-vm-operator-version" id="variables-vm-operator-version">#</a> |
| VM_OPERATOR_VERSION: `v0.68.7` <a href="#variables-vm-operator-version" id="variables-vm-operator-version">#</a> |
| VM_GATEWAY_API_ENABLED: `false` <a href="#variables-vm-gateway-api-enabled" id="variables-vm-gateway-api-enabled">#</a> |
| VM_VPA_API_ENABLED: `false` <a href="#variables-vm-vpa-api-enabled" id="variables-vm-vpa-api-enabled">#</a> |
| WATCH_NAMESPACE: `-` <a href="#variables-watch-namespace" id="variables-watch-namespace">#</a><br>Defines a list of namespaces to be watched by operator. Operator don't perform any cluster wide API calls if namespaces not empty. In case of empty list it performs only clusterwide api calls. |
Expand Down
2 changes: 1 addition & 1 deletion internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var (
"VM_LOGS_VERSION": "v1.51.0",
"VM_ANOMALY_VERSION": "v1.29.7",
"VM_TRACES_VERSION": "v0.9.4",
"VM_OPERATOR_VERSION": getVersion("v0.68.6"),
"VM_OPERATOR_VERSION": getVersion("v0.68.7"),
}
)

Expand Down
4 changes: 2 additions & 2 deletions internal/controller/operator/factory/vmauth/vmauth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ volumes:
emptydir: {}
initcontainers:
- name: config-init
image: victoriametrics/operator:config-reloader-v0.68.6
image: victoriametrics/operator:config-reloader-v0.68.7
args:
- --config-envsubst-file=/opt/vmauth/config.yaml
- --config-secret-key=config.yaml.gz
Expand Down Expand Up @@ -610,7 +610,7 @@ containers:
failurethreshold: 10
terminationmessagepolicy: FallbackToLogsOnError
- name: config-reloader
image: victoriametrics/operator:config-reloader-v0.68.6
image: victoriametrics/operator:config-reloader-v0.68.7
args:
- --config-envsubst-file=/opt/vmauth/config.yaml
- --config-secret-key=config.yaml.gz
Expand Down
48 changes: 48 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 @@ -705,6 +705,15 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
})},
{version: "v0.68.6", cr: with(vlagent)},
{version: "v0.68.6", cr: vlagentK8sCollector},
{version: "v0.68.7", cr: with(vmagent)},
{version: "v0.68.7", cr: with(vmagent, func(cr *vmv1beta1.VMAgent) {
cr.Spec.DaemonSetMode = true
})},
{version: "v0.68.7", cr: with(vmagent, func(cr *vmv1beta1.VMAgent) {
cr.Spec.StatefulMode = true
})},
{version: "v0.68.7", cr: with(vlagent)},
{version: "v0.68.7", cr: vlagentK8sCollector},
},
},
// nolint:dupl
Expand Down Expand Up @@ -740,6 +749,9 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
{version: "v0.68.6", cr: with(vmalert)},
{version: "v0.68.6", cr: with(vmauth)},
{version: "v0.68.6", cr: with(vmalertmanager)},
{version: "v0.68.7", cr: with(vmalert)},
{version: "v0.68.7", cr: with(vmauth)},
{version: "v0.68.7", cr: with(vmalertmanager)},
},
},
// nolint:dupl
Expand Down Expand Up @@ -773,6 +785,9 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
{version: "v0.68.6", cr: with(vmsingle)},
{version: "v0.68.6", cr: with(vtsingle)},
{version: "v0.68.6", cr: with(vlsingle)},
{version: "v0.68.7", cr: with(vmsingle)},
{version: "v0.68.7", cr: with(vtsingle)},
{version: "v0.68.7", cr: with(vlsingle)},
},
},
// nolint:dupl
Expand Down Expand Up @@ -815,6 +830,10 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
{version: "v0.68.6", cr: with(vlcluster, func(cr *vmv1.VLCluster) {
cr.Spec.RequestsLoadBalancer.Enabled = true
})},
{version: "v0.68.7", cr: with(vlcluster)},
{version: "v0.68.7", cr: with(vlcluster, func(cr *vmv1.VLCluster) {
cr.Spec.RequestsLoadBalancer.Enabled = true
})},
},
},
// nolint:dupl
Expand Down Expand Up @@ -857,6 +876,10 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
{version: "v0.68.6", cr: with(vtcluster, func(cr *vmv1.VTCluster) {
cr.Spec.RequestsLoadBalancer.Enabled = true
})},
{version: "v0.68.7", cr: with(vtcluster)},
{version: "v0.68.7", cr: with(vtcluster, func(cr *vmv1.VTCluster) {
cr.Spec.RequestsLoadBalancer.Enabled = true
})},
},
},
// nolint:dupl
Expand All @@ -872,6 +895,7 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
{version: "v0.68.4", cr: with(vmcluster)},
{version: "v0.68.5", cr: with(vmcluster)},
{version: "v0.68.6", cr: with(vmcluster)},
{version: "v0.68.7", cr: with(vmcluster)},
},
},
// nolint:dupl
Expand Down Expand Up @@ -1016,6 +1040,29 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
},
}
})},
{version: "v0.68.7", isEnterprise: true, cr: with(vmcluster, func(cr *vmv1beta1.VMCluster) {
cr.Spec.RequestsLoadBalancer.Enabled = true
cr.Spec.VMStorage.Image.Tag = "v1.136.0-enterprise-cluster"
cr.Spec.VMSelect.Image.Tag = "v1.136.0-enterprise-cluster"
cr.Spec.VMInsert.Image.Tag = "v1.136.0-enterprise-cluster"
cr.Spec.RequestsLoadBalancer.Spec.Image.Tag = "v1.136.0-enterprise"
cr.Spec.VMStorage.VMBackup = &vmv1beta1.VMBackup{
Destination: "fs:///tmp",
DestinationDisableSuffixAdd: true,
Image: vmv1beta1.Image{
Tag: "v1.136.0-enterprise",
},
AcceptEULA: true,
}
cr.Spec.License = &vmv1beta1.License{
KeyRef: &corev1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: "license",
},
Key: "key",
},
}
})},
},
envs: map[string]string{
"VM_LOOPBACK": "localhost",
Expand All @@ -1027,6 +1074,7 @@ var _ = Describe("operator upgrade", Label("upgrade"), func() {
pairs: []crVersionPair{
{version: "v0.68.5", cr: with(vmdistributed)},
{version: "v0.68.6", cr: with(vmdistributed)},
{version: "v0.68.7", cr: with(vmdistributed)},
},
},
}))
Expand Down
Loading