You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@submarine.apache.org by pi...@apache.org on 2021/08/28 06:45:10 UTC
[submarine] branch master updated: SUBMARINE-999. Make the
submarine related storage class into one single storage class
This is an automated email from the ASF dual-hosted git repository.
pingsutw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 0afb01d SUBMARINE-999. Make the submarine related storage class into one single storage class
0afb01d is described below
commit 0afb01d055d4270701d650b99b963bdce7ede314
Author: Kenchu123 <k8...@gmail.com>
AuthorDate: Fri Aug 27 16:44:56 2021 +0800
SUBMARINE-999. Make the submarine related storage class into one single storage class
### What is this PR for?
<!-- A few sentences describing the overall goals of the pull request's commits.
First time? Check out the contributing guide - https://submarine.apache.org/contribution/contributions.html
-->
There are five storage class in helm charts for submarine (server, database, tensorboard, mlflow, minio, notebook).
However, they all have the same configurations, so we can just use one storage class instead.
### What type of PR is it?
[Improvement]
### Todos
### What is the Jira issue?
<!-- * Open an issue on Jira https://issues.apache.org/jira/browse/SUBMARINE/
* Put link here, and add [SUBMARINE-*Jira number*] in PR title, eg. `SUBMARINE-23. PR title`
-->
https://issues.apache.org/jira/browse/SUBMARINE-999
### How should this be tested?
<!--
* First time? Setup Travis CI as described on https://submarine.apache.org/contribution/contributions.html#continuous-integration
* Strongly recommended: add automated unit tests for any new or changed behavior
* Outline any manual steps to test the PR here.
-->
1. Install submarine operator
2. Add a submarine custom resource
3. Create a notebook from the workbench
You can find out that everything works fine.
### Screenshots (if appropriate)
The only storage class:
<img width="803" alt="Screen Shot 2021-08-27 at 4 51 59 PM" src="https://user-images.githubusercontent.com/17617373/131100653-b68202d2-6574-4b68-b0c5-a1b22e511482.png">
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: Kenchu123 <k8...@gmail.com>
Signed-off-by: Kevin <pi...@apache.org>
Closes #727 from Kenchu123/SUBMARINE-999 and squashes the following commits:
998c422d [Kenchu123] SUBMARNIE-999. Make all storageclass to a single storageclass
---
helm-charts/submarine/templates/storageclass.yaml | 2 +-
.../submarine-operator/templates/storageclass.yaml | 26 +---------------------
submarine-cloud-v2/pkg/controller/controller.go | 6 ++---
.../pkg/controller/submarine_database.go | 2 +-
.../pkg/controller/submarine_minio.go | 2 +-
.../pkg/controller/submarine_mlflow.go | 2 +-
.../pkg/controller/submarine_tensorboard.go | 2 +-
.../server/submitter/k8s/util/NotebookUtils.java | 2 +-
8 files changed, 9 insertions(+), 35 deletions(-)
diff --git a/helm-charts/submarine/templates/storageclass.yaml b/helm-charts/submarine/templates/storageclass.yaml
index de8a3d8..b439569 100644
--- a/helm-charts/submarine/templates/storageclass.yaml
+++ b/helm-charts/submarine/templates/storageclass.yaml
@@ -17,7 +17,7 @@
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
- name: notebook-storageclass
+ name: submarine-storageclass
labels:
app: notebook-controller
provisioner: k8s.io/minikube-hostpath
diff --git a/submarine-cloud-v2/helm-charts/submarine-operator/templates/storageclass.yaml b/submarine-cloud-v2/helm-charts/submarine-operator/templates/storageclass.yaml
index 081f258..cc78b9c 100644
--- a/submarine-cloud-v2/helm-charts/submarine-operator/templates/storageclass.yaml
+++ b/submarine-cloud-v2/helm-charts/submarine-operator/templates/storageclass.yaml
@@ -18,30 +18,6 @@
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
- name: submarine-database-sc
-{{- template "storageClass.fields" . }}
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
- name: submarine-tensorboard-sc
-{{- template "storageClass.fields" . }}
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
- name: submarine-mlflow-sc
-{{- template "storageClass.fields" . }}
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
- name: submarine-minio-sc
-{{- template "storageClass.fields" . }}
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
- name: notebook-storageclass
+ name: submarine-storageclass
{{- template "storageClass.fields" . }}
diff --git a/submarine-cloud-v2/pkg/controller/controller.go b/submarine-cloud-v2/pkg/controller/controller.go
index 0fe6244..048fa6f 100644
--- a/submarine-cloud-v2/pkg/controller/controller.go
+++ b/submarine-cloud-v2/pkg/controller/controller.go
@@ -62,6 +62,8 @@ import (
const controllerAgentName = "submarine-controller"
+const storageClassName = "submarine-storageclass"
+
const (
serverName = "submarine-server"
databaseName = "submarine-database"
@@ -69,17 +71,13 @@ const (
mlflowName = "submarine-mlflow"
minioName = "submarine-minio"
ingressName = serverName + "-ingress"
- databaseScName = databaseName + "-sc"
databasePvcName = databaseName + "-pvc"
- tensorboardScName = tensorboardName + "-sc"
tensorboardPvcName = tensorboardName + "-pvc"
tensorboardServiceName = tensorboardName + "-service"
tensorboardIngressRouteName = tensorboardName + "-ingressroute"
- mlflowScName = mlflowName + "-sc"
mlflowPvcName = mlflowName + "-pvc"
mlflowServiceName = mlflowName + "-service"
mlflowIngressRouteName = mlflowName + "-ingressroute"
- minioScName = minioName + "-sc"
minioPvcName = minioName + "-pvc"
minioServiceName = minioName + "-service"
minioIngressRouteName = minioName + "-ingressroute"
diff --git a/submarine-cloud-v2/pkg/controller/submarine_database.go b/submarine-cloud-v2/pkg/controller/submarine_database.go
index 7b070ad..493e19c 100644
--- a/submarine-cloud-v2/pkg/controller/submarine_database.go
+++ b/submarine-cloud-v2/pkg/controller/submarine_database.go
@@ -33,7 +33,7 @@ import (
)
func newSubmarineDatabasePersistentVolumeClaim(submarine *v1alpha1.Submarine) *corev1.PersistentVolumeClaim {
- storageClassName := databaseScName
+ storageClassName := storageClassName
return &corev1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{
Name: databasePvcName,
diff --git a/submarine-cloud-v2/pkg/controller/submarine_minio.go b/submarine-cloud-v2/pkg/controller/submarine_minio.go
index 21201b6..0fb6309 100644
--- a/submarine-cloud-v2/pkg/controller/submarine_minio.go
+++ b/submarine-cloud-v2/pkg/controller/submarine_minio.go
@@ -35,7 +35,7 @@ import (
)
func newSubmarineMinioPersistentVolumeClaim(submarine *v1alpha1.Submarine) *corev1.PersistentVolumeClaim {
- storageClassName := minioScName
+ storageClassName := storageClassName
return &corev1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{
Name: minioPvcName,
diff --git a/submarine-cloud-v2/pkg/controller/submarine_mlflow.go b/submarine-cloud-v2/pkg/controller/submarine_mlflow.go
index fc5f81e..4192013 100644
--- a/submarine-cloud-v2/pkg/controller/submarine_mlflow.go
+++ b/submarine-cloud-v2/pkg/controller/submarine_mlflow.go
@@ -33,7 +33,7 @@ import (
)
func newSubmarineMlflowPersistentVolumeClaim(submarine *v1alpha1.Submarine) *corev1.PersistentVolumeClaim {
- storageClassName := mlflowScName
+ storageClassName := storageClassName
return &corev1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{
Name: mlflowPvcName,
diff --git a/submarine-cloud-v2/pkg/controller/submarine_tensorboard.go b/submarine-cloud-v2/pkg/controller/submarine_tensorboard.go
index 5dd3aad..4b73979 100644
--- a/submarine-cloud-v2/pkg/controller/submarine_tensorboard.go
+++ b/submarine-cloud-v2/pkg/controller/submarine_tensorboard.go
@@ -35,7 +35,7 @@ import (
)
func newSubmarineTensorboardPersistentVolumeClaim(submarine *v1alpha1.Submarine) *corev1.PersistentVolumeClaim {
- storageClassName := tensorboardScName
+ storageClassName := storageClassName
return &corev1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{
Name: tensorboardPvcName,
diff --git a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/util/NotebookUtils.java b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/util/NotebookUtils.java
index 06996e7..60e57ab 100644
--- a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/util/NotebookUtils.java
+++ b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/util/NotebookUtils.java
@@ -44,7 +44,7 @@ public class NotebookUtils {
private static final Logger LOG = LoggerFactory.getLogger(NotebookUtils.class);
public static final String STORAGE = "10Gi";
- public static final String SC_NAME = "notebook-storageclass";
+ public static final String SC_NAME = "submarine-storageclass";
public static final String STORAGE_PREFIX = "notebook-storage-";
public static final String PV_PREFIX = "notebook-pv-";
public static final String PVC_PREFIX = "notebook-pvc-";
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org