Merge pull request #20 from katulu-io/GerardoGR/remove-dataset-hostpath

fix(fl-operator): the /dataset directory is not used anymore in the flower-clients
katulu-io · Jul 11, 2022 · ef2ef48 · ef2ef48
2 parents 1bd5d53 + 57a320b
commit ef2ef48
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 27 deletions.
diff --git a/components/fl-operator/pkg/resources/resources.go b/components/fl-operator/pkg/resources/resources.go
@@ -70,15 +70,7 @@ func NewPod(task *pb.OrchestratorMessage_TaskSpec, name types.NamespacedName, en
 				{
 					Name:            "flower-client",
 					Image:           task.Executor.GetOciExecutor().Image,
-					Args:            []string{"/dataset", "0", "localhost:9080"},
 					ImagePullPolicy: corev1.PullIfNotPresent,
-					VolumeMounts: []corev1.VolumeMount{
-						{
-							Name:      "flower-client-dataset",
-							MountPath: "/dataset",
-							ReadOnly:  true,
-						},
-					},
 				},
 				{
 					Name:            "envoyproxy",
@@ -129,15 +121,6 @@ func NewPod(task *pb.OrchestratorMessage_TaskSpec, name types.NamespacedName, en
 						},
 					},
 				},
-				{
-					Name: "flower-client-dataset",
-					VolumeSource: corev1.VolumeSource{
-						HostPath: &corev1.HostPathVolumeSource{
-							Path: "/dataset",
-							Type: utils.HostPathTypePtr(corev1.HostPathDirectory),
-						},
-					},
-				},
 			},
 			// TODO: Unhardcode secret name
 			ImagePullSecrets: []corev1.LocalObjectReference{{Name: "regcred"}},

diff --git a/develop/kind-config.yaml b/develop/kind-config.yaml
@@ -17,9 +17,3 @@ nodes:
         hostPort: 80
       - containerPort: 30443
         hostPort: 443
-    # TODO: Remove this extra mount. The FLOperator pods expect a /dataset directory in the kubernetes node. To
-    # force-create one we let kind do it
-    extraMounts:
-      - hostPath: dataset/
-        containerPath: /dataset
-        readOnly: true
diff --git a/docs/init-edge.sh b/docs/init-edge.sh
@@ -55,10 +55,6 @@ nodes:
   - role: control-plane
     # Using the same kubernetes version as the cluster deployed in the example
     image: kindest/node:v1.21.10@sha256:84709f09756ba4f863769bdcabe5edafc2ada72d3c8c44d6515fc581b66b029c
-    extraMounts:
-      - hostPath: ./dataset
-        containerPath: /dataset
-        readOnly: true
 containerdConfigPatches:
 - |-
   [plugins."io.containerd.grpc.v1.cri".registry.mirrors."$CONTAINER_REGISTRY_FQDN:8080"]