diff --git a/.github/scripts/start-submarine.sh b/.github/scripts/start-submarine.sh index b5b9f66c08..9e30564de0 100644 --- a/.github/scripts/start-submarine.sh +++ b/.github/scripts/start-submarine.sh @@ -32,7 +32,7 @@ kubectl label namespace submarine istio-injection=enabled kubectl label namespace "$submarine_user_namespace" istio-injection=enabled helm dependency update ./helm-charts/submarine helm install --wait --set storageClass.provisioner=rancher.io/local-path --set storageClass.volumeBindingMode=WaitForFirstConsumer submarine ./helm-charts/submarine -n submarine -kubectl apply -f ./submarine-cloud-v2/artifacts/examples/example-submarine.yaml -n "$submarine_user_namespace" +kubectl apply -f ./submarine-cloud-v3/config/samples/_v1alpha1_submarine.yaml -n "$submarine_user_namespace" # Polling waiting for the submarine to be in the RUNNING state for ((i=0;i<$wait_times;++i)); do diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index c474fd3996..19a094ef8c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -258,7 +258,7 @@ jobs: echo ">>> mvn ${BUILD_FLAG} -B" mvn ${BUILD_FLAG} -B - name: Build Image locally - run: .github/scripts/build-image-locally.sh + run: .github/scripts/build-image-locally-v3.sh - name: Start submarine run: bash ./.github/scripts/start-submarine.sh - name: Test diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 0646733cfc..f3f20a5c0e 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -145,7 +145,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Build Image locally - run: .github/scripts/build-image-locally.sh + run: .github/scripts/build-image-locally-v3.sh - name: Start submarine run: bash ./.github/scripts/start-submarine.sh - name: Setup python environment diff --git a/helm-charts/submarine/crds/crd.yaml b/helm-charts/submarine/crds/crd.yaml index 858789740f..93a54b3bbd 100644 --- a/helm-charts/submarine/crds/crd.yaml +++ b/helm-charts/submarine/crds/crd.yaml @@ -99,7 +99,6 @@ spec: description: StorageSize is the storage size of the database type: string required: - - mysqlRootPasswordSecret - storageSize type: object minio: