Bump go modules #853
Merged
Bump go modules #853
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
manno
force-pushed
the
bump-gomod-kustomize-wrangler-helm
branch
2 times, most recently
from
70e3eeb
to
1607f6d
Compare
added 3 commits
July 5, 2022 16:45
Switch from go-openapi to kube-openapi spec
Kubernetes hasn't been updated in argoproj. The files have been copied and import paths have been adapted. Since argo-cd and gitops-engine use the server scheme from k8s.io/kubernetes we need to work around 'unknown revision 0.0.0' errors, by including replace statements in the go.mod file. kubernetes/issues/79384 Vendoring the argoproj files helps with updating k8s, but is not enough to get rid of the replace statements. argoproj/gitops-engine/issues/56
manno
force-pushed
the
bump-gomod-kustomize-wrangler-helm
branch
from
1607f6d
to
701a2f6
Compare
mattfarina
reviewed
Jul 5, 2022
There was a problem hiding this comment.
@manno I've started to review this one. I paired with Arvind for a short bit to discuss it.
At first we considered the case of using k8s 1.23 packages since there is a version skew of +/-1 so that would provide k8s 1.24 support. But, wrangler has already updated to k8s 1.24 so that wouldn't work. vendoring part of argo works for the time being.
I'm still reviewing so I'll come back to this. Just wanted to give you an update.
mattfarina
approved these changes
Jul 8, 2022
|
@manno can you please create a PR to cherry-pick this into the release branch? |
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.
This bumps all the go modules at once, due to the many, very broad, 'replace' directives I couldn't find a smaller set.
I also had to copy the 'diff' package from argoproj. The modules have not been updated upstream and we want a newer k8s.io/api. I think copying is better than forking, at least temporary. According to https://blog.argoproj.io/argo-cd-v1-6-democratizing-gitops-with-gitops-engine-5a17cfc87d62 the diff package is meant to be a publicly reusable library. We could switch back to the import once gitops-engine is updated, however we also import from argo-cd, which we should avoid I think.
Looking at a snyk scan of our go modules, we import too much from argo-cd. So maybe importing the gitops-engine and copying/vendoring the argo-cd files, in the future?
Since argo-cd and gitops-engine use the server scheme from k8s.io/kubernetes we need to work around 'unknown revision 0.0.0' errors, by including replace statements in the go.mod file: kubernetes/issues/79384
Vendoring the argoproj files helps with updating k8s, but is not enough
to get rid of the replace statements: argoproj/gitops-engine#56
Fixes #745