diff --git a/docs/env.md b/docs/env.md
index 1c1f42c85..cd4b36ad9 100644
--- a/docs/env.md
+++ b/docs/env.md
@@ -4,7 +4,7 @@
| VM_LOGS_VERSION: `v1.51.0` # |
| VM_ANOMALY_VERSION: `v1.29.7` # |
| VM_TRACES_VERSION: `v0.9.4` # |
-| VM_OPERATOR_VERSION: `v0.68.6` # |
+| VM_OPERATOR_VERSION: `v0.68.7` # |
| VM_GATEWAY_API_ENABLED: `false` # |
| VM_VPA_API_ENABLED: `false` # |
| WATCH_NAMESPACE: `-` #
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. |
diff --git a/internal/config/config.go b/internal/config/config.go
index 82d3b72d3..57c91af4f 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -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"),
}
)
diff --git a/internal/controller/operator/factory/vmauth/vmauth_test.go b/internal/controller/operator/factory/vmauth/vmauth_test.go
index 53c9606ba..20fe8651b 100644
--- a/internal/controller/operator/factory/vmauth/vmauth_test.go
+++ b/internal/controller/operator/factory/vmauth/vmauth_test.go
@@ -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
@@ -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
diff --git a/test/e2e/upgrade/upgrade_test.go b/test/e2e/upgrade/upgrade_test.go
index 9c3cc566e..6b916d928 100644
--- a/test/e2e/upgrade/upgrade_test.go
+++ b/test/e2e/upgrade/upgrade_test.go
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",
@@ -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)},
},
},
}))