- make sure you have upgraded your jx CLI to make sure you are using the correct version for the next steps.
You can upgrade your Jenkins X installation at any time by running the jx gitops upgrade command inside a git checkout of your cluster GitOps repository:
First make sure you have the latest git contents as the boot job will push changes:
Make sure you have no pending git commits….
Now if your git clone is clean run the following:
jx gitops upgrade
- upgrade your local version stream to the latest which has passed the latest tests
- make any changes in the version stream to the boot job and its configuration
After running this command you will usually have some changes in git you can review. If you are happy with the changes commit them and create a Pull Request so that they can get applied on your cluster.
git add * git commit -a -m "fix: upgrade versions" git push
The jx-git-operator will trigger a boot job in the
jx-git-operator namespace, to track the progress of the upgrade you can run:
jx admin logs
It is possible that you will have merge conflicts. You can follow the inline git helper messages to resolve conflicts - or use your IDE to help figure out the merge issues. Usually if there are conflicts its safest to use the upstream version; particularly from the
Under the hood Kpt is used to fetch changes from the upstream defined in each Kptfile.
By default the
versionStream directory has a Kpt strategy of
force-delete-replace which removes all your changes in that folder. In order to merge your changes with the ones coming from upstream, add a file:
.jx/gitops/kpt-strategy.yaml with the following content:
config: - relativePath: versionStream strategy: resource-merge
Once ready, make a pull request onto your cluster repository, review changes and merge. The Jenkins X git operator will automatically apply the upgrades into your cluster.
Replacing your local versionStream
If you are having merge conflicts trying to upgrade your installation you could just replace the
versionStream directory with the latest version stream folder. NOTE this will overwrite any local changes you have made inside the
verisonStream folder. Though everything is versioned in git so you can always review the changes.
Inside your cluster git repository run this command:
kpt pkg update --strategy force-delete-replace versionStream
That will update your
versionStream directory to be in line with the latest version stream. You can always then review the changes before committing them.
Configure merge strategy
You can configure the
kpt strategy used to apply changes from the version stream into your
versionStream folder via a custom configuration file.
Create a file called
.jx/gitops/kpt-strategy.yaml in your dev cluster git repository that looks like this:
config: - relativePath: versionStream strategy: alpha-git-patch
this will configure that the
alpha-git-patch strategy will be used whenever you try
jx gitops upgrade which should preserve any local changes; though you may have to resolve some git conflicts in your IDE (as described above).
To avoid any possible git merge issues its a good idea to try keep local source changes out of the
versionStream folder if you can.
Was this page helpful?
Glad to hear it! Please tell us how we can improve.
Sorry to hear that. Please tell us how we can improve.