fix dep file for smart update 2 to use 8.0.14

better logs

add logcollector

some log improvements

revert smartup1 dep file

remove not needed imports

remove forgotten logs

Author: gkech

e2e-tests/smart-update2/conf/operator.9.9.9.pxc-operator.dep.json

@@ -1,6 +1,6 @@
 {
   "backup": {
-    "8.0.11": {
+    "8.0.14": {
       ">=": [
         {
           "var": "productVersion"

e2e-tests/smart-update2/conf/operator.9.9.9.pxc-operator.json

@@ -110,6 +110,14 @@
             "critical": false
           }
         },
+        "log_collector": {
+          "1.16.1": {
+            "image_path": "percona/percona-xtradb-cluster-operator:1.16.1-logcollector-fluentbit3.2.2",
+            "image_hash": "122a103902d27890dceaf1855f175ea706a126aac940feb1089520029937f4a9",
+            "status": "recommended",
+            "critical": false
+          }
+        },
         "operator": {
           "9.9.9": {
             "image_path": "percona/percona-xtradb-cluster-operator:main",

pkg/controller/pxc/vs.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/pkg/errors"
+
 	api "github.com/percona/percona-xtradb-cluster-operator/pkg/apis/pxc/v1"
 	vsc "github.com/percona/percona-xtradb-cluster-operator/pkg/version/client"
 	"github.com/percona/percona-xtradb-cluster-operator/pkg/version/client/models"
@@ -66,51 +68,47 @@ func (vs VersionServiceClient) GetExactVersion(cr *api.PerconaXtraDBCluster, end
 
 	pxcVersion, err := getVersion(resp.Payload.Versions[0].Matrix.Pxc)
 	if err != nil {
-		return DepVersion{}, err
+		return DepVersion{}, errors.Wrapf(err, "get pxc version")
 	}
 
 	backupVersion, err := getVersion(resp.Payload.Versions[0].Matrix.Backup)
 	if err != nil {
-		return DepVersion{}, err
+		return DepVersion{}, errors.Wrapf(err, "get backup version")
 	}
 
 	pmmVersion, err := getPMMVersion(resp.Payload.Versions[0].Matrix.Pmm, opts.PMM3Enabled)
 	if err != nil {
-		return DepVersion{}, err
+		return DepVersion{}, errors.Wrapf(err, "get pmm version")
 	}
 
 	proxySqlVersion, err := getVersion(resp.Payload.Versions[0].Matrix.Proxysql)
 	if err != nil {
-		return DepVersion{}, err
+		return DepVersion{}, errors.Wrapf(err, "get proxysql version")
 	}
 
 	haproxyVersion, err := getVersion(resp.Payload.Versions[0].Matrix.Haproxy)
 	if err != nil {
-		return DepVersion{}, err
+		return DepVersion{}, errors.Wrap(err, "haproxy version")
 	}
 
-	dv := DepVersion{
-		PXCImage:        resp.Payload.Versions[0].Matrix.Pxc[pxcVersion].ImagePath,
-		PXCVersion:      pxcVersion,
-		BackupImage:     resp.Payload.Versions[0].Matrix.Backup[backupVersion].ImagePath,
-		BackupVersion:   backupVersion,
-		ProxySqlImage:   resp.Payload.Versions[0].Matrix.Proxysql[proxySqlVersion].ImagePath,
-		ProxySqlVersion: proxySqlVersion,
-		PMMImage:        resp.Payload.Versions[0].Matrix.Pmm[pmmVersion].ImagePath,
-		PMMVersion:      pmmVersion,
-		HAProxyImage:    resp.Payload.Versions[0].Matrix.Haproxy[haproxyVersion].ImagePath,
-		HAProxyVersion:  haproxyVersion,
-	}
-
-	if cr.CompareVersionWith("1.7.0") >= 0 {
-		logCollectorVersion, err := getVersion(resp.Payload.Versions[0].Matrix.LogCollector)
-		if err != nil {
-			return DepVersion{}, err
-		}
-
-		dv.LogCollectorVersion = logCollectorVersion
-		dv.LogCollectorImage = resp.Payload.Versions[0].Matrix.LogCollector[logCollectorVersion].ImagePath
+	logCollectorVersion, err := getVersion(resp.Payload.Versions[0].Matrix.LogCollector)
+	if err != nil {
+		return DepVersion{}, errors.Wrap(err, "get logcollector version")
+	}
 
+	dv := DepVersion{
+		PXCImage:            resp.Payload.Versions[0].Matrix.Pxc[pxcVersion].ImagePath,
+		PXCVersion:          pxcVersion,
+		BackupImage:         resp.Payload.Versions[0].Matrix.Backup[backupVersion].ImagePath,
+		BackupVersion:       backupVersion,
+		ProxySqlImage:       resp.Payload.Versions[0].Matrix.Proxysql[proxySqlVersion].ImagePath,
+		ProxySqlVersion:     proxySqlVersion,
+		PMMImage:            resp.Payload.Versions[0].Matrix.Pmm[pmmVersion].ImagePath,
+		PMMVersion:          pmmVersion,
+		HAProxyImage:        resp.Payload.Versions[0].Matrix.Haproxy[haproxyVersion].ImagePath,
+		HAProxyVersion:      haproxyVersion,
+		LogCollectorVersion: logCollectorVersion,
+		LogCollectorImage:   resp.Payload.Versions[0].Matrix.LogCollector[logCollectorVersion].ImagePath,
 	}
 
 	return dv, nil
@@ -150,7 +148,7 @@ func getPMMVersion(versions map[string]models.VersionVersion, isPMM3 bool) (stri
 
 func getVersion(versions map[string]models.VersionVersion) (string, error) {
 	if len(versions) != 1 {
-		return "", fmt.Errorf("response has multiple or zero versions")
+		return "", fmt.Errorf("response has multiple or zero versions %v", versions)
 	}
 
 	for k := range versions {