Skip to content

Commit 5d1c91f

Browse files
committed
Dockerfile: copy CRDs from openshift/api
1 parent cd332aa commit 5d1c91f

6 files changed

+10
-1230
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ RUN hack/build-go.sh
66
FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
77
COPY --from=builder /go/src/github.com/openshift/cluster-version-operator/_output/linux/amd64/cluster-version-operator /usr/bin/
88
COPY install /manifests
9+
COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml /manifests/
10+
COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml /manifests/
911
COPY bootstrap /bootstrap
1012
ENTRYPOINT ["/usr/bin/cluster-version-operator"]

Dockerfile.rhel7

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ RUN hack/build-go.sh; \
88
FROM registry.svc.ci.openshift.org/ocp/4.0:base
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/
1113
COPY bootstrap /bootstrap
1214
ENTRYPOINT ["/usr/bin/cluster-version-operator"]

Gopkg.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types" ]
2020
non-go = false
2121
unused-packages = false
2222

23+
[[prune.project]]
24+
name = "github.com/openshift/api"
25+
non-go = false
26+
2327
[[constraint]]
2428
name = "github.com/google/uuid"
2529
version = "v1.1.1"

hack/test-prerequisites.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ func main() {
2424

2525
client := apiext.NewForConfigOrDie(cfg)
2626
for _, path := range []string{
27-
"install/0000_00_cluster-version-operator_01_clusterversion.crd.yaml",
28-
"install/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml",
27+
"vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml",
28+
"vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml",
2929
} {
3030
var name string
3131
err := wait.PollImmediate(time.Second, 30*time.Second, func() (bool, error) {

0 commit comments

Comments
 (0)