Skip to content

Commit 88753e3

Browse files
committed
Small fix, fixes err on kubernetes replace itself
Signed-off-by: Brett Tofel <[email protected]>
1 parent 899186f commit 88753e3

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

Diff for: go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -312,5 +312,3 @@ replace k8s.io/mount-utils => k8s.io/mount-utils v0.32.2
312312
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.2
313313

314314
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.2
315-
316-
replace k8s.io/kubernetes => k8s.io/kubernetes v1.32.2

Diff for: hack/tools/k8sMaintainer.go

+16-18
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/json"
66
"flag"
77
"fmt"
8+
"golang.org/x/mod/module"
89
"io/ioutil"
910
"os"
1011
"os/exec"
@@ -258,28 +259,25 @@ func applyReplacements(mf *modfile.File, pins map[string]string) {
258259
// ensureKubernetesReplace ensures there's a "k8s.io/kubernetes => k8s.io/kubernetes vX.Y.Z" line
259260
// matching the require(...) version in case something references it directly.
260261
func ensureKubernetesReplace(mf *modfile.File, k8sVer string) {
261-
found := false
262+
var newReplaces []*modfile.Replace
263+
262264
for _, rep := range mf.Replace {
263-
if rep.Old.Path == "k8s.io/kubernetes" {
264-
found = true
265-
if rep.New.Version != k8sVer {
266-
if debug {
267-
fmt.Printf("Updating k8s.io/kubernetes replace from %s to %s\n",
268-
rep.New.Version, k8sVer)
269-
}
270-
rep.New.Version = k8sVer
265+
if rep.Old.Path == "k8s.io/kubernetes" && rep.New.Version != k8sVer {
266+
if debug {
267+
fmt.Printf("Updating k8s.io/kubernetes replace from %s to %s\n", rep.New.Version, k8sVer)
271268
}
272-
break
273-
}
274-
}
275-
if !found {
276-
if debug {
277-
fmt.Printf("Inserting k8s.io/kubernetes => %s\n", k8sVer)
278-
}
279-
if err := mf.AddReplace("k8s.io/kubernetes", "", "k8s.io/kubernetes", k8sVer); err != nil {
280-
die("Error adding replace for k8s.io/kubernetes: %v", err)
269+
continue // Skip adding this entry to newReplaces
281270
}
271+
newReplaces = append(newReplaces, rep)
282272
}
273+
274+
// Add the correct replace directive
275+
newReplaces = append(newReplaces, &modfile.Replace{
276+
Old: module.Version{Path: "k8s.io/kubernetes"},
277+
New: module.Version{Path: "k8s.io/kubernetes", Version: k8sVer},
278+
})
279+
280+
mf.Replace = newReplaces
283281
}
284282

285283
// findKubernetesVersion returns the version in the require(...) block for k8s.io/kubernetes

0 commit comments

Comments
 (0)