Support OpenFL v1.5 (FederatedAI#34)

Signed-off-by: Chenlong Ma <chenlongm@vmware.com> Signed-off-by: qijianshuai <qjianshuai@vmware.com>
qijianshuai · Apr 18, 2023 · 3bd8c35 · 3bd8c35
1 parent b6a3a64
commit 3bd8c35
Show file tree

Hide file tree

Showing 11 changed files with 120 additions and 120 deletions.
diff --git a/doc/OpenFL_Guide.md b/doc/OpenFL_Guide.md
@@ -150,7 +150,7 @@ class FedLCMDummyShardDescriptor(DummyShardDescriptor):
       f'target shape: {self.target_shape}'
     )
     """Return the dataset description."""
-    return 'This is dummy data shard descriptor provided by FedLCM project. You should implement your own data '
+    return 'This is dummy data shard descriptor provided by FedLCM project. You should implement your own data ' \
            'loader to load your local data for each Envoy.'
 ```
 

diff --git a/helm-charts/charts/openfl-director/Chart.yaml b/helm-charts/charts/openfl-director/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
-appVersion: "openfl-director-v0.1.0"
-description: A Helm chart for openfl director, based on official OpenFL container image
 name: openfl-director
-version: v0.1.0
+version: v0.3.0
+description: A Helm chart for openfl director, based on official OpenFL container image
+appVersion: "openfl-director-v1.5"
 sources:
-  - https://github.com/FederatedAI/KubeFATE.git
+  - https://github.com/securefederatedai/openfl
diff --git a/helm-charts/charts/openfl-director/templates/notebook/deployment.yaml b/helm-charts/charts/openfl-director/templates/notebook/deployment.yaml
@@ -38,7 +38,7 @@ spec:
             - /bin/bash
             - -c
             - |
-              jupyter lab --notebook-dir /usr/local/lib/python3.8/dist-packages/openfl-tutorials --allow-root --ip=0.0.0.0 --NotebookApp.token='' --NotebookApp.password={{ .Values.modules.notebook.password }}
+              jupyter lab --notebook-dir /openfl/openfl-tutorials --allow-root --ip=0.0.0.0 --NotebookApp.token='' --NotebookApp.password={{ .Values.modules.notebook.password }}
           image: {{ with .Values.image.registry }}{{ printf "%s/" . }}{{ end }}{{ .Values.modules.notebook.image | default "fedlcm-openfl" }}:{{ .Values.modules.notebook.imageTag | default "latest"}}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           name: notebook

diff --git a/helm-charts/charts/openfl-director/values-template-example.yaml b/helm-charts/charts/openfl-director/values-template-example.yaml
@@ -1,9 +1,9 @@
 name: openfl-director
 namespace: openfl-director
 chartName: openfl-director
-chartVersion: v0.1.0
+chartVersion: v0.3.0
 registry: "federatedai"
-imageTag: "v0.1.0"
+imageTag: "v0.3.0"
 pullPolicy: IfNotPresent
 # imagePullSecrets:
 #   - name: myregistrykey
@@ -26,7 +26,7 @@ modules:
 
 #director:
 #  image: fedlcm-openfl
-#  imageTag: v0.1.0
+#  imageTag: v0.3.0
 #  sampleShape: "['784']"
 #  targetShape: "['1']"
 #  envoyHealthCheckPeriod: 60
@@ -39,7 +39,7 @@ modules:
 
 #notebook:
 #  image: fedlcm-openfl
-#  imageTag: v0.1.0
+#  imageTag: v0.3.0
 #  password: argon2:$argon2id$v=19$m=10240,t=10,p=8$TmW50aM7Fey2lNrU7kpOhQ$s4SY7l8QItxgR9iwVA+DTc2uwGnawh1p1dB42bbLH48
 #  nodeSelector:
 #  tolerations:

diff --git a/helm-charts/charts/openfl-director/values.yaml b/helm-charts/charts/openfl-director/values.yaml
@@ -18,7 +18,7 @@ ingress:
 modules:
   director:
     image: fedlcm-openfl
-    imageTag: v0.1.0
+    imageTag: v0.3.0
     sampleShape: "['1']"
     targetShape: "['1']"
     envoyHealthCheckPeriod: 60
@@ -31,7 +31,7 @@ modules:
 
   notebook:
     image: fedlcm-openfl
-    imageTag: v0.1.0
+    imageTag: v0.3.0
     # password:
     # nodeSelector:
     # tolerations:

diff --git a/helm-charts/charts/openfl-envoy/Chart.yaml b/helm-charts/charts/openfl-envoy/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
-appVersion: "openfl-envoy-v0.1.0"
-description: A Helm chart for openfl envoy
 name: openfl-envoy
-version: v0.1.0
+version: v0.3.0
+description: A Helm chart for openfl envoy
+appVersion: "openfl-envoy-v1.5"
 sources:
-  - https://github.com/FederatedAI/KubeFATE.git
+  - https://github.com/securefederatedai/openfl
diff --git a/helm-charts/charts/openfl-envoy/values-template-example.yaml b/helm-charts/charts/openfl-envoy/values-template-example.yaml
@@ -1,7 +1,7 @@
 name: envoy-1
 namespace: openfl-envoy-1
 chartName: openfl-envoy
-chartVersion: v0.1.0
+chartVersion: v0.3.0
 registry: "federatedai"
 pullPolicy: IfNotPresent
 imagePullSecrets:
@@ -13,7 +13,7 @@ modules:
 
 #envoy:
 #  image: fedlcm-openfl
-#  imageTag: v0.1.0
+#  imageTag: v0.3.0
 #  directorFqdn: director.openfl.example.com
 #  directorIp: 192.168.1.1.
 #  directorPort: 50051

diff --git a/helm-charts/charts/openfl-envoy/values.yaml b/helm-charts/charts/openfl-envoy/values.yaml
@@ -12,7 +12,7 @@ podSecurityPolicy:
 modules:
   envoy:
     image: fedlcm-openfl
-    imageTag: v0.1.0
+    imageTag: v0.3.0
     directorFqdn: director
     directorIp: 192.168.1.1
     directorPort: 50051

diff --git a/server/infrastructure/gorm/chart_mock_repo.go b/server/infrastructure/gorm/chart_mock_repo.go
@@ -5160,23 +5160,23 @@ externalMysqlPassword: {{ .externalMysqlPassword }}
 				UpdatedAt: time.Now(),
 			},
 			UUID:        "516a10e2-0b96-417c-812b-ee45ed197e81",
-			Name:        "chart for FedLCM private OpenFL Director v0.1.0",
-			Description: "This chart is for deploying FedLCM's OpenFL director v0.1.0 services, based from OpenFL 1.3 release",
+			Name:        "chart for FedLCM private OpenFL Director v0.3.0",
+			Description: "This chart is for deploying FedLCM's OpenFL director v0.3.0 services, based from OpenFL 1.5 release",
 			Type:        entity.ChartTypeOpenFLDirector,
 			ChartName:   "openfl-director",
-			Version:     "v0.1.0",
-			AppVersion:  "openfl-director-v0.1.0",
+			Version:     "v0.3.0",
+			AppVersion:  "openfl-director-v1.5",
 			Chart: `apiVersion: v1
