Use correct operator version in e2e tests (#287)

Jorres · web-flow · commit 3a1af221e48f · 2025-01-29T13:34:03.000+01:00
* fix: use correct operator version

* fix: init job launching on the same nodes

* fix: operator local values
diff --git a/Makefile b/Makefile
@@ -73,6 +73,7 @@ kind-init:
 	--name kind-ydb-operator
 	docker pull k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0
 	kind load docker-image k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0 --name kind-ydb-operator
+	kubectl cluster-info --context kind-kind-ydb-operator # yes, kind prefixes all context with one more 'kind-'
 	docker pull ${YDB_IMAGE}
 	kind load docker-image ${YDB_IMAGE} --name kind-ydb-operator
 
diff --git a/tests/test-k8s-objects/objects.go b/tests/test-k8s-objects/objects.go
@@ -109,6 +109,9 @@ func DefaultStorage(storageYamlConfigPath string) *v1alpha1.Storage {
 				AdditionalLabels: map[string]string{"ydb-cluster": "kind-storage"},
 				Affinity:         storageAntiAffinity,
 			},
+			InitJob: &v1alpha1.StorageInitJobSpec{
+				AdditionalLabels: map[string]string{"ydb-cluster": "kind-storage-init"},
+			},
 		},
 	}
 }
diff --git a/tests/test-utils/test-utils.go b/tests/test-utils/test-utils.go
@@ -108,7 +108,7 @@ func UpgradeOperatorWithHelm(namespace, version string) {
 		"ydb-operator",
 		YdbOperatorRemoteChart,
 		"--version", version,
-		"-f", pathToHelmValuesInLocalInstall,
+		"-f", pathToHelmValuesInRemoteInstall,
 	}
 
 	cmd := exec.Command("helm", args...)

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,9 @@ func DefaultStorage(storageYamlConfigPath string) *v1alpha1.Storage {`
`109`	`109`	`AdditionalLabels: map[string]string{"ydb-cluster": "kind-storage"},`
`110`	`110`	`Affinity: storageAntiAffinity,`
`111`	`111`	`},`
	`112`	`+ InitJob: &v1alpha1.StorageInitJobSpec{`
	`113`	`+ AdditionalLabels: map[string]string{"ydb-cluster": "kind-storage-init"},`
	`114`	`+ },`
`112`	`115`	`},`
`113`	`116`	`}`
`114`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func UpgradeOperatorWithHelm(namespace, version string) {`
`108`	`108`	`"ydb-operator",`
`109`	`109`	`YdbOperatorRemoteChart,`
`110`	`110`	`"--version", version,`
`111`		`- "-f", pathToHelmValuesInLocalInstall,`
	`111`	`+ "-f", pathToHelmValuesInRemoteInstall,`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`cmd := exec.Command("helm", args...)`