chore: bump risingwave to v1.8.2 (#642)

* chore: bump risingwave to v1.8.1 Signed-off-by: arkbriar <arkbriar@gmail.com> * Try fixing e2e test, use etcd v3.4.32 instead of latest Signed-off-by: arkbriar <arkbriar@gmail.com> * Bump kind node image Signed-off-by: arkbriar <arkbriar@gmail.com> * Fix lib.sh Signed-off-by: arkbriar <arkbriar@gmail.com> * Bump cert-manager version in E2E Signed-off-by: arkbriar <arkbriar@gmail.com> * Bump to v1.8.2 Signed-off-by: arkbriar <arkbriar@gmail.com> * Increase timeout interval for service waiting Signed-off-by: arkbriar <arkbriar@gmail.com> * Revert "Bump kind node image" This reverts commit bb868ff. * Add additional sleep Signed-off-by: arkbriar <arkbriar@gmail.com> * Workaround by waiting for 30 more seconds Signed-off-by: arkbriar <arkbriar@gmail.com> --------- Signed-off-by: arkbriar <arkbriar@gmail.com>
risingwavelabs · May 6, 2024 · 31e28fc · 31e28fc
1 parent fb92f95
commit 31e28fc
Show file tree

Hide file tree

Showing 36 changed files with 71 additions and 39 deletions.
diff --git a/docs/general/aws-eks-iam-for-s3.md b/docs/general/aws-eks-iam-for-s3.md
@@ -41,7 +41,7 @@ kind: RisingWave
 metadata:
   name: risingwave
 spec:
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   #  metaStore:
   #    etcd:
   #      endpoint: etcd:2388

diff --git a/docs/manifests/risingwave/advanced/separate-batch-streaming-modes.yaml b/docs/manifests/risingwave/advanced/separate-batch-streaming-modes.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
         - name: etcd
-          image: quay.io/coreos/etcd:latest
+          image: quay.io/coreos/etcd:v3.4.32
           imagePullPolicy: IfNotPresent
           command:
           - /usr/local/bin/etcd
@@ -87,7 +87,7 @@ spec:
         accessKeyRef: AccessKeyID
         secretAccessKeyRef: SecretAccessKey
       region: ap-southeast-1
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-aliyun-oss.yaml b/docs/manifests/risingwave/risingwave-aliyun-oss.yaml
@@ -21,7 +21,7 @@ spec:
       internalEndpoint: false
       credentials:
         secretName: risingwave-aliyun-oss-credentials
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-customize-config.yaml b/docs/manifests/risingwave/risingwave-customize-config.yaml
@@ -37,7 +37,7 @@ spec:
     memory: true
   stateStore:
     memory: true
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-etcd-auth.yaml b/docs/manifests/risingwave/risingwave-etcd-auth.yaml
@@ -33,7 +33,7 @@ spec:
       enableServiceLinks: false
       containers:
       - name: etcd
-        image: quay.io/coreos/etcd:latest
+        image: quay.io/coreos/etcd:v3.4.32
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -97,7 +97,7 @@ spec:
         passwordKeyRef: password
   stateStore:
     memory: true
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-etcd-azure.yaml b/docs/manifests/risingwave/risingwave-etcd-azure.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
         - name: etcd
-          image: quay.io/coreos/etcd:latest
+          image: quay.io/coreos/etcd:v3.4.32
           imagePullPolicy: IfNotPresent
           command:
           - /usr/local/bin/etcd
@@ -93,7 +93,7 @@ spec:
       container: your-azure-container-name
       root: risingwave
       endpoint: https://your-azure-account-name.blob.core.windows.net
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-etcd-hdfs.yaml b/docs/manifests/risingwave/risingwave-etcd-hdfs.yaml
@@ -345,7 +345,7 @@ spec:
     spec:
       containers:
         - name: etcd
-          image: quay.io/coreos/etcd:latest
+          image: quay.io/coreos/etcd:v3.4.32
           imagePullPolicy: IfNotPresent
           command:
           - /usr/local/bin/etcd

diff --git a/docs/manifests/risingwave/risingwave-etcd-local-disk.yaml b/docs/manifests/risingwave/risingwave-etcd-local-disk.yaml
@@ -44,7 +44,7 @@ spec:
     spec:
       containers:
       - name: etcd
-        image: quay.io/coreos/etcd:latest
+        image: quay.io/coreos/etcd:v3.4.32
         imagePullPolicy: IfNotPresent
         command:
         - /usr/local/bin/etcd
@@ -105,7 +105,7 @@ kind: RisingWave
 metadata:
   name: risingwave
 spec:
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   metaStore:
     etcd:
       endpoint: etcd:2388

diff --git a/docs/manifests/risingwave/risingwave-etcd-minio.yaml b/docs/manifests/risingwave/risingwave-etcd-minio.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
         - name: etcd
-          image: quay.io/coreos/etcd:latest
+          image: quay.io/coreos/etcd:v3.4.32
           imagePullPolicy: IfNotPresent
           command:
           - /usr/local/bin/etcd
@@ -154,7 +154,7 @@ spec:
         usernameKeyRef: username
         passwordKeyRef: password
       endpoint: risingwave-minio:9301
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-etcd-s3.yaml b/docs/manifests/risingwave/risingwave-etcd-s3.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
         - name: etcd
-          image: quay.io/coreos/etcd:latest
+          image: quay.io/coreos/etcd:v3.4.32
           imagePullPolicy: IfNotPresent
           command:
           - /usr/local/bin/etcd
@@ -87,7 +87,7 @@ spec:
         accessKeyRef: AccessKeyID
         secretAccessKeyRef: SecretAccessKey
       region: ap-southeast-1
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-gcs.yaml b/docs/manifests/risingwave/risingwave-gcs.yaml
@@ -19,7 +19,7 @@ spec:
       credentials:
         secretName: gcs-credentials
         serviceAccountCredentialsKeyRef: ServiceAccountCredentials
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-huaweicloud-obs.yaml b/docs/manifests/risingwave/risingwave-huaweicloud-obs.yaml
@@ -19,7 +19,7 @@ spec:
       region: ap-southeast-2
       credentials:
         secretName: risingwave-huaweicloud-obs-credentials
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-im-memory-azure.yaml b/docs/manifests/risingwave/risingwave-im-memory-azure.yaml
@@ -20,7 +20,7 @@ spec:
       container: your-azure-container-name
       root: risingwave
       endpoint: https://your-azure-account-name.blob.core.windows.net
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-in-memory.yaml b/docs/manifests/risingwave/risingwave-in-memory.yaml
@@ -7,7 +7,7 @@ spec:
     memory: true
   stateStore:
     memory: true
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-s3-compatible.yaml b/docs/manifests/risingwave/risingwave-s3-compatible.yaml
@@ -20,7 +20,7 @@ spec:
       region: ap-guangzhou
       credentials:
         secretName: cos-credentials
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwave/risingwave-standalone.yaml b/docs/manifests/risingwave/risingwave-standalone.yaml
@@ -3,7 +3,7 @@ kind: RisingWave
 metadata:
   name: risingwave-standalone
 spec:
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   enableStandaloneMode: true
   components:
     standalone:

diff --git a/docs/manifests/risingwavescaleview/sv-example-frontend.yaml b/docs/manifests/risingwavescaleview/sv-example-frontend.yaml
@@ -3,7 +3,7 @@ kind: RisingWave
 metadata:
   name: sv-example
 spec:
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/risingwavescaleview/sv-spot-compactor.yaml b/docs/manifests/risingwavescaleview/sv-spot-compactor.yaml
@@ -3,7 +3,7 @@ kind: RisingWave
 metadata:
   name: sv-example
 spec:
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   components:
     meta:
       nodeGroups:

diff --git a/docs/manifests/stable/memory/risingwave.yaml b/docs/manifests/stable/memory/risingwave.yaml
@@ -3,7 +3,7 @@ kind: RisingWave
 metadata:
   name: risingwave
 spec:
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   metaStore:
     memory: true
   stateStore:

diff --git a/docs/manifests/stable/persistent/minio/risingwave.yaml b/docs/manifests/stable/persistent/minio/risingwave.yaml
@@ -44,7 +44,7 @@ spec:
     spec:
       containers:
       - name: etcd
-        image: quay.io/coreos/etcd:latest
+        image: quay.io/coreos/etcd:v3.4.32
         imagePullPolicy: IfNotPresent
         command:
         - /usr/local/bin/etcd
@@ -177,7 +177,7 @@ kind: RisingWave
 metadata:
   name: risingwave
 spec:
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   metaStore:
     etcd:
       endpoint: etcd:2388

diff --git a/docs/manifests/stable/persistent/s3/risingwave.yaml b/docs/manifests/stable/persistent/s3/risingwave.yaml
@@ -44,7 +44,7 @@ spec:
     spec:
       containers:
       - name: etcd
-        image: quay.io/coreos/etcd:latest
+        image: quay.io/coreos/etcd:v3.4.32
         imagePullPolicy: IfNotPresent
         command:
         - /usr/local/bin/etcd
@@ -94,7 +94,7 @@ kind: RisingWave
 metadata:
   name: risingwave
 spec:
-  image: risingwavelabs/risingwave:v1.7.3
+  image: risingwavelabs/risingwave:v1.8.2
   metaStore:
     etcd:
       endpoint: etcd:2388

diff --git a/hack/scripts/install.sh b/hack/scripts/install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-CERT_MANAGER_VERSION=${CERT_MANAGER_VERSION:-v1.11.0}
+CERT_MANAGER_VERSION=${CERT_MANAGER_VERSION:-v1.14.5}
 RISINGWAVE_OPERATOR_VERSION=${RISINGWAVE_OPERATOR_VERSION:-latest}
 
 function link_to_risingwave_operator_manifests() {

diff --git a/pytest/conftest.py b/pytest/conftest.py
@@ -0,0 +1,6 @@
+def pytest_configure(config):
+    pass
+
+
+def pytest_unconfigure(config):
+    pass
diff --git a/pytest/test_deployment.py b/pytest/test_deployment.py
diff --git a/pytest/test_failover.py b/pytest/test_failover.py
diff --git a/pytest/test_installation.py b/pytest/test_installation.py
diff --git a/pytest/test_scaling.py b/pytest/test_scaling.py
diff --git a/pytest/test_update.py b/pytest/test_update.py
diff --git a/test/e2e/env b/test/e2e/env
@@ -1,5 +1,5 @@
 E2E_KUBERNETES_RUNTIME=kind
-E2E_RISINGWAVE_IMAGE=risingwavelabs/risingwave:v1.7.3
+E2E_RISINGWAVE_IMAGE=risingwavelabs/risingwave:v1.8.2
 E2E_AWS_S3_REGION=
 E2E_AWS_S3_BUCKET=
 E2E_AWS_ACCESS_KEY_ID=

diff --git a/test/e2e/testenv/lib.sh b/test/e2e/testenv/lib.sh
@@ -117,14 +117,14 @@ function testenv::k8s::load_docker_image() {
 }
 
 function testenv::k8s::cert_manager::install() {
-	local version=${CERT_MANAGER_VERSION:-v1.9.1}
+	local version=${CERT_MANAGER_VERSION:-v1.14.5}
 	shell::run k8s::kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/"${version}"/cert-manager.yaml
 
 	testenv::k8s::cert_manager::_wait
 }
 
 function testenv::k8s::cert_manager::uninstall() {
-	local version=${CERT_MANAGER_VERSION:-v1.9.1}
+	local version=${CERT_MANAGER_VERSION:-v1.14.5}
 	shell::run k8s::kubectl delete -f https://github.com/cert-manager/cert-manager/releases/download/"${version}"/cert-manager.yaml
 }
 

diff --git a/test/e2e/testenv/util/lib.sh b/test/e2e/testenv/util/lib.sh
@@ -66,7 +66,7 @@ function testenv::util::uninstall() {
 }
 
 function testenv::util::psql() {
-	if [[ -n ${PSQL_SCRIPT_FILE} ]]; then
+	if [[ -n ${PSQL_SCRIPT_FILE+x} ]]; then
 		kubectl -n "${_UTIL_NAMESPACE}" exec -i psql -c psql -- psql "$@" <"${PSQL_SCRIPT_FILE}"
 	else
 		kubectl -n "${_UTIL_NAMESPACE}" exec -i psql -c psql -- psql "$@"
@@ -109,9 +109,11 @@ function testenv::util::network::is_k8s_service_up() {
 }
 
 function testenv::util::network::wait_before_service_up() {
-	local threshold=60
+	local threshold=120
 	local current_epoch=0
 	local interval=5
+  local namespace=$1
+  local service=$2
 	while :; do
 		if testenv::util::network::is_k8s_service_up "${@}"; then
 			break

diff --git a/test/e2e/tests/risingwave/manifests/multi-meta/multi-meta.yaml b/test/e2e/tests/risingwave/manifests/multi-meta/multi-meta.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: etcd
-        image: quay.io/coreos/etcd:latest
+        image: quay.io/coreos/etcd:v3.4.32
         imagePullPolicy: IfNotPresent
         command:
         - /usr/local/bin/etcd

diff --git a/test/e2e/tests/risingwave/manifests/standalone/standalone.yaml b/test/e2e/tests/risingwave/manifests/standalone/standalone.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: etcd
-        image: quay.io/coreos/etcd:latest
+        image: quay.io/coreos/etcd:v3.4.32
         imagePullPolicy: IfNotPresent
         command:
         - /usr/local/bin/etcd

diff --git a/test/e2e/tests/risingwave/manifests/storages/meta-etcd.yaml b/test/e2e/tests/risingwave/manifests/storages/meta-etcd.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: etcd
-        image: quay.io/coreos/etcd:latest
+        image: quay.io/coreos/etcd:v3.4.32
         imagePullPolicy: IfNotPresent
         command:
         - /usr/local/bin/etcd

diff --git a/test/e2e/tests/risingwave/tests.sh b/test/e2e/tests/risingwave/tests.sh
@@ -160,10 +160,34 @@ function test::run::risingwave::multi_meta_failover() {
 	logging::info "Stopped!"
 }
 
+function test::risingwave::wait_before_compute_registered() {
+  local frontend_service_port
+  frontend_service_port=$(k8s::kubectl get svc/"${E2E_RISINGWAVE_NAME}-frontend" -o jsonpath='{.spec.ports[?(@.name=="service")].port}')
+
+  # Ensure at least one worker has been registered.
+  for _ in {0..10}; do
+    if testenv::util::psql -X -v ON_ERROR_STOP=1 -h "${E2E_RISINGWAVE_NAME}-frontend.${E2E_NAMESPACE}" \
+      -p "${frontend_service_port}" -d dev -U root \
+      -t -c "select * from rw_worker_nodes where type='WORKER_TYPE_COMPUTE_NODE' and state='RUNNING'" | grep -q "."; then
+      # sleep 30 more seconds for DNS to be propagated
+      sleep 30
+      return 0
+    else
+      logging::warn "No compute node registered yet!"
+      sleep 3
+    fi
+  done
+
+  logging::error "No compute node registered!"
+  return 1
+}
+
 function test::risingwave::check_status_with_simple_queries() {
 	local frontend_service_port
 	frontend_service_port=$(k8s::kubectl get svc/"${E2E_RISINGWAVE_NAME}-frontend" -o jsonpath='{.spec.ports[?(@.name=="service")].port}')
 
+	test::risingwave::wait_before_compute_registered || return 1
+
 	# shellcheck disable=SC2034
 	local PSQL_SCRIPT_FILE="${_E2E_RISINGWAVE_TEST_PATH}/query.sql"
 	testenv::util::psql -X -v ON_ERROR_STOP=1 -h "${E2E_RISINGWAVE_NAME}-frontend.${E2E_NAMESPACE}" -p "${frontend_service_port}" -d dev -U root

diff --git a/test/e2e/tests/tests.sh b/test/e2e/tests/tests.sh
@@ -15,7 +15,7 @@
 ${__E2E_SOURCE_TESTS_TESTS_SH__:=false} && return 0 || __E2E_SOURCE_TESTS_TESTS_SH__=true
 
 export E2E_RISINGWAVE_NAME="${E2E_RISINGWAVE_NAME:=e2e}"
-export E2E_RISINGWAVE_IMAGE="${E2E_RISINGWAVE_IMAGE:=risingwavelabs/risingwave:v1.7.3}"
+export E2E_RISINGWAVE_IMAGE="${E2E_RISINGWAVE_IMAGE:=risingwavelabs/risingwave:v1.8.2}"
 
 source "$(dirname "${BASH_SOURCE[0]}")/risingwave/tests.sh"
 source "$(dirname "${BASH_SOURCE[0]}")/risingwavescaleview/tests.sh"