proposed fix for #758 - migrating the jenkins-master container startup from install-plugins.sh to jenkins-plugin-cli and migrating /sbin/tini to /usr/bin/tini #764
Conversation
This file contains 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
…ins.sh to jenkins-plugin-cli and migrating /sbin/tini to /usr/bin/tini
brokenpip3
added a commit
to brokenpip3/kubernetes-operator
that referenced
this pull request
Dec 10, 2022
* the fix was original attempted here: jenkinsci#764 but was not working correctly due to 2-3 additional changes which needed to be done * removed the openshift check because the env is not mention anywhere and also the new jenkins-plugin-cli does not a specific command for openshift. Finally this does not make any sense in general, the only problem in ocp will be the user id that will be mapped to a random uid but that's another story. The command to install the plugins should remain the same across different k8s flavours.
|
hi @jay-johnson thanks a lot for this PR, I tried your changes but the plugin-install binary change needed some more changes that I made here: #784 based on your first attempt. |
prryb
pushed a commit
that referenced
this pull request
Jan 12, 2023
…t the newest jenkins lts version (#784) * fix(seed): fix #742, workaround #698 Original fix proposal: #742 (comment) * fix(install-plugin.sh): fix #758, #739 * the fix was original attempted here: #764 but was not working correctly due to 2-3 additional changes which needed to be done * removed the openshift check because the env is not mention anywhere and also the new jenkins-plugin-cli does not a specific command for openshift. Finally this does not make any sense in general, the only problem in ocp will be the user id that will be mapped to a random uid but that's another story. The command to install the plugins should remain the same across different k8s flavours. * fix(doc/test): fix /usr/bin/tini in any doc and validation * fix(jenkins): remove AdminWhitelistRule to avoid jvm stack trace, see: https://www.jenkins.io/doc/book/security/controller-isolation/jep-235/#api-compatibility * fix(seed): fix seed img built on a previous jvm, fix #761 * fix(plugin): update the base plugin to work with the newest version of jenkins:lts * fix(run): fix #778 * fix(backup): add a trap to remove the tmp dir if the tar fail, also fix: #770 * test(chart): update chart values for testing, will revert before merge * fix(configmap): leftover * fix(tests): fix seed job test * fix(e2e) * fix(e2e): helm * fix(operator): update the temporary img to reflect latests changes * Fix Helm e2e tests * add trap in case of unwanted exit and make shellcheck happy * chore(plugin): update git ver to 5.0.0 * fix(backup): always force delete the backup directory * chore(operator): update the temporary img to reflect latest changes * chore(jenkins): upgrade jenkins latest lts
|
hi @jay-johnson this should be completed in #784, if make sense for you you can close the PR :) |
|
Thanks for fixing this @brokenpip3 + the rest of the team! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes
Proposed changes for getting the
jenkins-jenkinspod to start up thejenkins-mastercontainer on docker imagedocker.io/jenkins/jenkins:2.366and the operator onvirtuslab/jenkins-operator:v0.7.1I documented my notes in the issue:
#758 (comment)
Notes:
make minikube-startper the docs)./usr/bin/tinimay not be consistent on other image OS'es.Submitter Checklist
These are the criteria that every PR should meet, please check them off as you
review them:
See the contribution guide for more details.
Reviewer Notes
This changes the
jenkins-mastercontainer startup. This could impact a lot of users if it is incorrect.Release Notes