Skip to content

Commit

Permalink
Make sub path in volume match mount path for consistency.
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamDumpleton committed Aug 13, 2023
1 parent 95230b9 commit 2645b60
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions session-manager/handlers/workshopsession.py
Original file line number Diff line number Diff line change
Expand Up @@ -1658,17 +1658,17 @@ def resolve_security_policy(name):
},
)

workshop_volume_subpath = "workshop"
workshop_volume_subpath = "home/eduk8s"

if storage_volume_subpath:
workshop_volume_subpath = f"{storage_volume_subpath}/{workshop_volume_subpath}"

assets_volume_subpath = "assets"
assets_volume_subpath = "opt/assets"

if storage_volume_subpath:
assets_volume_subpath = f"{storage_volume_subpath}/{assets_volume_subpath}"

packages_volume_subpath = "packages"
packages_volume_subpath = "opt/packages"

if storage_volume_subpath:
packages_volume_subpath = f"{storage_volume_subpath}/{packages_volume_subpath}"
Expand Down Expand Up @@ -2038,7 +2038,7 @@ def _apply_environment_patch(patch):
if applications.is_enabled("docker"):
docker_volumes = [{"name": "docker-socket", "emptyDir": {}}]

docker_volume_subpath = "docker"
docker_volume_subpath = "var/lib/docker"

if storage_volume_subpath:
docker_volume_subpath = f"{storage_volume_subpath}/{docker_volume_subpath}"
Expand Down Expand Up @@ -2387,12 +2387,12 @@ def _apply_environment_patch(patch):
)

if registry_volume_subpath:
registry_volume_subpath = f"{registry_volume_subpath}/registry"
registry_volume_subpath = f"{registry_volume_subpath}/var/lib/registry"
else:
registry_volume_subpath = "registry"
registry_volume_subpath = "var/lib/registry"

else:
registry_volume_subpath = "registry"
registry_volume_subpath = "var/lib/registry"

if not registry_volume_name:
registry_volume_name = f"{session_namespace}-registry"
Expand Down

0 comments on commit 2645b60

Please sign in to comment.