Use rsync to copy pack contents #415
+24
−8
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ | |
| * Stop generating the DataStore Secret (#385) and checksum labels (#391) when existing secret provided or disabled (by @bmarick) | ||
| * Stop generating the checksum labels for Auth Secret (#392) when existing secret provided or disabled (by @bmarick) | ||
| * Use `image.pullPolicy` for all containers including init containers that use `image.utilityImage`. (#397) (by @jk464) | ||
| * Use `rsync` to copy pack contents when available, falling back to `cp`. (#414) (by @cognifloyd) | ||
|
|
||
| ## v1.0.0 | ||
| * Bump to latest CircleCI orb versions ([email protected] and [email protected] by @ZoeLeah) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -343,9 +343,14 @@ Merge packs and virtualenvs from st2 with those from st2packs images | |
| command: | ||
| - 'sh' | ||
| - '-ec' | ||
| - > | ||
| if command rsync; then | ||
| rsync -a /opt/stackstorm/packs/. /opt/stackstorm/packs-shared && | ||
| rsync -a /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared; | ||
| else | ||
| /bin/cp -aR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared && | ||
|
||
| /bin/cp -aR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared; | ||
| fi | ||
| {{- with .securityContext | default $.Values.st2actionrunner.securityContext | default $.Values.securityContext }} | ||
| {{/* st2actionrunner is likely the most permissive so use that if defined. */}} | ||
| securityContext: {{- toYaml . | nindent 8 }} | ||
|
|
@@ -365,9 +370,14 @@ Merge packs and virtualenvs from st2 with those from st2packs images | |
| command: | ||
| - 'sh' | ||
| - '-ec' | ||
| - > | ||
| if command rsync; then | ||
| rsync -a /opt/stackstorm/packs/. /opt/stackstorm/packs-shared && | ||
| rsync -a /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared; | ||
| else | ||
| /bin/cp -aR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared && | ||
| /bin/cp -aR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared | ||
| fi | ||
| {{- with .Values.st2actionrunner.securityContext | default .Values.securityContext }} | ||
| {{/* st2actionrunner is likely the most permissive so use that if defined. */}} | ||
| securityContext: {{- toYaml . | nindent 8 }} | ||
|
|
@@ -386,8 +396,12 @@ Merge packs and virtualenvs from st2 with those from st2packs images | |
| command: | ||
| - 'sh' | ||
| - '-ec' | ||
| - > | ||
| if command rsync; then | ||
| rsync -a /opt/stackstorm/configs/. /opt/stackstorm/configs-shared; | ||
| else | ||
| /bin/cp -aR /opt/stackstorm/configs/. /opt/stackstorm/configs-shared; | ||
| fi | ||
| {{- with .Values.st2actionrunner.securityContext | default .Values.securityContext }} | ||
| {{/* st2actionrunner is likely the most permissive so use that if defined. */}} | ||
| securityContext: {{- toYaml . | nindent 8 }} | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-ais equivalent to-rlptgoD: https://www.mankier.com/1/rsync#--archive-r: copy directories recursively-l: recreate symlinks in destination-p: permissions-t: modification times-g: copy gid (group id) by name-o: copy oid (owner id) by name-D: devices (character and block) and specials (sockets, fifos, etc)Of those, I'm confident we need
-rlpor-rlE(where-Eis short for--executability, a subset of-p). Depending on which user is running this, we might also want-og. The other parts of-aare probably not necessary.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I'll push a commit that switches to
-rlptDbased on rsync...Stealthii:stackstorm-k8s:rsync