-appVersion: "openfl-director-v0.1.0"
+appVersion: "openfl-director-v1.5"
 description: A Helm chart for openfl director, based on official OpenFL container image
 name: openfl-director
-version: v0.1.0
+version: v0.3.0
 sources:
-  - https://github.com/FederatedAI/KubeFATE.git`,
+  - https://github.com/securefederatedai/openfl`,
 			InitialYamlTemplate: `name: {{.Name}}
 namespace: {{.Namespace}}
 chartName: openfl-director
-chartVersion: v0.1.0
+chartVersion: v0.3.0
 {{- if .UseRegistry}}
 registry: {{.Registry}}
 {{- end }}
@@ -5201,7 +5201,7 @@ ingress:
 
 director:
   image: fedlcm-openfl
-  imageTag: v0.1.0
+  imageTag: v0.3.0
   type: {{.ServiceType}}
   sampleShape: "{{.SampleShape}}"
   targetShape: "{{.TargetShape}}"
@@ -5214,7 +5214,7 @@ director:
 
 notebook:
   image: fedlcm-openfl
-  imageTag: v0.1.0
+  imageTag: v0.3.0
   type: {{.ServiceType}}
   password: {{.JupyterPassword}}
 #  nodeSelector:
@@ -5242,7 +5242,7 @@ ingress:
 modules:
   director:
     image: fedlcm-openfl
-    imageTag: v0.1.0
+    imageTag: v0.3.0
     sampleShape: "['1']"
     targetShape: "['1']"
     envoyHealthCheckPeriod: 60
@@ -5255,7 +5255,7 @@ modules:
 
   notebook:
     image: fedlcm-openfl
-    imageTag: v0.1.0
+    imageTag: v0.3.0
     # password:
     # nodeSelector:
     # tolerations:
@@ -5341,7 +5341,7 @@ modules:
     nodePort: {{ .nodePort }}
     loadBalancerIP: {{ .loadBalancerIP }}
     {{- end }}`,
