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.

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

fix(controller): default volume/mount to emissary. Fixes #7118 #7125

Merged
merged 1 commit into from
Nov 2, 2021

Conversation

tczhao
Copy link
Member

@tczhao tczhao commented Nov 2, 2021

fixes #7118

Don't bother creating a PR until you've done this:

  • Run make pre-commit -B to fix codegen, lint, and commit message problems.

Create your PR as a draft.

  • Your PR needs to pass the required checks before it can be approved. If the check is not required (e.g. E2E tests) it
    does not need to pass.
  • Once required tests have passed, you can make it "Ready for review".
  • Say how how you tested your changes. If you changed the UI, attach screenshots.

Tips:

  • If changes were requested, and you've made them, then dismiss the review to get it looked at again.
  • Add you organization to USERS.md if you like.
  • You can ask for help!

Signed-off-by: Tianchu Zhao <evantczhao@gmail.com>
@tczhao tczhao marked this pull request as ready for review November 2, 2021 03:51
volumes = append(volumes, woc.getVolumeDockerSock(tmpl))
default:
volumes = append(volumes, volumeVarArgo)
Copy link
Contributor

Choose a reason for hiding this comment

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

if I may (been working on #6714 so I saw this too): this changes behaviour because Go's switch-case doesn't fallthrough by default. Before only emissary had /var/run/argo as volume, with this change all except Docker have it as volume.
This changes anyway in #6714 (all will have that volume + mount) so I'm not sure how important it is to get the correct behaviour here.

Copy link
Contributor

Choose a reason for hiding this comment

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

+1

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct me if I'm wrong. Because go doesn't fall through by default, we have the following and the behaviour is expected

pns/k8sapi/kubelet:
   do nothing
docker:
   attach dockerSock
emissary or empty (default):
   attach varArgo

Copy link
Contributor

Choose a reason for hiding this comment

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

aah, right. My bad. Sorry about the confusion.

@alexec alexec merged commit 02165aa into argoproj:master Nov 2, 2021
@alexec alexec mentioned this pull request Nov 5, 2021
25 tasks
@sarabala1979 sarabala1979 mentioned this pull request Dec 15, 2021
73 tasks
sarabala1979 pushed a commit that referenced this pull request Dec 15, 2021
Signed-off-by: Tianchu Zhao <evantczhao@gmail.com>
alexec added a commit that referenced this pull request Dec 17, 2021
This reverts commit 49b3f0c.

Signed-off-by: Alex Collins <alex_collins@intuit.com>
@sarabala1979 sarabala1979 mentioned this pull request Mar 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug in default executor code
3 participants