Skip to content

Commit e86ae23

Browse files
committed
WIP: vendor: Replace openshift/api with Pratik's in-flight branch
I found the pseudo-version [1] for the branch with: $ go get github.com/PratikMahajan/api@add-custom-sig-stores go: github.com/PratikMahajan/api@add-custom-sig-stores (v0.0.0-20231204074954-53d3f2ac205d) requires github.com/PratikMahajan/[email protected]: parsing go.mod: module declares its path as: github.com/openshift/api but was required as: github.com/PratikMahajan/api Then I added the replace directive [2] by hand. There might be command-line tooling for this, but I'm not familiar with it. After that, the usual: $ go mod tidy $ go mod vendor $ git log --author wking vendor/ $ git add -A go.* vendor all using: $ go version go version go1.21.1 linux/amd64 I also bumped the Dockerfile by hand, so now we'll pick up everything under 0000_00_cluster-version-operator_* (importantly for this bump, both the Default and TechPreviewNoUpgrade versions of the ClusterVersion CRD). [1]: https://go.dev/ref/mod#pseudo-versions [2]: https://go.dev/ref/mod#go-mod-file-replace
1 parent d41d698 commit e86ae23

File tree

38 files changed

+4223
-109
lines changed

38 files changed

+4223
-109
lines changed

Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ RUN hack/build-go.sh; \
88
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
99
COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
1010
COPY install /manifests
11-
COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml /manifests/
12-
COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml /manifests/
11+
COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_* /manifests/
1312
COPY bootstrap /bootstrap
1413
ENTRYPOINT ["/usr/bin/cluster-version-operator"]

go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ require (
3131
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
3232
)
3333

34+
replace github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524 => github.com/PratikMahajan/api v0.0.0-20231204074954-53d3f2ac205d
35+
3436
require (
3537
github.com/beorn7/perks v1.0.1 // indirect
3638
github.com/cespare/xxhash/v2 v2.2.0 // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
github.com/PratikMahajan/api v0.0.0-20231204074954-53d3f2ac205d h1:rWpb+CE5NpScCt0vixP/nQbk4ngOko5B6OVZdGcpjgA=
2+
github.com/PratikMahajan/api v0.0.0-20231204074954-53d3f2ac205d/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
13
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
24
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
35
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
@@ -81,8 +83,6 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
8183
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
8284
github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
8385
github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
84-
github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524 h1:+hOy0dbg/WIQ2TpBh+aWmoKTHYB82nSM8CfIZtjBmr8=
85-
github.com/openshift/api v0.0.0-20231020115248-f404f2bc3524/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
8686
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1 h1:W1N/3nVciqmjPjn2xldHjb0AwwCQzlGxLvX5BCgE8H4=
8787
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1/go.mod h1:ihUJrhBcYAGYQrJu/gP2OMgfVds5f5z5kbeLNBqjHLo=
8888
github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7 h1:pJLcCSJzdiWCaJ4bAepgnvwMdP33LumbVJyWSW7+3ng=

vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml renamed to vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)