UPSTREAM: <carry>: Resolve dynamic resource allocation unknown revision

JoelSpeed · cloud-team-rebase-bot · commit 162c1ebb5ba4 · 2023-05-08T12:43:28.000Z
diff --git a/go.mod b/go.mod
@@ -2,6 +2,12 @@ module k8s.io/cloud-provider-gcp
 
 go 1.19
 
+// k8s.io/kubernetes imports dynamic-resource-allocation from the staging repos as of 1.26.0.
+// This means that `go list -mod readonly -m -f '{{ if not .Main }}{{ .String }}{{ end }}' all` fails
+// as it cannot find the v0.0.0 revision. This is needed to resolve that error and fixes
+// the ART builds.
+replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.0
+
 require (
 	cloud.google.com/go v0.99.0
 	github.com/evanphx/json-patch v4.12.0+incompatible
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1463,13 +1463,37 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-# k8s.io/api => k8s.io/api v0.27.1
-# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.1
-# k8s.io/apimachinery => k8s.io/apimachinery v0.27.1
-# k8s.io/apiserver => k8s.io/apiserver v0.27.1
-# k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.1
-# k8s.io/client-go => k8s.io/client-go v0.27.1
-# k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.1
+# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.0
+# cloud.google.com/go => cloud.google.com/go v0.75.0
+# github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.6
+# github.com/go-openapi/swag => github.com/go-openapi/swag v0.19.7
+# github.com/gofrs/flock => github.com/gofrs/flock v0.7.1
+# github.com/google/uuid => github.com/google/uuid v1.1.4
+# github.com/hashicorp/golang-lru => github.com/hashicorp/golang-lru v0.5.4
+# github.com/imdario/mergo => github.com/imdario/mergo v0.3.11
+# github.com/mrunalp/fileutils => github.com/mrunalp/fileutils v0.5.0
+# github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.14.1
+# github.com/onsi/gomega v1.10.3 => github.com/onsi/gomega v1.10.3
+# github.com/spf13/cobra => github.com/spf13/cobra v1.4.0
+# github.com/spf13/pflag => github.com/spf13/pflag v1.0.5
+# github.com/stretchr/testify => github.com/stretchr/testify v1.7.0
+# go.uber.org/zap => go.uber.org/zap v1.17.0
+# golang.org/x/lint => golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5
+# golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
+# golang.org/x/sync => golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
+# google.golang.org/api => google.golang.org/api v0.63.0
+# google.golang.org/genproto => google.golang.org/genproto v0.0.0-20210111234610-22ae2b108f89
+# google.golang.org/grpc => google.golang.org/grpc v1.34.0
+# gopkg.in/check.v1 => gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b
+# gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.3
+# gopkg.in/warnings.v0 => gopkg.in/warnings.v0 v0.1.2
+# k8s.io/api => k8s.io/api v0.26.0
+# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
+# k8s.io/apimachinery => k8s.io/apimachinery v0.26.0
+# k8s.io/apiserver => k8s.io/apiserver v0.26.0
+# k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0
+# k8s.io/client-go => k8s.io/client-go v0.26.0
+# k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0
 # k8s.io/cloud-provider-gcp/providers => ./providers
 # k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.1
 # k8s.io/code-generator => k8s.io/code-generator v0.27.1
