Bug fix for gateway

.github/helm/values/values-scylla.yaml

@@ -62,8 +62,8 @@ agent:
       cpu: 100m
       memory: 50Mi
   ngt:
-    auto_index_duration_limit: 3m
-    auto_index_check_duration: 1m
+    auto_index_duration_limit: 2m
+    auto_index_check_duration: 30s
     auto_index_length: 1000
     dimension: 784
 
@@ -122,6 +122,10 @@ manager:
       requests:
         cpu: 100m
         memory: 30Mi
+    indexer:
+      auto_index_duration_limit: 2m
+      auto_index_check_duration: 30s
+      auto_index_length: 1000
 
 meta:
   minReplicas: 3
@@ -150,3 +154,17 @@ meta:
       hosts:
         - vald-scylla-cluster-dc0-rack0-0.scylla.svc.cluster.local
       consistency: one
+
+initializer:
+  cassandra:
+    enabled: true
+    name: scylla-init
+    env:
+      - name: CASSANDRA_HOST
+        value: vald-scylla-cluster-dc0-rack0-0.scylla.svc.cluster.local
+    configmap:
+      enabled: true
+      name: scylla-initdb
+      user: ""
+    secret:
+      enabled: false

.github/workflows/e2e-deploy.yml

@@ -110,8 +110,8 @@ jobs:
         run: |
           sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
 
-          make k8s/external/mysql/deploy
-          make k8s/external/redis/deploy
+          make K8S_SLEEP_DURATION_FOR_WAIT_COMMAND=10 k8s/external/mysql/deploy
+          make K8S_SLEEP_DURATION_FOR_WAIT_COMMAND=10 k8s/external/redis/deploy
 
           helm repo add vald https://vald.vdaas.org/charts
           tag=$(cat versions/VALD_VERSION)
@@ -143,7 +143,7 @@ jobs:
             -get-object-num=5 \
             -update-num=2 \
             -remove-num=2 \
-            -wait-after-insert=2m \
+            -wait-after-insert=3m \
             -portforward \
             -portforward-ns=default \
             -portforward-pod-name=${podname} \
@@ -233,7 +233,7 @@ jobs:
           helm version
       - name: deploy vald
         run: |
-          make k8s/external/scylla/deploy
+          make K8S_SLEEP_DURATION_FOR_WAIT_COMMAND=10 k8s/external/scylla/deploy
 
           helm repo add vald https://vald.vdaas.org/charts
           tag=$(cat versions/VALD_VERSION)
@@ -265,7 +265,7 @@ jobs:
             -get-object-num=10 \
             -update-num=3 \
             -remove-num=2 \
-            -wait-after-insert=2m \
+            -wait-after-insert=3m \
             -portforward \
             -portforward-ns=default \
             -portforward-pod-name=${podname} \
@@ -341,7 +341,7 @@ jobs:
           helm version
       - name: deploy vald
         run: |
-          make k8s/external/minio/deploy
+          make K8S_SLEEP_DURATION_FOR_WAIT_COMMAND=10 k8s/external/minio/deploy
 
           helm repo add vald https://vald.vdaas.org/charts
           tag=$(cat versions/VALD_VERSION)

Makefile

@@ -223,7 +223,8 @@ DISTROLESS_IMAGE      ?= gcr.io/distroless/static
 DISTROLESS_IMAGE_TAG  ?= nonroot
 UPX_OPTIONS           ?= -9
 
-K8S_EXTERNAL_SCYLLA_MANIFEST ?= k8s/external/scylla/scyllacluster.yaml
+K8S_EXTERNAL_SCYLLA_MANIFEST        ?= k8s/external/scylla/scyllacluster.yaml
+K8S_SLEEP_DURATION_FOR_WAIT_COMMAND ?= 5
 
 K8S_KUBECTL_VERSION ?= $(eval K8S_KUBECTL_VERSION := $(shell kubectl version --short))$(K8S_KUBECTL_VERSION)
 K8S_SERVER_VERSION ?= $(eval K8S_SERVER_VERSION := $(shell echo "$(K8S_KUBECTL_VERSION)" | sed -e "s/.*Server.*\(v[0-9]\.[0-9]*\)\..*/\1/g"))$(K8S_SERVER_VERSION)

