diff --git a/components/crud-web-apps/common/backend/kubeflow/kubeflow/crud_backend/api/utils.py b/components/crud-web-apps/common/backend/kubeflow/kubeflow/crud_backend/api/utils.py
index 6c3f47fed78..874990bc97c 100644
--- a/components/crud-web-apps/common/backend/kubeflow/kubeflow/crud_backend/api/utils.py
+++ b/components/crud-web-apps/common/backend/kubeflow/kubeflow/crud_backend/api/utils.py
@@ -1,3 +1,5 @@
+import json
+
from flask import jsonify
from kubernetes import client
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.html b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.html
deleted file mode 100644
index 8ec98b96a26..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
- Type
-
-
- Kubernetes Volume
-
-
-
- Custom (Advanced)
-
-
-
-
-
-
-
-
-
-
-
- Check the
- K8s docs
- for the supported volumes and their specs
-
-
-
- {{ errorParsingYaml }}
-
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.scss b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.scss
deleted file mode 100644
index 6ced43b6500..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-:host {
- display: block;
-}
-
-.editor {
- margin-top: 0.5rem;
- margin-bottom: 1rem;
-}
-
-.mat-error {
- margin-bottom: 1rem;
- white-space: pre-wrap;
-}
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.spec.ts b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.spec.ts
deleted file mode 100644
index 0afb04dab65..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.spec.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { MatSelectModule } from '@angular/material/select';
-import { EditorModule } from 'kubeflow';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ExistingVolumeComponent } from './existing-volume.component';
-import { ExistingPvcModule } from './pvc/pvc.module';
-
-describe('ExistingVolumeComponent', () => {
- let component: ExistingVolumeComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [ExistingVolumeComponent],
- imports: [
- CommonModule,
- MatFormFieldModule,
- ReactiveFormsModule,
- MatInputModule,
- MatSelectModule,
- ExistingPvcModule,
- NoopAnimationsModule,
- EditorModule,
- ],
- }).compileComponents();
- });
-
- beforeEach(() => {
- fixture = TestBed.createComponent(ExistingVolumeComponent);
- component = fixture.componentInstance;
- component.volGroup = new FormGroup({
- existingSource: new FormControl(),
- });
-
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.ts b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.ts
deleted file mode 100644
index 06ab6b09f02..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.component.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { AbstractControl, FormControl, FormGroup } from '@angular/forms';
-import { EXISTING_SOURCE, EXISTING_VOLUME_TYPE } from 'src/app/types';
-import {
- createExistingSourceFormGroup,
- createSourceFormGroup,
-} from 'src/app/shared/utils/volumes';
-import { dump } from 'js-yaml';
-import { V1Volume } from '@kubernetes/client-node';
-import { parseYAML } from 'src/app/shared/utils/yaml';
-
-@Component({
- selector: 'app-existing-volume',
- templateUrl: './existing-volume.component.html',
- styleUrls: ['./existing-volume.component.scss'],
-})
-export class ExistingVolumeComponent implements OnInit {
- @Input() volGroup: FormGroup;
-
- EXISTING_VOLUME_TYPE = EXISTING_VOLUME_TYPE;
-
- errorParsingYaml = '';
- private yamlInternal = '';
- get yaml(): string {
- return this.yamlInternal;
- }
- set yaml(text: string) {
- // Try to parse the YAML contents into a JS dict and store it in the
- // FormControl for the existingSource
- this.yamlInternal = text;
-
- const [parsed, error] = parseYAML(text);
- this.errorParsingYaml = error;
-
- if (error) {
- return;
- }
-
- this.volGroup.get('existingSource').setValue(parsed);
- }
-
- get type(): EXISTING_VOLUME_TYPE {
- if (!this.volGroup) {
- return EXISTING_VOLUME_TYPE.CUSTOM;
- }
-
- if (this.volGroup.get('existingSource') instanceof FormControl) {
- return EXISTING_VOLUME_TYPE.CUSTOM;
- }
-
- if (this.volGroup.get('existingSource') instanceof FormGroup) {
- return EXISTING_VOLUME_TYPE.PVC;
- }
- }
-
- constructor() {}
-
- ngOnInit(): void {
- const existingSource: V1Volume = this.volGroup.get('existingSource').value;
- this.yaml = dump(existingSource);
- }
-
- typeChanged(type: EXISTING_VOLUME_TYPE) {
- // In case of custom we change from a form group to a simple form control
- // The user will be inputing a YAML, which we will be converting to JS dict
- if (type === EXISTING_VOLUME_TYPE.CUSTOM) {
- const currSrc = this.volGroup.get('existingSource').value;
- this.yamlInternal = dump(currSrc);
- this.volGroup.setControl('existingSource', new FormControl(currSrc));
- return;
- }
-
- // Use a FormGroup for PVC, since there will be a form with subfields
- this.volGroup.setControl('existingSource', createExistingSourceFormGroup());
-
- const sourceGroup = this.volGroup.get('existingSource') as FormGroup;
- const source = EXISTING_SOURCE.PERSISTENT_VOLUME_CLAIM;
-
- sourceGroup.addControl(source, createSourceFormGroup(source));
- }
-
- getPvcFormGroup(): AbstractControl {
- return this.volGroup.get('existingSource.persistentVolumeClaim');
- }
-}
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.module.ts b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.module.ts
deleted file mode 100644
index 3e00ccd5a2b..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/existing-volume.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { ExistingVolumeComponent } from './existing-volume.component';
-import { ReactiveFormsModule } from '@angular/forms';
-
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { MatSelectModule } from '@angular/material/select';
-
-import { ExistingPvcModule } from './pvc/pvc.module';
-import { EditorModule } from 'kubeflow';
-
-@NgModule({
- declarations: [ExistingVolumeComponent],
- imports: [
- CommonModule,
- MatFormFieldModule,
- ReactiveFormsModule,
- MatInputModule,
- MatSelectModule,
- ExistingPvcModule,
- EditorModule,
- ],
- exports: [ExistingVolumeComponent],
-})
-export class ExistingVolumeModule {}
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/pvc/pvc.component.html b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/pvc/pvc.component.html
deleted file mode 100644
index ccfc1a73850..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/existing/pvc/pvc.component.html
+++ /dev/null
@@ -1,16 +0,0 @@
-Readonly
-
-
- Name
-
-
-
-
{{ pvc.name }}
-
- {{ pvc.size }}
- {{ pvc.mode }}
-
-
Storage class
-
-
- Use default class
-
-
-
- Class
-
- Empty storage class
-
- {{ sc }}
-
-
-
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.component.scss b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.component.scss
deleted file mode 100644
index 513c01aad03..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.component.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-:host {
- display: block;
-}
-
-.form-title {
- font-weight: 500;
- margin-bottom: 0.4rem;
- color: rgba(0, 0, 0, 0.64);
-}
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.component.spec.ts b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.component.spec.ts
deleted file mode 100644
index 146dd009d83..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.component.spec.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { FormControl, ReactiveFormsModule } from '@angular/forms';
-import { MatCheckboxModule } from '@angular/material/checkbox';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { MatSelectModule } from '@angular/material/select';
-import { of } from 'rxjs';
-import { JWABackendService } from 'src/app/services/backend.service';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { StorageClassComponent } from './storage-class.component';
-
-const JWABackendServiceStub: Partial = {
- getStorageClasses: () => of([]),
- getDefaultStorageClass: () => of(),
-};
-
-describe('StorageClassComponent', () => {
- let component: StorageClassComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [StorageClassComponent],
- imports: [
- CommonModule,
- ReactiveFormsModule,
- MatFormFieldModule,
- MatCheckboxModule,
- MatInputModule,
- MatSelectModule,
- NoopAnimationsModule,
- ],
- providers: [
- { provide: JWABackendService, useValue: JWABackendServiceStub },
- ],
- }).compileComponents();
- });
-
- beforeEach(() => {
- fixture = TestBed.createComponent(StorageClassComponent);
- component = fixture.componentInstance;
- component.scControl = new FormControl();
-
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.component.ts b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.component.ts
deleted file mode 100644
index 31d4c31561e..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.component.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { FormControl } from '@angular/forms';
-import { JWABackendService } from 'src/app/services/backend.service';
-
-@Component({
- selector: 'app-storage-class',
- templateUrl: './storage-class.component.html',
- styleUrls: ['./storage-class.component.scss'],
-})
-export class StorageClassComponent implements OnInit {
- storageClasses: string[] = [];
- defaultStoraceClass: string;
-
- @Input()
- scControl: FormControl;
-
- constructor(private backend: JWABackendService) {}
-
- ngOnInit(): void {
- // get list of storage classes
- this.backend.getStorageClasses().subscribe(classes => {
- this.storageClasses = classes;
- });
-
- // get the default storage class
- this.backend.getDefaultStorageClass().subscribe(sc => {
- this.defaultStoraceClass = sc;
-
- if (!this.scControl || !this.scControl.disabled) {
- return;
- }
-
- // if control is disabled then the user wants to use the default SC
- this.scControl.setValue(sc);
- });
- }
-
- useDefaultSC(useDefault: boolean) {
- if (useDefault) {
- this.scControl.disable();
- return;
- }
-
- this.scControl.enable();
- }
-}
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.module.ts b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.module.ts
deleted file mode 100644
index 58ae0e8a746..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/new/storage-class/storage-class.module.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { StorageClassComponent } from './storage-class.component';
-import { ReactiveFormsModule } from '@angular/forms';
-
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatCheckboxModule } from '@angular/material/checkbox';
-import { MatInputModule } from '@angular/material/input';
-import { MatSelectModule } from '@angular/material/select';
-
-@NgModule({
- declarations: [StorageClassComponent],
- imports: [
- CommonModule,
- ReactiveFormsModule,
- MatFormFieldModule,
- MatCheckboxModule,
- MatInputModule,
- MatSelectModule,
- ],
- exports: [StorageClassComponent],
-})
-export class StorageClassModule {}
diff --git a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/volume.module.ts b/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/volume.module.ts
deleted file mode 100644
index f5f02547c5b..00000000000
--- a/components/crud-web-apps/jupyter/frontend/src/app/pages/form/form-new/volume/volume.module.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MatIconModule } from '@angular/material/icon';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { ExistingVolumeModule } from './existing/existing-volume.module';
-import { VolumeMountModule } from './mount/mount.module';
-import { NewVolumeModule } from './new/new.module';
-import { MatButtonModule } from '@angular/material/button';
-
-@NgModule({
- declarations: [],
- imports: [
- CommonModule,
- MatIconModule,
- MatButtonModule,
- MatTooltipModule,
- ExistingVolumeModule,
- VolumeMountModule,
- NewVolumeModule,
- ],
- exports: [ExistingVolumeModule, VolumeMountModule, NewVolumeModule],
-})
-export class VolumeModule {}
diff --git a/components/notebook-controller/config/manager/params.env b/components/notebook-controller/config/manager/params.env
index 05c769cc4e9..b2885d9f466 100644
--- a/components/notebook-controller/config/manager/params.env
+++ b/components/notebook-controller/config/manager/params.env
@@ -4,4 +4,4 @@ CLUSTER_DOMAIN=cluster.local
ENABLE_CULLING=false
CULL_IDLE_TIME=1440
IDLENESS_CHECK_PERIOD=1
-ISTIO_HOSTS='*'
\ No newline at end of file
+ISTIO_HOSTS='*'
diff --git a/components/notebook-controller/controllers/notebook_controller.go b/components/notebook-controller/controllers/notebook_controller.go
index 273cd0c51ef..7b2a794fd4c 100644
--- a/components/notebook-controller/controllers/notebook_controller.go
+++ b/components/notebook-controller/controllers/notebook_controller.go
@@ -498,11 +498,11 @@ func generateVirtualService(instance *v1beta1.Notebook) (*unstructured.Unstructu
vsvc.SetName(virtualServiceName(name, namespace))
vsvc.SetNamespace(namespace)
- istioHosts := os.Getenv("ISTIO_HOSTS")
+ istioHosts := strings.Split(os.Getenv("ISTIO_HOSTS"), ",")
if len(istioHosts) == 0 {
- istioHosts = "*"
+ istioHosts = []string{"*"}
}
- if err := unstructured.SetNestedStringSlice(vsvc.Object, []string{istioHosts}, "spec", "hosts"); err != nil {
+ if err := unstructured.SetNestedStringSlice(vsvc.Object, istioHosts, "spec", "hosts"); err != nil {
return nil, fmt.Errorf("set .spec.hosts error: %v", err)
}
diff --git a/components/tensorboard-controller/controllers/tensorboard_controller.go b/components/tensorboard-controller/controllers/tensorboard_controller.go
index 9db4f181ef7..c127b4f2f3c 100644
--- a/components/tensorboard-controller/controllers/tensorboard_controller.go
+++ b/components/tensorboard-controller/controllers/tensorboard_controller.go
@@ -339,12 +339,12 @@ func generateVirtualService(tb *tensorboardv1alpha1.Tensorboard) (*unstructured.
vsvc.SetName(tb.Name)
vsvc.SetNamespace(tb.Namespace)
- if err := unstructured.SetNestedStringSlice(vsvc.Object, []string{istioHost}, "spec", "hosts"); err != nil {
- return nil, fmt.Errorf("Set .spec.hosts error: %v", err)
+ if err := unstructured.SetNestedStringSlice(vsvc.Object, strings.Split(istioHost, ","), "spec", "hosts"); err != nil {
+ return nil, fmt.Errorf("set .spec.hosts error: %v", err)
}
if err := unstructured.SetNestedStringSlice(vsvc.Object, []string{istioGateway},
"spec", "gateways"); err != nil {
- return nil, fmt.Errorf("Set .spec.gateways error: %v", err)
+ return nil, fmt.Errorf("set .spec.gateways error: %v", err)
}
http := []interface{}{
@@ -373,7 +373,7 @@ func generateVirtualService(tb *tensorboardv1alpha1.Tensorboard) (*unstructured.
},
}
if err := unstructured.SetNestedSlice(vsvc.Object, http, "spec", "http"); err != nil {
- return nil, fmt.Errorf("Set .spec.http error: %v", err)
+ return nil, fmt.Errorf("set .spec.http error: %v", err)
}
return vsvc, nil