Skip to content
This repository has been archived by the owner on Jul 10, 2024. It is now read-only.

Commit

Permalink
SUBMARINE-1375. Fix custom resource definition requiring database secret
Browse files Browse the repository at this point in the history
### 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 <[email protected]>

Signed-off-by: cdmikechen <[email protected]>

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

25d5da9 [cdmikechen] Replace submarine-operator-v2 to v3
92af52b [cdmikechen] Remove mysqlRootPasswordSecret in database required
  • Loading branch information
cdmikechen committed Apr 2, 2023
1 parent 077ddbb commit 1783097
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/start-submarine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion helm-charts/submarine/crds/crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ spec:
description: StorageSize is the storage size of the database
type: string
required:
- mysqlRootPasswordSecret
- storageSize
type: object
minio:
Expand Down

0 comments on commit 1783097

Please sign in to comment.