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

Revert "jenkins/config: fix oscontainer-secret formatting" #462

Merged
merged 1 commit into from Jan 26, 2022

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Jan 26, 2022

This reverts commit db97d56.

Lessons learned:

  • ${oscontainer-secret/dockercfg} expands to the contents of the
    path at /run/secrets/oscontainer-secret/dockercfg
  • therefore, ${readFile:${oscontainer-secret/dockercfg}} will ask
    jcasc to read the file at $CONTENTS, which is of course not what we
    want.

So the only issue was actually the path typo, which was fixed in #461.
As such, this is not a perfect revert. I also kept the updated
documentation link and added some details to the comment.

This reverts commit db97d56.

Lessons learned:
- `${oscontainer-secret/dockercfg}` expands to the *contents* of the
  path at `/run/secrets/oscontainer-secret/dockercfg`
- therefore, `${readFile:${oscontainer-secret/dockercfg}}` will ask
  jcasc to read the file at `$CONTENTS`, which is of course not what we
  want.

So the only issue was actually the path typo, which was fixed in coreos#461.
As such, this is not a perfect revert. I also kept the updated
documentation link and added some details to the comment.
@jlebon
Copy link
Member Author

jlebon commented Jan 26, 2022

No rush on this; I've already applied it to the cluster to verify that it worked (and it did!).

Copy link
Member

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

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

LGTM

@jlebon jlebon merged commit ed2838b into coreos:main Jan 26, 2022
@jlebon jlebon deleted the pr/more-fix-oscontainer-secret branch January 26, 2022 20:37
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.

None yet

2 participants