-			ArchiveContent: mock.FedLCMOpenFLDirector010ChartArchiveContent,
+			ArchiveContent: mock.FedLCMOpenFLDirector030ChartArchiveContent,
 			Private:        true,
 		},
 		"c62b27a6-bf0f-4515-840a-2554ed63aa56": {
@@ -5351,23 +5351,23 @@ modules:
 				UpdatedAt: time.Now(),
 			},
 			UUID:        "c62b27a6-bf0f-4515-840a-2554ed63aa56",
-			Name:        "chart for FedLCM private OpenFL Envoy v0.1.0",
-			Description: "This chart is for deploying OpenFL envoy built for FedLCM, based from OpenFL 1.3 release",
+			Name:        "chart for FedLCM private OpenFL Envoy v0.3.0",
+			Description: "This chart is for deploying OpenFL envoy built for FedLCM, based from OpenFL 1.5 release",
 			Type:        entity.ChartTypeOpenFLEnvoy,
 			ChartName:   "openfl-envoy",
-			Version:     "v0.1.0",
-			AppVersion:  "openfl-envoy-v0.1.0",
+			Version:     "v0.3.0",
+			AppVersion:  "openfl-envoy-v1.5",
 			Chart: `apiVersion: v1
-appVersion: "openfl-envoy-v0.1.0"
+appVersion: "openfl-envoy-v1.5"
 description: A Helm chart for openfl envoy
 name: openfl-envoy
-version: v0.1.0
+version: v0.3.0
 sources:
   - https://github.com/FederatedAI/KubeFATE.git`,
 			InitialYamlTemplate: `name: {{.Name}}
 namespace: {{.Namespace}}
 chartName: openfl-envoy
-chartVersion: v0.1.0
+chartVersion: v0.3.0
 {{- if .UseRegistry}}
 registry: {{.Registry}}
 {{- end }}
@@ -5382,7 +5382,7 @@ modules:
 
 envoy:
   image: fedlcm-openfl
-  imageTag: v0.1.0
+  imageTag: v0.3.0
   directorFqdn: {{.DirectorFQDN}}
   directorIp: {{.DirectorIP}}
   directorPort: {{.DirectorPort}}
@@ -5406,7 +5406,7 @@ podSecurityPolicy:
 modules:
   envoy:
     image: fedlcm-openfl
-    imageTag: v0.1.0
+    imageTag: v0.3.0
     directorFqdn: director
     directorIp: 192.168.1.1
     directorPort: 50051
@@ -5454,7 +5454,7 @@ modules:
 {{ toYaml . | indent 6 }}
     {{- end }}
     {{- end }}`,
-			ArchiveContent: mock.FedLCMOpenFLEnvoy010ChartArchiveContent,
+			ArchiveContent: mock.FedLCMOpenFLEnvoy030ChartArchiveContent,
 			Private:        true,
 		},
 	}

diff --git a/server/infrastructure/gorm/mock/chart_openfl_010.go b/server/infrastructure/gorm/mock/chart_openfl_010.go