- Notifications
You must be signed in to change notification settings - Fork1k
fix(helm/provisioner): prefer provisioner key if both psk and key are set#15417
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
5 commits Select commitHold shift + click to select a range
5661c62 fix(helm/provisioner): prefer provisioner key if both psk and key are…
johnstcn112c46a IMPORTANT DISTINCTION
johnstcn58aafcc adjust logic to only override if pskSecretName is the default value
johnstcn9b8cda7 fixup! adjust logic to only override if pskSecretName is the default …
johnstcne6f3186 continue to support pskSecretName="" workaround
johnstcnFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
PrevPrevious commit
continue to support pskSecretName="" workaround
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commite6f31863138b8ee6bcebabca91b242d46d674a75
There are no files selected for viewing
2 changes: 1 addition & 1 deletionhelm/provisioner/templates/_coder.tpl
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
6 changes: 6 additions & 0 deletionshelm/provisioner/tests/chart_test.go
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 |
|---|---|---|
| @@ -56,6 +56,12 @@ var testCases = []testCase{ | ||
| name: "provisionerd_key", | ||
| expectedError: "", | ||
| }, | ||
| // Test explicitly for the workaround where setting provisionerDaemon.pskSecretName="" | ||
| // was required to use provisioner keys. | ||
| { | ||
| name: "provisionerd_key_psk_empty_workaround", | ||
| expectedError: "", | ||
| }, | ||
Comment on lines +61 to +64 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. review: adding an explicit test for the old workaround | ||
| { | ||
| name: "provisionerd_psk_and_key", | ||
| expectedError: `Either provisionerDaemon.pskSecretName or provisionerDaemon.keySecretName must be specified, but not both.`, | ||
135 changes: 135 additions & 0 deletionshelm/provisioner/tests/testdata/provisionerd_key_psk_empty_workaround.golden
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 |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| --- | ||
| # Source: coder-provisioner/templates/coder.yaml | ||
| apiVersion: v1 | ||
| kind: ServiceAccount | ||
| metadata: | ||
| annotations: {} | ||
| labels: | ||
| app.kubernetes.io/instance: release-name | ||
| app.kubernetes.io/managed-by: Helm | ||
| app.kubernetes.io/name: coder-provisioner | ||
| app.kubernetes.io/part-of: coder-provisioner | ||
| app.kubernetes.io/version: 0.1.0 | ||
| helm.sh/chart: coder-provisioner-0.1.0 | ||
| name: coder-provisioner | ||
| --- | ||
| # Source: coder-provisioner/templates/rbac.yaml | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: Role | ||
| metadata: | ||
| name: coder-provisioner-workspace-perms | ||
| rules: | ||
| - apiGroups: [""] | ||
| resources: ["pods"] | ||
| verbs: | ||
| - create | ||
| - delete | ||
| - deletecollection | ||
| - get | ||
| - list | ||
| - patch | ||
| - update | ||
| - watch | ||
| - apiGroups: [""] | ||
| resources: ["persistentvolumeclaims"] | ||
| verbs: | ||
| - create | ||
| - delete | ||
| - deletecollection | ||
| - get | ||
| - list | ||
| - patch | ||
| - update | ||
| - watch | ||
| - apiGroups: | ||
| - apps | ||
| resources: | ||
| - deployments | ||
| verbs: | ||
| - create | ||
| - delete | ||
| - deletecollection | ||
| - get | ||
| - list | ||
| - patch | ||
| - update | ||
| - watch | ||
| --- | ||
| # Source: coder-provisioner/templates/rbac.yaml | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: RoleBinding | ||
| metadata: | ||
| name: "coder-provisioner" | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: "coder-provisioner" | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: Role | ||
| name: coder-provisioner-workspace-perms | ||
| --- | ||
| # Source: coder-provisioner/templates/coder.yaml | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| annotations: {} | ||
| labels: | ||
| app.kubernetes.io/instance: release-name | ||
| app.kubernetes.io/managed-by: Helm | ||
| app.kubernetes.io/name: coder-provisioner | ||
| app.kubernetes.io/part-of: coder-provisioner | ||
| app.kubernetes.io/version: 0.1.0 | ||
| helm.sh/chart: coder-provisioner-0.1.0 | ||
| name: coder-provisioner | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/instance: release-name | ||
| app.kubernetes.io/name: coder-provisioner | ||
| template: | ||
| metadata: | ||
| annotations: {} | ||
| labels: | ||
| app.kubernetes.io/instance: release-name | ||
| app.kubernetes.io/managed-by: Helm | ||
| app.kubernetes.io/name: coder-provisioner | ||
| app.kubernetes.io/part-of: coder-provisioner | ||
| app.kubernetes.io/version: 0.1.0 | ||
| helm.sh/chart: coder-provisioner-0.1.0 | ||
| spec: | ||
| containers: | ||
| - args: | ||
| - provisionerd | ||
| - start | ||
| command: | ||
| - /opt/coder | ||
| env: | ||
| - name: CODER_PROMETHEUS_ADDRESS | ||
| value: 0.0.0.0:2112 | ||
| - name: CODER_PROVISIONER_DAEMON_KEY | ||
| valueFrom: | ||
| secretKeyRef: | ||
| key: provisionerd-key | ||
| name: coder-provisionerd-key | ||
| - name: CODER_URL | ||
| value: http://coder.default.svc.cluster.local | ||
| image: ghcr.io/coder/coder:latest | ||
| imagePullPolicy: IfNotPresent | ||
| lifecycle: {} | ||
| name: coder | ||
| ports: null | ||
| resources: {} | ||
| securityContext: | ||
| allowPrivilegeEscalation: false | ||
| readOnlyRootFilesystem: null | ||
| runAsGroup: 1000 | ||
| runAsNonRoot: true | ||
| runAsUser: 1000 | ||
| seccompProfile: | ||
| type: RuntimeDefault | ||
| volumeMounts: [] | ||
| restartPolicy: Always | ||
| serviceAccountName: coder-provisioner | ||
| terminationGracePeriodSeconds: 600 | ||
| volumes: [] |
7 changes: 7 additions & 0 deletionshelm/provisioner/tests/testdata/provisionerd_key_psk_empty_workaround.yaml
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 |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| coder: | ||
| image: | ||
| tag: latest | ||
| provisionerDaemon: | ||
| pskSecretName: "" | ||
| keySecretName: "coder-provisionerd-key" | ||
| keySecretKey: "provisionerd-key" |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.