update user addon logic to delete job, not addons #3033
Merged
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.
Problem:
With https://github.com/rancher/rke/pull/2900/files, we were deleting user addons during deploy. This causes problems if user config has namespaces like
cattle-system
or other resources which break the cluster provisioning.Solution:
Don't delete all user resources and always rerun the job if addon or addonInclude fields are set for rancher/rancher#38749. The job reruns kubectl apply and redeploys the user addon config after system addons are run, so it retains the user config for issues like rancher/rancher#38703.
Testing:
Note
Issues mentioned are for Rancher v2.7/RKE v1.4.0. Backport Issues are:
rancher/rancher#38877
rancher/rancher#38876