wip

Author: Jorres

.github/workflows/run-tests.yml

@@ -3,10 +3,6 @@ name: run-tests
 on:
   pull_request
 
-# remove CI_RUNNER_CREATOR_KEY
-# remove GH_PERSONAL_ACCESS_TOKEN ?
-# remove CI_RUNNER_DEBUG_SSH_PUBLIC_KEY
-#
 jobs:
   lint:
     concurrency:
@@ -99,30 +95,18 @@ jobs:
     outputs:
       result: ${{ steps.run-e2e-tests.outputs.result }}
     steps:
-      # - name: disk-space
-      #   run: |
-      #     echo "Free space:"
-      #     df -h
       - name: Maximize build space
         uses: AdityaGarg8/[email protected]
         with:
           remove-android: 'true'
           remove-haskell: 'true'
           remove-codeql: 'true'
-      # - name: disk-space
-      #   run: |
-      #     echo "Free space:"
-      #     df -h
       - name: checkout
         uses: actions/checkout@v3
       - name: setup-go
         uses: actions/setup-go@v3
         with:
           go-version: '1.20'
-      # - name: disk-space-setup-go
-      #   run: |
-      #     echo "Free space:"
-      #     df -h
       - name: install-dependencies
         run: |
           sudo apt-get update
@@ -143,10 +127,6 @@ jobs:
           echo "$(pwd)" >> $GITHUB_PATH
           echo "$HOME/ydb/bin" >> $GITHUB_PATH
           echo "$HOME/go/bin" >> $GITHUB_PATH
-      # - name: disk-space-installing-deps
-      #   run: |
-      #     echo "Free space:"
-      #     df -h
       - name: check-dependencies
         run: |
           gcc --version
@@ -160,6 +140,7 @@ jobs:
           kind create cluster \
           --image=kindest/node:v1.25.3@sha256:cd248d1438192f7814fbca8fede13cfe5b9918746dfa12583976158a834fd5c5 \
           --config=./e2e/kind-cluster-config.yaml
+
           kubectl wait --timeout=5m --for=condition=ready node -l worker=true
 
           kubectl label --overwrite node kind-worker topology.kubernetes.io/zone=fakeZone1
@@ -176,10 +157,6 @@ jobs:
       - name: load-and-deploy-operator
         run: |
           kind load docker-image kind/ydb-operator:current --nodes kind-worker,kind-worker2,kind-worker3
-      # - name: disk-space-loading-operator
-      #   run: |
-      #     echo "Free space:"
-      #     df -h
       - name: pull-and-load-kube-webhook-certgen-image
         uses: nick-fields/retry@v3
         with:
@@ -195,13 +172,9 @@ jobs:
           sudo sysctl fs.inotify.max_user_instances=512
       - name: pull-and-load-ydb-image
         run: |
-          # TODO would be cool to parse YDB image from manifests to avoid duplicating information
-          docker pull cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12
-          kind load docker-image cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12 --nodes kind-worker,kind-worker2,kind-worker3
-      # - name: disk-space-loading-ydb
-      #   run: |
-      #     echo "Free space:"
-      #     df -h
+          image=$(grep "anchor_for_fetching_image_from_workflow" ./e2e/tests/**/*.go | grep -o -E '"cr\.yandex.*"')
+          docker pull $image
+          kind load docker-image $image --nodes kind-worker,kind-worker2,kind-worker3
       - name: setup-gotestsum
         run: |
           go install gotest.tools/[email protected]

Makefile

@@ -70,8 +70,8 @@ kind-init:
 	kind create cluster --config e2e/kind-cluster-config.yaml --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; \
-	docker pull cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12; \
-	kind load docker-image cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12 --name kind-ydb-operator
+	docker pull cr.yandex/crptqonuodf51kdj7a7d/ydb:23.3.17; \
+	kind load docker-image cr.yandex/crptqonuodf51kdj7a7d/ydb:23.3.17 --name kind-ydb-operator
 
 kind-load:
 	docker tag cr.yandex/yc/ydb-operator:latest kind/ydb-operator:current

docs/tests.md

@@ -88,14 +88,14 @@ kind create cluster \
 kubectl config use-context kind-local-kind
 
 # Within tests, the following two images are used:
-# cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12
+# cr.yandex/crptqonuodf51kdj7a7d/ydb:<version>
 # kind/ydb-operator:current
 
 # You have to download the ydb image and build the operator image yourself. Then, explicitly
 # upload them into the kind cluster. Refer to `./github/e2e.yaml` github workflow which essentially
 # does the same thing.
 kind --name local-kind load docker-image kind/ydb-operator:current
-kind --name local-kind load docker-image ydb:23.2.12
+kind --name local-kind load docker-image ydb:<version>
 
 # Run all tests with disabled concurrency, because there is only one cluster to run tests against
 go test -p 1 -v ./...

e2e/tests/test-objects/objects.go

@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	YdbImage              = "cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12"
+	YdbImage              = "cr.yandex/crptqonuodf51kdj7a7d/ydb:23.3.17" // anchor_for_fetching_image_from_workflow
 	YdbNamespace          = "ydb"
 	StorageName           = "storage"
 	DatabaseName          = "database"

samples/database.yaml

@@ -4,7 +4,7 @@ metadata:
   name: database-sample
 spec:
   image:
-    name: cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12
+    name: cr.yandex/crptqonuodf51kdj7a7d/ydb:23.3.17
   nodes: 3
   resources:
     storageUnits:

samples/minikube/database.yaml

@@ -4,7 +4,7 @@ metadata:
   name: database-minikube-sample
 spec:
   image:
-    name: cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12
+    name: cr.yandex/crptqonuodf51kdj7a7d/ydb:23.3.17
   nodes: 1
   domain: Root
   service:

samples/minikube/storage.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   dataStore: []
   image:
-    name: cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12
+    name: cr.yandex/crptqonuodf51kdj7a7d/ydb:23.3.17
   nodes: 1
   domain: Root
   erasure: none

samples/storage-block-4-2.yaml

@@ -11,7 +11,7 @@ spec:
         storage: 93Gi
     volumeMode: Block
   image:
-    name: cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12
+    name: cr.yandex/crptqonuodf51kdj7a7d/ydb:23.3.17
   nodes: 8
   erasure: block-4-2
   configuration: |-

samples/storage-mirror-3dc-nodeset.yaml

@@ -11,7 +11,7 @@ spec:
         requests:
           storage: 80Gi
   image:
-    name: cr.yandex/crptqonuodf51kdj7a7d/ydb:23.2.12
+    name: cr.yandex/crptqonuodf51kdj7a7d/ydb:23.3.17
   nodes: 9
   nodeSets:
     - name: nodeset-1