Skip to content

Commit

Permalink
Dockerfile: Be less opinionated about CRD filesnames when copying fro…
Browse files Browse the repository at this point in the history
…m openshift/api

openshift/api@9e3e820a70e4b8 (Console CRDs: Rename files to use the
default run-level for updates, 2023-08-02, openshift/api#1541) renamed
these, and needing opinions in two locations that must match makes
maintenance tedious.  With this commit, I'm asserting that
openshift/api is where CRD filename opinions happen, and that this
repo just passes those filenames along.  And I'm asserting that the
CRDs we're responsible for are "all of console/ and helm/" and "any
CRDs in operator/ that include 'console-operator' in their filename".
  • Loading branch information
wking committed Oct 3, 2023
1 parent e3c33df commit 40c4468
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions Dockerfile.rhel7
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@ COPY manifests /manifests/
COPY quickstarts/*.yaml /manifests/

# extensions manifests generated from openshift/api types
COPY vendor/github.com/openshift/api/console/v1/*.crd.yaml /manifests/
COPY vendor/github.com/openshift/api/console/v1alpha1/*.crd.yaml /manifests/
COPY vendor/github.com/openshift/api/operator/v1/0000_70_console-operator.crd.yaml /manifests/
COPY vendor/github.com/openshift/api/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml /manifests/
COPY vendor/github.com/openshift/api/helm/v1beta1/0000_10-project-helm-chart-repository.crd.yaml /manifests/
COPY vendor/github.com/openshift/api/console/*/*.crd.yaml /manifests/
COPY vendor/github.com/openshift/api/operator/*/*console-operator*.crd.yaml /manifests/
COPY vendor/github.com/openshift/api/helm/*/*crd.yaml /manifests/

LABEL io.k8s.display-name="OpenShift console-operator" \
io.k8s.description="This is a component of OpenShift Container Platform and manages the lifecycle of the web console." \
Expand Down

0 comments on commit 40c4468

Please sign in to comment.