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

update user addon logic to delete job, not addons #3033

Merged
merged 1 commit into from
Sep 12, 2022

Conversation

kinarashah
Copy link
Member

@kinarashah kinarashah commented Sep 12, 2022

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:

  • Deployed RKE1 clusters with user addon config linked in both issues mentioned above and tested the cluster upgrades successfully + retains the config.

Note
Issues mentioned are for Rancher v2.7/RKE v1.4.0. Backport Issues are:
rancher/rancher#38877
rancher/rancher#38876

@kinarashah kinarashah marked this pull request as draft September 12, 2022 16:00
@kinarashah kinarashah requested review from superseb, a team and rayandas September 12, 2022 19:10
@kinarashah kinarashah marked this pull request as ready for review September 12, 2022 19:11
a-blender
a-blender previously approved these changes Sep 12, 2022
don't delete all user resources, rerunning
job will make sure k8s apply and ensure user
config is redeployed after system addons
@kinarashah kinarashah merged commit 4891f6d into rancher:release/v1.3 Sep 12, 2022
@kinarashah kinarashah deleted the addon branch September 12, 2022 20:56
Secretions added a commit to dominodatalab/ranchhand that referenced this pull request Aug 10, 2023
Version of RKE we're using has an unsafe bug:
rancher/rke#3033

This upgrades us past it, sets Rancher to the verison we're using
in the deployer (2.7.5) and upgrades a couple incidental things
that just happened to be in the same files.
Secretions added a commit to dominodatalab/ranchhand that referenced this pull request Aug 11, 2023
* Upgrade RKE and friends

Version of RKE we're using has an unsafe bug:
rancher/rke#3033

This upgrades us past it, sets Rancher to the verison we're using
in the deployer (2.7.5) and upgrades a couple incidental things
that just happened to be in the same files.
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.

3 participants