Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-33182 make all helm examples dropzone subpaths to "mydropzone" #19387

Open
wants to merge 2 commits into
base: candidate-9.8.x
Choose a base branch
from
Open

HPCC-33182 make all helm examples dropzone subpaths to "mydropzone" #19387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81a3b2f
HPCC-33182 make all storage dropzone subpaths to "mydropzone" under
xwang2713 Jan 8, 2025
2b45981
HPCC-33182 update esdl "subPath" to "mydropzone"
xwang2713 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helm/examples/azure/hpcc-azurefile/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ planes:
#shareName: datashare
#volumeId: "100-data"
- name: mydropzone
subPath: dropzone
subPath: mydropzone
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

$ ../helm/examples$ fgrep -R dropzone | fgrep -i subpath
fsx/hpcc-fsx-dynamic-pv/values.yaml:  subPath: dropzone
efs/hpcc-efs-dynamic-pv/values.yaml:  subPath: dropzone
efs/hpcc-efs-static-pv/values.yaml:  subPath: dropzone
esdl/values-hpcc-localfile.yaml:  subPath: dropzone
local/hpcc-localfile/values.yaml:  subPath: dropzone
azure/hpcc-azurefile/values.yaml:  subPath: dropzone
nfs/hpcc-nfs/values.yaml:  subPath: dropzone

all subPath's are currently (before this PR) "dropzone", and I think that's logical
In the same way other planes paths, e.g. data are not 'mydata'.

The prefix paths in the generated example files are not consistent though, i.e.:

/helm/examples$ fgrep -R dropzone | fgrep -i prefix
fsx/values-retained-fsx.yaml:    prefix: "/var/lib/HPCCSystems/mydropzone"
efs/values-retained-efs.yaml:    prefix: "/var/lib/HPCCSystems/mydropzone"
efs/values-auto-efs.yaml:    prefix: "/var/lib/HPCCSystems/mydropzone"
esdl/values-echo-example-localfile.yaml:    prefix: "/var/lib/HPCCSystems/dropzone"
local/values-localfile.yaml:    prefix: "/var/lib/HPCCSystems/mydropzone"
azure/values-auto-azurefile.yaml:    prefix: "/var/lib/HPCCSystems/mydropzone"
azure/values-retained-azurefile.yaml:    prefix: "/var/lib/HPCCSystems/mydropzone"

the only that's right is esdl/values-echo-example-localfile.yaml.
I think it would be more consistent to change these to paths to /var/lib/HPCCSystems/dropzone
OR, drop 'my' altogether, use 'dropzone' for the plane name and the subPath (and hence the prefix too).

size: 1Gi
rwmany: true
category: lz
Expand Down
2 changes: 1 addition & 1 deletion helm/examples/efs/hpcc-efs-dynamic-pv/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ planes:
category: data # NB: all "data" planes will be auto mounted by engine components and others that require access to data
rwmany: true
- name: mydropzone
subPath: dropzone
subPath: mydropzone
size: 1Gi
rwmany: true
category: lz
4 changes: 2 additions & 2 deletions helm/examples/efs/hpcc-efs-static-pv/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ planes:
rwmany: true
apID:
- name: mydropzone
subPath: dropzone
subPath: mydropzone
size: 1Gi
rwmany: true
category: lz
apID:
apID:
2 changes: 1 addition & 1 deletion helm/examples/esdl/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ In this case the esdl bundle file is located on a persistent volume mounted to t
Some setup is required on your local machine prior to installing the helm charts:

1. Create the host directory `C:\hpccdata`
2. Create subdirectories named `dalistorage`, `debug`, `dropzone`, `esdl\echo-example`, `hpcc-data`, `queries` and `sasha`.
2. Create subdirectories named `dalistorage`, `debug`, `mydropzone`, `esdl\echo-example`, `hpcc-data`, `queries` and `sasha`.
3. Copy `helm/examples/esdl/image/echo_address-bundle.xml` to `C:\hpccdata\esdl\echo-example` so ESP can load it on startup. The ESP does not re-attempt to load bundles after its initial startup.

Next install the `hpcc-localfile` chart with some custom values:
Expand Down
4 changes: 2 additions & 2 deletions helm/examples/esdl/values-echo-example-localfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ storage:
category: data
- name: mydropzone
pvc: mydropzone-localfile-hpcc-localfile-pvc
prefix: "/var/lib/HPCCSystems/dropzone"
prefix: "/var/lib/HPCCSystems/mydropzone"
category: lz
- name: esdl
pvc: esdl-localfile-hpcc-localfile-pvc
Expand All @@ -44,4 +44,4 @@ sasha:
wu-archiver:
plane: sasha
dfuwu-archiver:
plane: sasha
plane: sasha
2 changes: 1 addition & 1 deletion helm/examples/esdl/values-hpcc-localfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ planes:
category: data # NB: all "data" planes will be auto mounted by engine components and others that require access to data
rwmany: true
- name: mydropzone
subPath: dropzone
subPath: mydropzone
size: 1Gi
rwmany: true
category: lz
Expand Down
2 changes: 1 addition & 1 deletion helm/examples/fsx/hpcc-fsx-dynamic-pv/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ planes:
category: data # NB: all "data" planes will be auto mounted by engine components and others that require access to data
rwmany: true
- name: mydropzone
subPath: dropzone
subPath: mydropzone
size: 1200Gi
rwmany: true
category: lz
2 changes: 1 addition & 1 deletion helm/examples/local/hpcc-localfile/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ planes:
category: data # NB: all "data" planes will be auto mounted by engine components and others that require access to data
rwmany: true
- name: mydropzone
subPath: dropzone
subPath: mydropzone
size: 1Gi
rwmany: true
category: lz
Expand Down
2 changes: 1 addition & 1 deletion helm/examples/nfs/hpcc-nfs/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ planes:
category: data # NB: all "data" planes will be auto mounted by engine components and others that require access to data
rwmany: true
- name: mydropzone
subPath: dropzone
subPath: mydropzone
size: 1Gi
rwmany: true
category: lz
5 changes: 5 additions & 0 deletions helm/examples/nfs/values-nfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ storage:
prefix: "/var/lib/HPCCSystems/hpcc-data"
category: data

- name: mydropzone
pvc: mydropzone-awsstorage-hpcc-efs-pvc
prefix: "/var/lib/HPCCSystems/mydropzone"
category: lz

sasha:
wu-archiver:
plane: sasha
Expand Down
Loading