Merge pull request containerd#3981 from apostasie/fix-3980

fahedouch · web-flow · commit 8814decb03e1 · 2025-03-05T17:43:03.000+01:00
Fix 3980
diff --git a/hack/build-integration-kubernetes.sh b/hack/build-integration-kubernetes.sh
@@ -50,7 +50,8 @@ install::kubectl(){
   local temp
   temp="$(fs::mktemp "install")"
 
-  http::get "$temp"/kubectl "https://storage.googleapis.com/kubernetes-release/release/$version/bin/linux/${GOARCH:-amd64}/kubectl"
+  http::get "$temp"/kubectl "https://dl.k8s.io/release/$version/bin/linux/${GOARCH:-amd64}/kubectl"
+
   host::install "$temp"/kubectl
 }
 
diff --git a/pkg/referenceutil/referenceutil.go b/pkg/referenceutil/referenceutil.go
@@ -65,7 +65,10 @@ func (ir *ImageReference) FamiliarName() string {
 }
 
 func (ir *ImageReference) FamiliarMatch(pattern string) (bool, error) {
-	return reference.FamiliarMatch(pattern, ir.nn)
+	if ir.nn != nil {
+		return reference.FamiliarMatch(pattern, ir.nn)
+	}
+	return false, nil
 }
 
 func (ir *ImageReference) String() string {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ install::kubectl(){`
`50`	`50`	`local temp`
`51`	`51`	`temp="$(fs::mktemp "install")"`
`52`	`52`
`53`		`- http::get "$temp"/kubectl "https://storage.googleapis.com/kubernetes-release/release/$version/bin/linux/${GOARCH:-amd64}/kubectl"`
	`53`	`+ http::get "$temp"/kubectl "https://dl.k8s.io/release/$version/bin/linux/${GOARCH:-amd64}/kubectl"`
	`54`	`+`
`54`	`55`	`host::install "$temp"/kubectl`
`55`	`56`	`}`
`56`	`57`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,10 @@ func (ir *ImageReference) FamiliarName() string {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`func (ir *ImageReference) FamiliarMatch(pattern string) (bool, error) {`
`68`		`- return reference.FamiliarMatch(pattern, ir.nn)`
	`68`	`+ if ir.nn != nil {`
	`69`	`+ return reference.FamiliarMatch(pattern, ir.nn)`
	`70`	`+ }`
	`71`	`+ return false, nil`
`69`	`72`	`}`
`70`	`73`
`71`	`74`	`func (ir *ImageReference) String() string {`