Fetch CNI Plugins from github.com/containernetworking/Plugins #16979
+9
−10
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
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
cncf-cla: yes
justinsb
reviewed
Dec 5, 2024
k8s-infra detected a credits leak on the infrastructure due to allowing pulling from a multi-regional GCS bucket. Switching to Github releases will help mitigate the resource abuse Signed-off-by: Arnaud Meukam <[email protected]>
ameukam
force-pushed
the
cni-plugins-github
branch
from
0913728 to
112b53d
Compare
|
/retest pull-kops-e2e-k8s-aws-amazonvpc |
|
@ameukam: You must be a member of the kubernetes/kops-maintainers GitHub team to set the milestone. If you believe you should be able to issue the /milestone command, please contact your Kops Maintainers and have them propose you as an additional delegate for this responsibility. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
@ameukam: The
The following commands are available to trigger optional jobs:
Use
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
/test pull-kops-e2e-k8s-aws-amazonvpc |
|
Can you also apply this diff? Part of kubernetes/k8s.io#7584 diff --git a/pkg/nodemodel/wellknownassets/cni.go b/pkg/nodemodel/wellknownassets/cni.go
index 4b61fc7784..188573f093 100644
--- a/pkg/nodemodel/wellknownassets/cni.go
+++ b/pkg/nodemodel/wellknownassets/cni.go
@@ -35,12 +35,12 @@ import (
const (
// CNI tarball for k8s >= 1.22
- defaultCNIAssetAmd64K8s_22 = "https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz"
- defaultCNIAssetArm64K8s_22 = "https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz"
+ defaultCNIAssetAmd64K8s_22 = "https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz"
+ defaultCNIAssetArm64K8s_22 = "https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz"
// CNI tarball for k8s >= 1.27
- defaultCNIAssetAmd64K8s_27 = "https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz"
- defaultCNIAssetArm64K8s_27 = "https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz"
+ defaultCNIAssetAmd64K8s_27 = "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz"
+ defaultCNIAssetArm64K8s_27 = "https://github.com/containernetworking/plugins/releases/download/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz"
// Environment variable for overriding CNI url
ENV_VAR_CNI_ASSET_URL = "CNI_VERSION_URL"
diff --git a/pkg/nodemodel/wellknownassets/cni_test.go b/pkg/nodemodel/wellknownassets/cni_test.go
index f9744ebd34..0c88358673 100644
--- a/pkg/nodemodel/wellknownassets/cni_test.go
+++ b/pkg/nodemodel/wellknownassets/cni_test.go
@@ -60,7 +60,7 @@ func Test_FindCNIAssetFromEnvironmentVariable(t *testing.T) {
}
func Test_FindCNIAssetFromDefaults122(t *testing.T) {
- desiredCNIVersionURL := "https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz"
+ desiredCNIVersionURL := "https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz"
desiredCNIVersionHash := "sha256:962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7"
cluster := &api.Cluster{} |
|
@upodroid Not on this PR. kOps folx advise against it. Releases for 1.22 are no longer done so there is not really value of make this change. |
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.
k8s-infra detected a credits leak on the infrastructure due to allowing
pulling from a multi-regional GCS bucket.
Switching to Github releases will help mitigate the resource abuse