Makefile.d/k8s.mk

@@ -203,6 +203,7 @@ k8s/vald/delete/scylla: \
 k8s/external/mysql/deploy:
 	kubectl apply -f k8s/jobs/db/initialize/mysql/configmap.yaml
 	kubectl apply -f k8s/external/mysql
+	sleep $(K8S_SLEEP_DURATION_FOR_WAIT_COMMAND)
 	kubectl wait --for=condition=ready pod -l app=mysql --timeout=600s
 
 .PHONY: k8s/external/mysql/delete
@@ -222,6 +223,7 @@ k8s/external/mysql/initialize:
 ## deploy redis to k8s
 k8s/external/redis/deploy:
 	kubectl apply -f k8s/external/redis
+	sleep $(K8S_SLEEP_DURATION_FOR_WAIT_COMMAND)
 	kubectl wait --for=condition=ready pod -l app=redis --timeout=600s
 
 .PHONY: k8s/external/redis/delete
@@ -266,12 +268,13 @@ k8s/external/cassandra/initialize:
 k8s/external/scylla/deploy: \
 	k8s/external/cert-manager/deploy
 	kubectl apply -f https://raw.githubusercontent.com/scylladb/scylla-operator/master/examples/common/operator.yaml
-	sleep 2
+	sleep $(K8S_SLEEP_DURATION_FOR_WAIT_COMMAND)
 	kubectl wait -n scylla-operator-system --for=condition=ready pod -l statefulset.kubernetes.io/pod-name=scylla-operator-controller-manager-0 --timeout=600s
 	kubectl -n scylla-operator-system get pod
 	kubectl apply -f $(K8S_EXTERNAL_SCYLLA_MANIFEST)
 	kubectl -n scylla get ScyllaCluster
 	kubectl -n scylla get pods
+	sleep 1
 	kubectl wait -n scylla --for=condition=ready pod -l statefulset.kubernetes.io/pod-name=vald-scylla-cluster-dc0-rack0-0 --timeout=600s
 	kubectl -n scylla get ScyllaCluster
 	kubectl -n scylla get pods
@@ -287,7 +290,7 @@ k8s/external/scylla/delete: \
 ## deploy cert-manager
 k8s/external/cert-manager/deploy:
 	kubectl apply -f https://github.com/jetstack/cert-manager/releases/latest/download/cert-manager.yaml
-	sleep 2
+	sleep $(K8S_SLEEP_DURATION_FOR_WAIT_COMMAND)
 	kubectl wait -n cert-manager --for=condition=ready pod -l app=cert-manager --timeout=60s
 	kubectl wait -n cert-manager --for=condition=ready pod -l app=cainjector --timeout=60s
 	kubectl wait -n cert-manager --for=condition=ready pod -l app=webhook --timeout=60s
@@ -303,6 +306,7 @@ k8s/external/cert-manager/delete:
 ## deploy minio
 k8s/external/minio/deploy:
 	kubectl apply -f k8s/external/minio
+	sleep $(K8S_SLEEP_DURATION_FOR_WAIT_COMMAND)
 	kubectl wait --for=condition=ready pod -l app=minio --timeout=600s
 
 .PHONY: k8s/external/minio/delete
@@ -314,6 +318,7 @@ k8s/external/minio/delete:
 ## deploy metrics-serrver
 k8s/metrics/metrics-server/deploy:
 	kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
+	sleep $(K8S_SLEEP_DURATION_FOR_WAIT_COMMAND)
 	kubectl wait -n kube-system --for=condition=ready pod -l k8s-app=metrics-server --timeout=600s
 
 .PHONY: k8s/metrics/metrics-server/delete