From 17830975a87fbae61f9631a965ef274040f9c8d9 Mon Sep 17 00:00:00 2001
From: cdmikechen <cdmikechen@apache.org>
Date: Sat, 1 Apr 2023 12:45:08 +0800
Subject: [PATCH] SUBMARINE-1375. Fix custom resource definition requiring
 database secret

### What is this PR for?
The operator-v3 based custom resource already supports automatic secret generation without the database password, so we don't need this config to be required.

### What type of PR is it?
Bug Fix

### Todos
* [x] - Remove mysqlRootPasswordSecret required

### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-1375

### How should this be tested?
NA

### Screenshots (if appropriate)
NA

### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No

Author: cdmikechen <cdmikechen@apache.org>

Signed-off-by: cdmikechen <cdmikechen@apache.org>

Closes #1059 from cdmikechen/SUBMARINE-1375 and squashes the following commits:

25d5da93 [cdmikechen] Replace submarine-operator-v2 to v3
92af52b2 [cdmikechen] Remove mysqlRootPasswordSecret in database required
---
 .github/scripts/start-submarine.sh  | 2 +-
 .github/workflows/master.yml        | 2 +-
 .github/workflows/python.yml        | 2 +-
 helm-charts/submarine/crds/crd.yaml | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

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: