Merge 06aa294 into ca55ac1

vdaas · Feb 9, 2021 · 91c1048 · 91c1048
2 parents ca55ac1 + 06aa294
commit 91c1048
Show file tree

Hide file tree

Showing 82 changed files with 2,457 additions and 215 deletions.
diff --git a/.github/workflows/e2e-deploy.yml b/.github/workflows/e2e-deploy.yml
@@ -133,7 +133,7 @@ jobs:
           go test \
             -v tests/e2e/crud_test.go \
             -tags "e2e" \
-            -timeout 15m \
+            -timeout 30m \
             -host=localhost \
             -port=8081 \
             -dataset=`pwd`/hack/benchmark/assets/dataset/${DATASET} \
@@ -143,7 +143,7 @@ jobs:
             -get-object-num=5 \
             -update-num=2 \
             -remove-num=2 \
-            -wait-after-insert=3m \
+            -wait-after-insert=10m \
             -portforward \
             -portforward-ns=default \
             -portforward-pod-name=${podname} \
@@ -255,7 +255,7 @@ jobs:
           go test \
             -v tests/e2e/crud_test.go \
             -tags "e2e" \
-            -timeout 15m \
+            -timeout 30m \
             -host=localhost \
             -port=8081 \
             -dataset=`pwd`/hack/benchmark/assets/dataset/${DATASET} \
@@ -265,7 +265,7 @@ jobs:
             -get-object-num=10 \
             -update-num=3 \
             -remove-num=2 \
-            -wait-after-insert=3m \
+            -wait-after-insert=10m \
             -portforward \
             -portforward-ns=default \
             -portforward-pod-name=${podname} \

diff --git a/Makefile b/Makefile
@@ -233,15 +233,15 @@ SHELL = bash
 
 E2E_BIND_HOST                      ?= 127.0.0.1
 E2E_BIND_PORT                      ?= 8082
-E2E_TIMEOUT                        ?= 15m
+E2E_TIMEOUT                        ?= 30m
 E2E_DATASET_NAME                   ?= fashion-mnist-784-euclidean
-E2E_INSERT_COUNT                   ?= 1000
+E2E_INSERT_COUNT                   ?= 10000
 E2E_SEARCH_COUNT                   ?= 1000
-E2E_SEARCH_BY_ID_COUNT             ?= 10
+E2E_SEARCH_BY_ID_COUNT             ?= 100
 E2E_GET_OBJECT_COUNT               ?= 10
-E2E_UPDATE_COUNT                   ?= 3
+E2E_UPDATE_COUNT                   ?= 10
 E2E_REMOVE_COUNT                   ?= 3
-E2E_WAIT_FOR_CREATE_INDEX_DURATION ?= 3m
+E2E_WAIT_FOR_CREATE_INDEX_DURATION ?= 8m
 E2E_TARGET_NAME                    ?= vald-meta-gateway
 E2E_TARGET_POD_NAME                ?= $(eval E2E_TARGET_POD_NAME := $(shell kubectl get pods --selector=app=$(E2E_TARGET_NAME) | tail -1 | cut -f1 -d " "))$(E2E_TARGET_POD_NAME)
 E2E_TARGET_NAMESPACE               ?= default

diff --git a/charts/vald/templates/_helpers.tpl b/charts/vald/templates/_helpers.tpl
@@ -456,6 +456,7 @@ tls:
   cert: {{ default .default.tls.cert .Values.tls.cert | quote }}
   key: {{ default .default.tls.key .Values.tls.key | quote }}
   ca: {{ default .default.tls.ca .Values.tls.ca | quote }}
+  insecure_skip_verify: {{ default .default.tls.insecure_skip_verify .Values.tls.insecure_skip_verify }}
   {{- else }}
   {{- toYaml .default.tls | nindent 2 }}
   {{- end }}
@@ -551,6 +552,7 @@ dial_option:
       cert: {{ default .default.dial_option.tcp.tls.cert .Values.dial_option.tcp.tls.cert | quote }}
       key: {{ default .default.dial_option.tcp.tls.key .Values.dial_option.tcp.tls.key | quote }}
       ca: {{ default .default.dial_option.tcp.tls.ca .Values.dial_option.tcp.tls.ca | quote }}
+      insecure_skip_verify: {{ default .default.dial_option.tcp.tls.insecure_skip_verify .Values.dial_option.tcp.tls.insecure_skip_verify }}
       {{- else }}
       {{- toYaml .default.dial_option.tcp.tls | nindent 6 }}
       {{- end }}
@@ -574,6 +576,7 @@ tls:
   cert: {{ default .default.tls.cert .Values.tls.cert | quote }}
   key: {{ default .default.tls.key .Values.tls.key | quote }}
   ca: {{ default .default.tls.ca .Values.tls.ca | quote }}
+  insecure_skip_verify: {{ default .default.tls.insecure_skip_verify .Values.tls.insecure_skip_verify }}
   {{- else }}
   {{- toYaml .default.tls | nindent 2 }}
   {{- end }}

diff --git a/charts/vald/templates/gateway/backup/daemonset.yaml b/charts/vald/templates/gateway/backup/daemonset.yaml
@@ -118,7 +118,7 @@ spec:
       {{- end }}
       {{- if $gateway.podPriority }}
       {{- if $gateway.podPriority.enabled }}
-      priorityClassName: {{ $gateway.name }}-priority
+      priorityClassName: {{ .Release.Namespace }}-{{ $gateway.name }}-priority
       {{- end }}
       {{- end }}
 status:

diff --git a/charts/vald/templates/gateway/backup/deployment.yaml b/charts/vald/templates/gateway/backup/deployment.yaml
@@ -123,7 +123,7 @@ spec:
       {{- end }}
       {{- if $gateway.podPriority }}
       {{- if $gateway.podPriority.enabled }}
-      priorityClassName: {{ $gateway.name }}-priority
+      priorityClassName: {{ .Release.Namespace }}-{{ $gateway.name }}-priority
       {{- end }}
       {{- end }}
 status:

diff --git a/charts/vald/templates/gateway/filter/daemonset.yaml b/charts/vald/templates/gateway/filter/daemonset.yaml
@@ -118,7 +118,7 @@ spec:
       {{- end }}
       {{- if $gateway.podPriority }}
       {{- if $gateway.podPriority.enabled }}
-      priorityClassName: {{ $gateway.name }}-priority
+      priorityClassName: {{ .Release.Namespace }}-{{ $gateway.name }}-priority
       {{- end }}
       {{- end }}
 status:

diff --git a/charts/vald/templates/gateway/filter/deployment.yaml b/charts/vald/templates/gateway/filter/deployment.yaml
@@ -123,7 +123,7 @@ spec:
       {{- end }}
       {{- if $gateway.podPriority }}
       {{- if $gateway.podPriority.enabled }}
-      priorityClassName: {{ $gateway.name }}-priority
+      priorityClassName: {{ .Release.Namespace }}-{{ $gateway.name }}-priority
       {{- end }}
       {{- end }}
 status:

diff --git a/charts/vald/templates/gateway/lb/daemonset.yaml b/charts/vald/templates/gateway/lb/daemonset.yaml
@@ -118,7 +118,7 @@ spec:
       {{- end }}
       {{- if $gateway.podPriority }}
       {{- if $gateway.podPriority.enabled }}
-      priorityClassName: {{ $gateway.name }}-priority
+      priorityClassName: {{ .Release.Namespace }}-{{ $gateway.name }}-priority
       {{- end }}
       {{- end }}
 status:

diff --git a/charts/vald/templates/gateway/lb/deployment.yaml b/charts/vald/templates/gateway/lb/deployment.yaml
@@ -123,7 +123,7 @@ spec:
       {{- end }}
       {{- if $gateway.podPriority }}
       {{- if $gateway.podPriority.enabled }}
-      priorityClassName: {{ $gateway.name }}-priority
+      priorityClassName: {{ .Release.Namespace }}-{{ $gateway.name }}-priority
       {{- end }}
       {{- end }}
 status:

diff --git a/charts/vald/templates/gateway/meta/daemonset.yaml b/charts/vald/templates/gateway/meta/daemonset.yaml
@@ -118,7 +118,7 @@ spec:
       {{- end }}
       {{- if $gateway.podPriority }}
       {{- if $gateway.podPriority.enabled }}
-      priorityClassName: {{ $gateway.name }}-priority
+      priorityClassName: {{ .Release.Namespace }}-{{ $gateway.name }}-priority
       {{- end }}
       {{- end }}
 status:

diff --git a/charts/vald/templates/gateway/meta/deployment.yaml b/charts/vald/templates/gateway/meta/deployment.yaml
@@ -123,7 +123,7 @@ spec:
       {{- end }}
       {{- if $gateway.podPriority }}
       {{- if $gateway.podPriority.enabled }}
-      priorityClassName: {{ $gateway.name }}-priority
+      priorityClassName: {{ .Release.Namespace }}-{{ $gateway.name }}-priority
       {{- end }}
       {{- end }}
 status:

diff --git a/charts/vald/values.schema.json b/charts/vald/values.schema.json