"git@developer.sourcefind.cn:OpenDAS/nni.git" did not exist on "bccda3d8f170f1aae20106471dd086c2a5754bdf"
Commit 311d3da6 authored by fishyds's avatar fishyds
Browse files

[V0.4 Release] Kubeflow training service: Remove unued kubernetesServer config entry (#444)

* Remove unused kubernetesServer config entry in config file and schema validation
parent 583ac113
...@@ -67,7 +67,6 @@ kubeflowConfig: ...@@ -67,7 +67,6 @@ kubeflowConfig:
nfs: nfs:
server: {your_nfs_server} server: {your_nfs_server}
path: {your_nfs_server_exported_path} path: {your_nfs_server_exported_path}
kubernetesServer: {your_kubernetes_api_server_ip}
``` ```
If you use Azure Kubernets Service, you should set `kubeflowConfig` in your config yaml file as follows: If you use Azure Kubernets Service, you should set `kubeflowConfig` in your config yaml file as follows:
``` ```
......
...@@ -42,4 +42,3 @@ kubeflowConfig: ...@@ -42,4 +42,3 @@ kubeflowConfig:
server: {your_nfs_server_ip} server: {your_nfs_server_ip}
# Your NFS server export path, like /var/nfs/nni # Your NFS server export path, like /var/nfs/nni
path: {your_nfs_server_export_path} path: {your_nfs_server_export_path}
kubernetesServer: 10.10.10.10
...@@ -72,7 +72,6 @@ export namespace ValidationSchemas { ...@@ -72,7 +72,6 @@ export namespace ValidationSchemas {
server: joi.string().min(1).required(), server: joi.string().min(1).required(),
path: joi.string().min(1).required() path: joi.string().min(1).required()
}), }),
kubernetesServer: joi.string().min(1),
keyVault: joi.object({ keyVault: joi.object({
vaultName: joi.string().regex(/^([0-9]|[a-z]|[A-Z]|-){1,127}$/), vaultName: joi.string().regex(/^([0-9]|[a-z]|[A-Z]|-){1,127}$/),
name: joi.string().regex(/^([0-9]|[a-z]|[A-Z]|-){1,127}$/) name: joi.string().regex(/^([0-9]|[a-z]|[A-Z]|-){1,127}$/)
......
...@@ -46,7 +46,6 @@ export class KubeflowClusterConfig { ...@@ -46,7 +46,6 @@ export class KubeflowClusterConfig {
/** Name of Kubeflow operator, like tf-operator */ /** Name of Kubeflow operator, like tf-operator */
public readonly operator: KubeflowOperator; public readonly operator: KubeflowOperator;
public readonly nfs?: NFSConfig; public readonly nfs?: NFSConfig;
public readonly kubernetesServer: string;
public readonly keyVault?: keyVaultConfig; public readonly keyVault?: keyVaultConfig;
public readonly azureStorage?: AzureStorage; public readonly azureStorage?: AzureStorage;
...@@ -56,10 +55,9 @@ export class KubeflowClusterConfig { ...@@ -56,10 +55,9 @@ export class KubeflowClusterConfig {
* @param passWord password of Kubeflow Cluster * @param passWord password of Kubeflow Cluster
* @param host Host IP of Kubeflow Cluster * @param host Host IP of Kubeflow Cluster
*/ */
constructor(operator: KubeflowOperator, kubernetesServer : string, nfs?: NFSConfig, keyVault?: keyVaultConfig, azureStorage ?: AzureStorage) { constructor(operator: KubeflowOperator, nfs?: NFSConfig, keyVault?: keyVaultConfig, azureStorage ?: AzureStorage) {
this.operator = operator; this.operator = operator;
this.nfs = nfs; this.nfs = nfs;
this.kubernetesServer = kubernetesServer;
this.keyVault = keyVault; this.keyVault = keyVault;
this.azureStorage = azureStorage; this.azureStorage = azureStorage;
} }
......
...@@ -139,8 +139,7 @@ kubeflow_config_schema = { ...@@ -139,8 +139,7 @@ kubeflow_config_schema = {
'nfs': { 'nfs': {
'server': str, 'server': str,
'path': str 'path': str
}, }
Optional('kubernetesServer'): str
},{ },{
'operator': Or('tf-operator', 'mxnet-operator', 'pytorch-operator'), 'operator': Or('tf-operator', 'mxnet-operator', 'pytorch-operator'),
'keyVault': { 'keyVault': {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment