Skip to content

Commit 3a1af22

Browse files
authored
Use correct operator version in e2e tests (#287)
* fix: use correct operator version * fix: init job launching on the same nodes * fix: operator local values
1 parent 25b0d7a commit 3a1af22

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

Diff for: Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ kind-init:
7373
--name kind-ydb-operator
7474
docker pull k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0
7575
kind load docker-image k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0 --name kind-ydb-operator
76+
kubectl cluster-info --context kind-kind-ydb-operator # yes, kind prefixes all context with one more 'kind-'
7677
docker pull ${YDB_IMAGE}
7778
kind load docker-image ${YDB_IMAGE} --name kind-ydb-operator
7879

Diff for: tests/test-k8s-objects/objects.go

+3
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ func DefaultStorage(storageYamlConfigPath string) *v1alpha1.Storage {
109109
AdditionalLabels: map[string]string{"ydb-cluster": "kind-storage"},
110110
Affinity: storageAntiAffinity,
111111
},
112+
InitJob: &v1alpha1.StorageInitJobSpec{
113+
AdditionalLabels: map[string]string{"ydb-cluster": "kind-storage-init"},
114+
},
112115
},
113116
}
114117
}

Diff for: tests/test-utils/test-utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func UpgradeOperatorWithHelm(namespace, version string) {
108108
"ydb-operator",
109109
YdbOperatorRemoteChart,
110110
"--version", version,
111-
"-f", pathToHelmValuesInLocalInstall,
111+
"-f", pathToHelmValuesInRemoteInstall,
112112
}
113113

114114
cmd := exec.Command("helm", args...)

0 commit comments

Comments
 (0)