Sitelet https://github.com/kubernetes/kops/pull/17987/files
Skip to content

drop storage.googleapis.com/k8s-artifacts-cni as a mirror #17987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Feb 20, 2026
Merged

drop storage.googleapis.com/k8s-artifacts-cni as a mirror #17987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 8 additions & 42 deletions hack/generate-asset-hashes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,38 +122,6 @@ EOF
done
}

function generate_cni_hashes_legacy() {
prefix=$1
patch=$2

cat > "${REPO_ROOT}/pkg/assets/assetdata/cni-legacy-${prefix}.yaml" <<EOF
# This file is generated by generate-asset-hashes.sh

filestores:
- base: https://storage.googleapis.com/k8s-artifacts-cni/release/

files:
EOF

version="${prefix}.${patch}"
echo "cni ${version}"

{
echo "# cni ${version}"
go run ./pkg/assets/assetdata/tools/cmd/generatefileassets \
--base https://storage.googleapis.com/k8s-artifacts-cni/release/ \
--prefix "v${version}/" \
--sums "https://storage.googleapis.com/k8s-artifacts-cni/release/v${version}/cni-plugins-linux-amd64-v${version}.tgz.sha256" \
| grep -v "^files:"
go run ./pkg/assets/assetdata/tools/cmd/generatefileassets \
--base https://storage.googleapis.com/k8s-artifacts-cni/release/ \
--prefix "v${version}/" \
--sums "https://storage.googleapis.com/k8s-artifacts-cni/release/v${version}/cni-plugins-linux-arm64-v${version}.tgz.sha256" \
| grep -v "^files:"
} >> "${REPO_ROOT}/pkg/assets/assetdata/cni-legacy-${prefix}.yaml"
}


function generate_cni_hashes() {
prefix=$1
shift # Remove the prefix argument
Expand All @@ -163,7 +131,7 @@ function generate_cni_hashes() {
# This file is generated by generate-asset-hashes.sh

filestores:
- base: https://storage.googleapis.com/k8s-artifacts-cni/release/
- base: https://github.com/containernetworking/plugins/releases/download/

files:
EOF
Expand Down Expand Up @@ -215,13 +183,11 @@ generate_containerd_hashes 2.1 6
generate_containerd_hashes 2.2 1

# Generate CNI network plugins hashes.
# Generate legacy CNI hashes, from storage.googleapis.com/k8s-artifacts-cni/release/
generate_cni_hashes_legacy 0.9 1
generate_cni_hashes_legacy 1.2 0
generate_cni_hashes_legacy 1.3 0
generate_cni_hashes_legacy 1.4 1
generate_cni_hashes_legacy 1.5 1
generate_cni_hashes_legacy 1.6 1
# Generate CNI hashes, from github.com/containernetworking/plugins/releases/download/
# Note: argument is now base path and list of versions (because there is no 1.6.1)
generate_cni_hashes 1.6 1.6.0 1.6.2
generate_cni_hashes 0.9 0.9.1
generate_cni_hashes 1.2 1.2.0
generate_cni_hashes 1.3 1.3.0
generate_cni_hashes 1.3 1.3.0
generate_cni_hashes 1.4 1.4.1
generate_cni_hashes 1.5 1.5.1
generate_cni_hashes 1.6 1.6.2
2 changes: 1 addition & 1 deletion pkg/assets/assetdata/cni-legacy-0.9.yaml → pkg/assets/assetdata/cni-0.9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is generated by generate-asset-hashes.sh

filestores:
- base: https://storage.googleapis.com/k8s-artifacts-cni/release/
- base: https://github.com/containernetworking/plugins/releases/download/

files:
# cni 0.9.1
Expand Down
2 changes: 1 addition & 1 deletion pkg/assets/assetdata/cni-legacy-1.2.yaml → pkg/assets/assetdata/cni-1.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is generated by generate-asset-hashes.sh

filestores:
- base: https://storage.googleapis.com/k8s-artifacts-cni/release/
- base: https://github.com/containernetworking/plugins/releases/download/

files:
# cni 1.2.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/assets/assetdata/cni-legacy-1.3.yaml → pkg/assets/assetdata/cni-1.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is generated by generate-asset-hashes.sh

filestores:
- base: https://storage.googleapis.com/k8s-artifacts-cni/release/
- base: https://github.com/containernetworking/plugins/releases/download/

files:
# cni 1.3.0
Expand Down
11 changes: 11 additions & 0 deletions pkg/assets/assetdata/cni-1.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This file is generated by generate-asset-hashes.sh

filestores:
- base: https://github.com/containernetworking/plugins/releases/download/

files:
# cni 1.4.1
- name: v1.4.1/cni-plugins-linux-amd64-v1.4.1.tgz
sha256: 2a0ea7072d1806b8526489bcd3b4847a06ab010ee32ba3c3d4e5a3235d3eb138
- name: v1.4.1/cni-plugins-linux-arm64-v1.4.1.tgz
sha256: 56fe62d73942cffd8f119d2b8ecb6a062e85f529a3dbfc7aa5cd83c2c01929a7
2 changes: 1 addition & 1 deletion pkg/assets/assetdata/cni-legacy-1.5.yaml → pkg/assets/assetdata/cni-1.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is generated by generate-asset-hashes.sh

filestores:
- base: https://storage.googleapis.com/k8s-artifacts-cni/release/
- base: https://github.com/containernetworking/plugins/releases/download/

files:
# cni 1.5.1
Expand Down
2 changes: 1 addition & 1 deletion pkg/assets/assetdata/cni-1.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is generated by generate-asset-hashes.sh

filestores:
- base: https://storage.googleapis.com/k8s-artifacts-cni/release/
- base: https://github.com/containernetworking/plugins/releases/download/

files:
# cni 1.6.0
Expand Down
11 changes: 0 additions & 11 deletions pkg/assets/assetdata/cni-legacy-1.4.yaml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions pkg/assets/assetdata/cni-legacy-1.6.yaml
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions pkg/assets/mirrors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ var wellKnownMirrors = []mirrorConfig{
"https://github.com/kubernetes/kops/releases/download/v{kopsVersion}/",
},
},
{
Base: "https://storage.googleapis.com/k8s-artifacts-cni/release/",
Mirrors: []string{
"https://github.com/containernetworking/plugins/releases/download/",
},
},
{
Base: "https://dl.k8s.io/release/",
},
}

func (m *mirrorConfig) findMirrors(u string) ([]string, bool) {
Expand Down
Loading