Revert k8s126 update #2727
Merged
Revert k8s126 update #2727
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
This reverts commit a3b32bc.
tmjd
force-pushed
the
revert-k8s126-update
branch
from
4e342d4
to
0c38366
Compare
rene-dekker
reviewed
Jul 11, 2023
| @@ -265,7 +265,7 @@ endif | |||
| BINDIR?=build/init/bin | |||
| $(BINDIR)/kubectl: | |||
| mkdir -p $(BINDIR) | |||
| curl -L https://storage.googleapis.com/kubernetes-release/release/v1.26.3/bin/linux/$(ARCH)/kubectl -o $@ | |||
| curl -L https://storage.googleapis.com/kubernetes-release/release/v1.25.6/bin/linux/$(ARCH)/kubectl -o $@ | |||
There was a problem hiding this comment.
nit: Do we want do use also 1.25.10 here?
rene-dekker
reviewed
Jul 11, 2023
| k8s.io/kube-aggregator v0.26.3 | ||
| k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 | ||
| sigs.k8s.io/controller-runtime v0.14.6 | ||
| k8s.io/api v0.25.8 |
There was a problem hiding this comment.
There is now also:
k8s.io/api v0.25.10
k8s.io/apiextensions-apiserver v0.25.10
k8s.io/apimachinery v0.25.10
k8s.io/client-go v0.25.10
k8s.io/kube-aggregator v0.25.10
There was a problem hiding this comment.
Lets do this in a follow up one, I don't want to hold this up any.
|
This isn't needed to master. I need to update my other PR with a CRD update because it changed k8s versions. |
|
I closed the wrong PR |
From the original PR > add the -s flag to reduce binary size / strip symbols * Also fix Copyright in file changed in revert * Update CRDs since k8s version changed
tmjd
force-pushed
the
revert-k8s126-update
branch
from
0c38366
to
91c2fc5
Compare
5 tasks
tmjd
added a commit
that referenced
this pull request
Jul 11, 2023
[pick #2727] Revert k8s 1.26 update [r1.30]
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.
Description
The update to K8s v1.26 pins has broken our ability to wait to establish watches after the apiserver comes up. I've reverted the commit (originally part of #2586) and added back a change that was in that commit to strip out symbols from the built binary.
For PR author
make gen-filesmake gen-versionsFor PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bugif this is a bugfix.kind/enhancementif this is a a new feature.enterpriseif this PR applies to Calico Enterprise only.