Thanks for all your awesome PRs! Because of how jsonnet-bundler works today, we need the jsonnet changes to be in one commit, and the bump of the jsonnet dependency in a separate commit (this is being fixed with jsonnet-bundler/jsonnet-bundler#36). Instructions how to do it now: https://github.com/coreos/kube-prometheus#contributing

I wasn't too sure how that work when its coming from a fork and what the dependency versions actually updates to. When I tried I saw the versions changed on almost all of the dependencies in the lock file, and that didnt seem right to me.

Can you provide me with step by step instructions I am happy to do it

from the tip of this PR run

jb update

this will update the kube-prometheus dependency within this repo, and then you just commit that in a separate commit

Can you rebase your PR one more time? We have finally gotten rid of the local dependency workaround and there shouldn't be another conflict with jsonnetfile.lock.json again.

Make sure to go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb to install the latest version of jb for a new needed feature.

I followed your instructions and recommited the latest jsonetfile.lock.json but there are still conflicts.
Not sure how I should resolve

@latchmihay you need to first rebase your PR to master upstream branch, then run jb update in the jsonnet/kube-prometheus directory and then run make generate-in-docker from the root dir.

thank you. I have rebased and regenerated

I am closing this as PSPs are scheduled to be deprecated - kubernetes/kubernetes#97171

Please reopen or open an issue if you feel this is something that should be worked on.