Skip to content

chore: add cherry-picks for Coder v2.17.1 #15454

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

Merged
merged 2 commits into from
Nov 8, 2024
Merged

chore: add cherry-picks for Coder v2.17.1 #15454

merged 2 commits into from
Nov 8, 2024

Conversation

bpmct
Copy link
Member

@bpmct bpmct commented Nov 8, 2024

No description provided.

johnstcn and others added 2 commits November 8, 2024 14:07
… set (#15417)

Relates to #15416

This PR modifies the provisioner helm chart logic:
- Previously, when both provisionerDaemon.keySecretName and provisionerDaemon.pskSecretName
  were both set, we would fail to install the chart. This required users to have an obnoxious workaround
  in place where setting provisionerDaemon.pskSecretName="" was required in order to use provisioner
  keys. We now check for pskSecretName being set to the default value when keySecretName is also specified,
  and switch to provisioner key authentication instead of PSK. The previous workaround is still supported.
- We also had omitted to check for provisionerd.Tags being set along with provisionerDaemon.keySecretName.
  This would result in a crashlooping provisioner deployment, as setting both of these configuration options is
  not allowed. We now fast-fail the Helm deployment if we detect this scenario.

(cherry picked from commit 6781b0f)
This PR:
- Updates the table in `docs/admin/provisioners.md` to include highlight
multi-org changes
- Updates the instructions for the provisionerd helm chart when using
provisioner keys

---------

Co-authored-by: Ben Potter <ben@coder.com>
(cherry picked from commit 9f05b19)
@bpmct bpmct requested a review from johnstcn November 8, 2024 14:09
@bpmct bpmct changed the title chore: cherry-picks for Coder v2.17.1 chore: add cherry-picks for Coder v2.17.1 Nov 8, 2024
Copy link
Member

@johnstcn johnstcn left a comment

Choose a reason for hiding this comment

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

:shipit:

@bpmct bpmct merged commit 0598aec into release/2.17 Nov 8, 2024
30 checks passed
@bpmct bpmct deleted the patch/2.17.1 branch November 8, 2024 21:24
@github-actions github-actions bot locked and limited conversation to collaborators Nov 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants