Rework custom-bundle.Dockerfile to use staged data #525
Conversation
dprince
force-pushed
the
bundle_extra_data
branch
from
fad5e84 to
be9f0a2
Compare
dprince
force-pushed
the
bundle_extra_data
branch
from
be9f0a2 to
48cb64a
Compare
dprince
force-pushed
the
bundle_extra_data
branch
from
48cb64a to
42889cd
Compare
|
Build failed (check pipeline). Post https://review.rdoproject.org/zuul/buildset/cfacb5b51ebd4ee7ae7ca2e6ca282438 ✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 33m 00s |
dprince
force-pushed
the
bundle_extra_data
branch
from
42889cd to
fc52ec6
Compare
|
Build failed (check pipeline). Post https://review.rdoproject.org/zuul/buildset/7555e7fae42e4a48b53af32875a63523 ❌ openstack-k8s-operators-content-provider FAILURE in 11m 53s |
|
CI jobs fail to due 'missing skopeo command'. Looking into it |
dprince
force-pushed
the
bundle_extra_data
branch
from
fc52ec6 to
dcd425d
Compare
|
Build failed (check pipeline). Post https://review.rdoproject.org/zuul/buildset/6ca49142b50445508cb02c67da385fc4 ❌ openstack-k8s-operators-content-provider FAILURE in 13m 46s |
|
/test openstack-operator-build-deploy-kuttl |
dprince
force-pushed
the
bundle_extra_data
branch
from
dcd425d to
a0b284f
Compare
|
Build failed (check pipeline). Post https://review.rdoproject.org/zuul/buildset/a4723cf98a244353baa33b540977eeb5 ✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 52m 33s |
|
Okay, to get the prow jobs passing here I pushed this related PR openshift/release#46095 Once that lands we could set BUNDLE_DOCKERFILE in .prow_ci.env here (in this PR) and use the new location |
dprince
force-pushed
the
bundle_extra_data
branch
from
a0b284f to
eb35dd9
Compare
|
Build failed (check pipeline). Post https://review.rdoproject.org/zuul/buildset/c38ce42993784511857626d55ba95a27 ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 04m 58s |
This reworks custom-bundle.Dockerfile so that it involves less stages and can support 2 distinct steps: sync time and build time. This will more cleanly align to our downstream build needs At sync time a bundle_extra_data directory is populated with ENV variables from all operators (required for webhooks). Additionally dataplane-operator CRDs are cached in this repo. At build time the custom-bundle.Dockerfile pulls from bundle_extra_data directly. The csv-merger is used at 'sync time' to extract ENV variables and again at 'build time' to merge those ENV variables along with the dataplane-operators into the combined openstack operator CSV. Jira: OSP-29916
dprince
force-pushed
the
bundle_extra_data
branch
from
eb35dd9 to
c22dc61
Compare
|
Build failed (check pipeline). Post https://review.rdoproject.org/zuul/buildset/34e905adda4d49eb9c17eeab44fbd5db ❌ openstack-k8s-operators-content-provider FAILURE in 12m 17s |
|
/test openstack-operator-build-deploy-kuttl |
|
recheck |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abays, dprince The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit 6657a6a
into
openstack-k8s-operators:main
This reworks custom-bundle.Dockerfile so that it involves less stages and can support 2 distinct steps: sync time and build time. This will more cleanly align to our downstream build needs
At sync time a bundle_extra_data directory is populated with ENV variables from all operators (required for webhooks). Additionally dataplane-operator CRDs are cached in this repo.
At build time the custom-bundle.Dockerfile pulls from bundle_extra_data directly.
The csv-merger is used at 'sync time' to extract ENV variables and again at 'build time' to merge those ENV variables along with the dataplane-operators into the combined openstack operator CSV.
Jira: OSP-29916