From bd9db75df441df13822eb78eca04e4d03117c7af Mon Sep 17 00:00:00 2001 From: f41gh7 Date: Wed, 28 Jul 2021 06:29:58 +0300 Subject: [PATCH] bumps default version for all vm apps to 1.63.0 update docs --- controllers/factory/vmagent_test.go | 40 +++++++++++++++++++++++++++-- docs/api.MD | 3 ++- internal/config/config.go | 14 +++++----- vars.MD | 16 ++++++------ 4 files changed, 55 insertions(+), 18 deletions(-) diff --git a/controllers/factory/vmagent_test.go b/controllers/factory/vmagent_test.go index 268e11e8..4ddaeb2c 100644 --- a/controllers/factory/vmagent_test.go +++ b/controllers/factory/vmagent_test.go @@ -946,6 +946,24 @@ func Test_buildConfigReloaderArgs(t *testing.T) { }, c: &config.BaseOperatorConf{ VMAgentDefault: struct { + Image string `default:"victoriametrics/vmagent"` + Version string `default:"v1.63.0"` + ConfigReloadImage string `default:"quay.io/prometheus-operator/prometheus-config-reloader:v0.48.1"` + Port string `default:"8429"` + UseDefaultResources bool `default:"true"` + Resource struct { + Limit struct { + Mem string `default:"500Mi"` + Cpu string `default:"200m"` + } + Request struct { + Mem string `default:"200Mi"` + Cpu string `default:"50m"` + } + } + ConfigReloaderCPU string `default:"100m"` + ConfigReloaderMemory string `default:"25Mi"` + }(struct { Image string `default:"victoriametrics/vmagent"` Version string `default:"v1.58.0"` ConfigReloadImage string `default:"quay.io/prometheus-operator/prometheus-config-reloader:v0.48.1"` @@ -981,7 +999,7 @@ func Test_buildConfigReloaderArgs(t *testing.T) { } ConfigReloaderCPU string ConfigReloaderMemory string - }{ConfigReloadImage: "prometheus-config-reloader:latest"}), + }{ConfigReloadImage: "prometheus-config-reloader:latest"})), }, }, want: []string{ @@ -999,6 +1017,24 @@ func Test_buildConfigReloaderArgs(t *testing.T) { }, c: &config.BaseOperatorConf{ VMAgentDefault: struct { + Image string `default:"victoriametrics/vmagent"` + Version string `default:"v1.63.0"` + ConfigReloadImage string `default:"quay.io/prometheus-operator/prometheus-config-reloader:v0.48.1"` + Port string `default:"8429"` + UseDefaultResources bool `default:"true"` + Resource struct { + Limit struct { + Mem string `default:"500Mi"` + Cpu string `default:"200m"` + } + Request struct { + Mem string `default:"200Mi"` + Cpu string `default:"50m"` + } + } + ConfigReloaderCPU string `default:"100m"` + ConfigReloaderMemory string `default:"25Mi"` + }(struct { Image string `default:"victoriametrics/vmagent"` Version string `default:"v1.58.0"` ConfigReloadImage string `default:"quay.io/prometheus-operator/prometheus-config-reloader:v0.48.1"` @@ -1034,7 +1070,7 @@ func Test_buildConfigReloaderArgs(t *testing.T) { } ConfigReloaderCPU string ConfigReloaderMemory string - }{ConfigReloadImage: "quay.io/coreos/prometheus-config-reloader:v0.42.0"}), + }{ConfigReloadImage: "quay.io/coreos/prometheus-config-reloader:v0.42.0"})), }, }, want: []string{ diff --git a/docs/api.MD b/docs/api.MD index 919e0a37..227fdd44 100644 --- a/docs/api.MD +++ b/docs/api.MD @@ -1246,6 +1246,7 @@ TargetRef describes target for user traffic forwarding. one of target types can | crd | CRD describes exist operator's CRD object, operator generates access url based on CRD params. | *[CRDRef](#crdref) | false | | static | Static - user defined url for traffic forward, for instance http://vmsingle:8429 | *[StaticRef](#staticref) | false | | paths | Paths - matched path to route. | []string | false | +| target_path_suffx | QueryParams []string `json:\"queryParams,omitempty\"` TargetPathSuffix allows to add some suffix to the target path It allows to hide tenant configuration from user with crd as ref. it also may contain any url encoded params. | string | false | [Back to TOC](#table-of-contents) @@ -1337,7 +1338,7 @@ VMAuthSpec defines the desired state of VMAuth | configMaps | ConfigMaps is a list of ConfigMaps in the same namespace as the VMAuth object, which shall be mounted into the VMAuth Pods. | []string | false | | logLevel | LogLevel for victoria metrics single to be configured with. | string | false | | logFormat | LogFormat for VMAuth to be configured with. | string | false | -| replicaCount | ReplicaCount is the expected size of the VMAuth it can be 0 or 1 if you need more - use vm cluster | *int32 | false | +| replicaCount | ReplicaCount is the expected size of the VMAuth | *int32 | false | | volumes | Volumes allows configuration of additional volumes on the output deploy definition. Volumes specified will be appended to other volumes that are generated as a result of StorageSpec objects. | [][v1.Volume](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#volume-v1-core) | false | | volumeMounts | VolumeMounts allows configuration of additional VolumeMounts on the output Deployment definition. VolumeMounts specified will be appended to other VolumeMounts in the VMAuth container, that are generated as a result of StorageSpec objects. | [][v1.VolumeMount](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#volumemount-v1-core) | false | | resources | Resources container resource request and limits, https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ if not defined default resources from operator config will be used | [v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#resourcerequirements-v1-core) | false | diff --git a/internal/config/config.go b/internal/config/config.go index fbc34cf1..913f3d36 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -38,7 +38,7 @@ type BaseOperatorConf struct { PSPAutoCreateEnabled bool `default:"true"` VMAlertDefault struct { Image string `default:"victoriametrics/vmalert"` - Version string `default:"v1.58.0"` + Version string `default:"v1.63.0"` Port string `default:"8080"` UseDefaultResources bool `default:"true"` Resource struct { @@ -57,7 +57,7 @@ type BaseOperatorConf struct { } VMAgentDefault struct { Image string `default:"victoriametrics/vmagent"` - Version string `default:"v1.58.0"` + Version string `default:"v1.63.0"` ConfigReloadImage string `default:"quay.io/prometheus-operator/prometheus-config-reloader:v0.48.1"` Port string `default:"8429"` UseDefaultResources bool `default:"true"` @@ -77,7 +77,7 @@ type BaseOperatorConf struct { VMSingleDefault struct { Image string `default:"victoriametrics/victoria-metrics"` - Version string `default:"v1.58.0"` + Version string `default:"v1.63.0"` Port string `default:"8429"` UseDefaultResources bool `default:"true"` Resource struct { @@ -98,7 +98,7 @@ type BaseOperatorConf struct { UseDefaultResources bool `default:"true"` VMSelectDefault struct { Image string `default:"victoriametrics/vmselect"` - Version string `default:"v1.58.0-cluster"` + Version string `default:"v1.63.0-cluster"` Port string `default:"8481"` Resource struct { Limit struct { @@ -113,7 +113,7 @@ type BaseOperatorConf struct { } VMStorageDefault struct { Image string `default:"victoriametrics/vmstorage"` - Version string `default:"v1.58.0-cluster"` + Version string `default:"v1.63.0-cluster"` VMInsertPort string `default:"8400"` VMSelectPort string `default:"8401"` Port string `default:"8482"` @@ -130,7 +130,7 @@ type BaseOperatorConf struct { } VMInsertDefault struct { Image string `default:"victoriametrics/vminsert"` - Version string `default:"v1.58.0-cluster"` + Version string `default:"v1.63.0-cluster"` Port string `default:"8480"` Resource struct { Limit struct { @@ -168,7 +168,7 @@ type BaseOperatorConf struct { DisableSelfServiceScrapeCreation bool `default:"false"` VMBackup struct { Image string `default:"victoriametrics/vmbackupmanager"` - Version string `default:"v1.58.0-enterprise"` + Version string `default:"v1.63.0-enterprise"` Port string `default:"8300"` UseDefaultResources bool `default:"true"` Resource struct { diff --git a/vars.MD b/vars.MD index 159e4e8c..c53ad08d 100644 --- a/vars.MD +++ b/vars.MD @@ -1,5 +1,5 @@ # Auto Generated vars for package config -## updated at Sun Jul 11 13:38:18 UTC 2021 +## updated at Wed Jul 28 03:29:22 UTC 2021 | varible name | variable default value | variable required | variable description | @@ -8,7 +8,7 @@ | VM_CUSTOMCONFIGRELOADERIMAGE | victoriametrics/operator:config-reloader-0.1.0 | false | - | | VM_PSPAUTOCREATEENABLED | true | false | - | | VM_VMALERTDEFAULT_IMAGE | victoriametrics/vmalert | false | - | -| VM_VMALERTDEFAULT_VERSION | v1.58.0 | false | - | +| VM_VMALERTDEFAULT_VERSION | v1.63.0 | false | - | | VM_VMALERTDEFAULT_PORT | 8080 | false | - | | VM_VMALERTDEFAULT_USEDEFAULTRESOURCES | true | false | - | | VM_VMALERTDEFAULT_RESOURCE_LIMIT_MEM | 500Mi | false | - | @@ -19,7 +19,7 @@ | VM_VMALERTDEFAULT_CONFIGRELOADERMEMORY | 25Mi | false | - | | VM_VMALERTDEFAULT_CONFIGRELOADIMAGE | jimmidyson/configmap-reload:v0.3.0 | false | - | | VM_VMAGENTDEFAULT_IMAGE | victoriametrics/vmagent | false | - | -| VM_VMAGENTDEFAULT_VERSION | v1.58.0 | false | - | +| VM_VMAGENTDEFAULT_VERSION | v1.63.0 | false | - | | VM_VMAGENTDEFAULT_CONFIGRELOADIMAGE | quay.io/prometheus-operator/prometheus-config-reloader:v0.48.1 | false | - | | VM_VMAGENTDEFAULT_PORT | 8429 | false | - | | VM_VMAGENTDEFAULT_USEDEFAULTRESOURCES | true | false | - | @@ -30,7 +30,7 @@ | VM_VMAGENTDEFAULT_CONFIGRELOADERCPU | 100m | false | - | | VM_VMAGENTDEFAULT_CONFIGRELOADERMEMORY | 25Mi | false | - | | VM_VMSINGLEDEFAULT_IMAGE | victoriametrics/victoria-metrics | false | - | -| VM_VMSINGLEDEFAULT_VERSION | v1.58.0 | false | - | +| VM_VMSINGLEDEFAULT_VERSION | v1.63.0 | false | - | | VM_VMSINGLEDEFAULT_PORT | 8429 | false | - | | VM_VMSINGLEDEFAULT_USEDEFAULTRESOURCES | true | false | - | | VM_VMSINGLEDEFAULT_RESOURCE_LIMIT_MEM | 1500Mi | false | - | @@ -41,14 +41,14 @@ | VM_VMSINGLEDEFAULT_CONFIGRELOADERMEMORY | 25Mi | false | - | | VM_VMCLUSTERDEFAULT_USEDEFAULTRESOURCES | true | false | - | | VM_VMCLUSTERDEFAULT_VMSELECTDEFAULT_IMAGE | victoriametrics/vmselect | false | - | -| VM_VMCLUSTERDEFAULT_VMSELECTDEFAULT_VERSION | v1.58.0-cluster | false | - | +| VM_VMCLUSTERDEFAULT_VMSELECTDEFAULT_VERSION | v1.63.0-cluster | false | - | | VM_VMCLUSTERDEFAULT_VMSELECTDEFAULT_PORT | 8481 | false | - | | VM_VMCLUSTERDEFAULT_VMSELECTDEFAULT_RESOURCE_LIMIT_MEM | 1000Mi | false | - | | VM_VMCLUSTERDEFAULT_VMSELECTDEFAULT_RESOURCE_LIMIT_CPU | 500m | false | - | | VM_VMCLUSTERDEFAULT_VMSELECTDEFAULT_RESOURCE_REQUEST_MEM | 500Mi | false | - | | VM_VMCLUSTERDEFAULT_VMSELECTDEFAULT_RESOURCE_REQUEST_CPU | 100m | false | - | | VM_VMCLUSTERDEFAULT_VMSTORAGEDEFAULT_IMAGE | victoriametrics/vmstorage | false | - | -| VM_VMCLUSTERDEFAULT_VMSTORAGEDEFAULT_VERSION | v1.58.0-cluster | false | - | +| VM_VMCLUSTERDEFAULT_VMSTORAGEDEFAULT_VERSION | v1.63.0-cluster | false | - | | VM_VMCLUSTERDEFAULT_VMSTORAGEDEFAULT_VMINSERTPORT | 8400 | false | - | | VM_VMCLUSTERDEFAULT_VMSTORAGEDEFAULT_VMSELECTPORT | 8401 | false | - | | VM_VMCLUSTERDEFAULT_VMSTORAGEDEFAULT_PORT | 8482 | false | - | @@ -57,7 +57,7 @@ | VM_VMCLUSTERDEFAULT_VMSTORAGEDEFAULT_RESOURCE_REQUEST_MEM | 500Mi | false | - | | VM_VMCLUSTERDEFAULT_VMSTORAGEDEFAULT_RESOURCE_REQUEST_CPU | 250m | false | - | | VM_VMCLUSTERDEFAULT_VMINSERTDEFAULT_IMAGE | victoriametrics/vminsert | false | - | -| VM_VMCLUSTERDEFAULT_VMINSERTDEFAULT_VERSION | v1.58.0-cluster | false | - | +| VM_VMCLUSTERDEFAULT_VMINSERTDEFAULT_VERSION | v1.63.0-cluster | false | - | | VM_VMCLUSTERDEFAULT_VMINSERTDEFAULT_PORT | 8480 | false | - | | VM_VMCLUSTERDEFAULT_VMINSERTDEFAULT_RESOURCE_LIMIT_MEM | 500Mi | false | - | | VM_VMCLUSTERDEFAULT_VMINSERTDEFAULT_RESOURCE_LIMIT_CPU | 500m | false | - | @@ -76,7 +76,7 @@ | VM_VMALERTMANAGER_RESOURCE_REQUEST_CPU | 30m | false | - | | VM_DISABLESELFSERVICESCRAPECREATION | false | false | - | | VM_VMBACKUP_IMAGE | victoriametrics/vmbackupmanager | false | - | -| VM_VMBACKUP_VERSION | v1.58.0-enterprise | false | - | +| VM_VMBACKUP_VERSION | v1.63.0-enterprise | false | - | | VM_VMBACKUP_PORT | 8300 | false | - | | VM_VMBACKUP_USEDEFAULTRESOURCES | true | false | - | | VM_VMBACKUP_RESOURCE_LIMIT_MEM | 500Mi | false | - |