-
Notifications
You must be signed in to change notification settings - Fork 56
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
Improve documentation for Webhook deployment configuration #1312
Conversation
Oops my branch was branched off of #1310 causing CI to fail. Will fix this quickly |
488c32a
to
1893b82
Compare
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.
Looks good, I just have some suggestions
docs/additional-configuration.adoc
Outdated
**Note:** In order for the `devworkspace-webhook-server` configuration options to take effect: | ||
- You must place them in the https://github.com/devfile/devworkspace-operator?tab=readme-ov-file#global-configuration-for-the-devworkspace-operator[global DWOC], which has the name `devworkspace-operator-config` and exists in the namespace where the DevWorkspaceOperator is installed. If it does not already exist on the cluster, you must create it. | ||
- You'll need to terminate the `devworkspace-controller-manager` pod and restart it so that the `devworkspace-webhook-server` deployment can be adjusted accordingly. |
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.
**Note:** In order for the `devworkspace-webhook-server` configuration options to take effect: | |
- You must place them in the https://github.com/devfile/devworkspace-operator?tab=readme-ov-file#global-configuration-for-the-devworkspace-operator[global DWOC], which has the name `devworkspace-operator-config` and exists in the namespace where the DevWorkspaceOperator is installed. If it does not already exist on the cluster, you must create it. | |
- You'll need to terminate the `devworkspace-controller-manager` pod and restart it so that the `devworkspace-webhook-server` deployment can be adjusted accordingly. | |
**Note:** For the `devworkspace-webhook-server` configuration options to take effect: | |
- You must place them in the https://github.com/devfile/devworkspace-operator?tab=readme-ov-file#global-configuration-for-the-devworkspace-operator[global DWOC], which has the name `devworkspace-operator-config` and exists in the namespace where the DevWorkspace Operator is installed. If it does not already exist on the cluster, you must create it. | |
- You'll need to delete the current `devworkspace-controller-manager` pod so that the replicaset can recreate a new pod. The new pod will update the `devworkspace-webhook-server` deployment. |
Here is my suggestion. We also need to have the newline in between the Note: and first bullet point, otherwise the bullet points are not rendered properly:
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.
Thanks so much for the review and for catching this David, I'll update the PR accordingly!
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.
Fixed :) Should be good now 🙏
// Note: In order for changes made to the webhook configuration to take effect: | ||
// | ||
// - The changes must be made in the global DevWorkspaceOperatorConfig, which has the | ||
// name 'devworkspace-operator-config' and exists in the same namespace where the | ||
// DevWorkspaceOperator is deployed. | ||
// | ||
// - The devworkspace-controller-manager pod must be terminated and recreated for the | ||
// DevWorkspace Webhook Server deployment to be updated. |
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.
// Note: In order for changes made to the webhook configuration to take effect: | |
// | |
// - The changes must be made in the global DevWorkspaceOperatorConfig, which has the | |
// name 'devworkspace-operator-config' and exists in the same namespace where the | |
// DevWorkspaceOperator is deployed. | |
// | |
// - The devworkspace-controller-manager pod must be terminated and recreated for the | |
// DevWorkspace Webhook Server deployment to be updated. | |
// For the changes made to the webhook configuration to take effect: | |
// | |
// - The changes must be made in the global DevWorkspaceOperatorConfig, which has the | |
// name 'devworkspace-operator-config' and exists in the same namespace where the | |
// DevWorkspace Operator is deployed. This DevWorkspaceOperatorConfig can be created | |
// manually if it does not exist. | |
// | |
// - The devworkspace-controller-manager pod must be manually terminated. This allows the | |
// replicaset to recreate the pod which will update the DevWorkspace Webhook Server deployment. |
1893b82
to
fe1e978
Compare
docs/additional-configuration.adoc
Outdated
**Note:** In order for the `devworkspace-webhook-server` configuration options to take effect: | ||
|
||
- You must place them in the https://github.com/devfile/devworkspace-operator?tab=readme-ov-file#global-configuration-for-the-devworkspace-operator[global DWOC], which has the name `devworkspace-operator-config` and exists in the namespace where the DevWorkspaceOperator is installed. If it does not already exist on the cluster, you must create it. | ||
- You'll need to terminate the `devworkspace-controller-manager` pod and restart it so that the `devworkspace-webhook-server` deployment can be adjusted accordingly. |
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.
Can we update to:
- You'll need to terminate the `devworkspace-controller-manager` pod and restart it so that the `devworkspace-webhook-server` deployment can be adjusted accordingly. | |
- You'll need to terminate the `devworkspace-controller-manager` pod so that the replicaset can recreate it. The new pod will update the `devworkspace-webhook-server` deployment. |
it's to make it clear that the user doesn't have to restart anything, all the user has to do is terminate the pod and wait until it's recreated
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.
Good call, done :)
fe1e978
to
20ed1b6
Compare
Thank you @AObuchow , I will merge soon |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: AObuchow, dkwon17 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
CI is failing due to #1314 |
docs/additional-configuration.adoc
Outdated
|
||
These configuration options exist in the **global** DWOC's `config.webhook` field: | ||
|
||
```YAML |
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.
This is using the wrong code block formatting style. It should be:
[source,yaml]
----
(content)
----
Will fix this.
20ed1b6
to
352db0f
Compare
New changes are detected. LGTM label has been removed. |
Mention requirements for DWOC webhook configuration changes to take effect. Fix devfile#1289 Signed-off-by: Andrew Obuchowicz <[email protected]>
Signed-off-by: Andrew Obuchowicz <[email protected]>
Signed-off-by: Andrew Obuchowicz <[email protected]>
352db0f
to
b4dc6ef
Compare
What does this PR do?
What issues does this PR fix or reference?
Fix #1289
Is it tested? How?
kubectl explain dwoc.config.webhook
. The DESCRIPTION field should show the new mentions of needing to use the global DWOC and restarting the devworkspace-controller-manager podPR Checklist
/test v8-devworkspace-operator-e2e, v8-che-happy-path
to trigger)v8-devworkspace-operator-e2e
: DevWorkspace e2e testv8-che-happy-path
: Happy path for verification integration with Che