Skip to content

[OSPCIX-638] Add call to 'make bindata' in operator-build for meta operator#2671

Closed
dprince wants to merge 1 commit intoopenstack-k8s-operators:mainfrom
dprince:make_bindata
Closed

[OSPCIX-638] Add call to 'make bindata' in operator-build for meta operator#2671
dprince wants to merge 1 commit intoopenstack-k8s-operators:mainfrom
dprince:make_bindata

Conversation

@dprince
Copy link
Copy Markdown
Contributor

@dprince dprince commented Jan 20, 2025

No description provided.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Jan 20, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign lewisdenny for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@abays abays changed the title Add call to 'make bindata' in operator-build for meta operator [OSPCIX-638] Add call to 'make bindata' in operator-build for meta operator Jan 20, 2025
Comment on lines +127 to +136
- name: "{{ operator.name }} - Call bindata" # noqa: name[template]
when:
- cifmw_operator_build_meta_build
- operator.name == cifmw_operator_build_meta_name
ci_script:
dry_run: "{{ cifmw_operator_build_dryrun|bool }}"
chdir: "{{ operator.src }}"
output_dir: "{{ cifmw_operator_build_basedir }}/artifacts"
script: make bindata

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we use pin-bundle-images.sh in make bindata. So in order to update the proper operator env variable, we need to pass other params, we pass in the make bundle.
We can modify this code like this:

Suggested change
- name: "{{ operator.name }} - Call bindata" # noqa: name[template]
when:
- cifmw_operator_build_meta_build
- operator.name == cifmw_operator_build_meta_name
ci_script:
dry_run: "{{ cifmw_operator_build_dryrun|bool }}"
chdir: "{{ operator.src }}"
output_dir: "{{ cifmw_operator_build_basedir }}/artifacts"
script: make bindata
- name: "{{ operator.name }} - Call bindata" # noqa: name[template]
when:
- cifmw_operator_build_meta_build
- operator.name == cifmw_operator_build_meta_name
ci_script:
dry_run: "{{ cifmw_operator_build_dryrun|bool }}"
chdir: "{{ operator.src }}"
output_dir: "{{ cifmw_operator_build_basedir }}/artifacts"
script: make bindata
extra_args:
IMG: "{{ operator_img }}"
IMAGENAMESPACE: "{{ cifmw_operator_build_push_org }}"
IMAGEREGISTRY: "{{ cifmw_operator_build_push_registry }}"
IMAGEBASE: "{{ operator.image_base | default('') }}"
LOCAL_REGISTRY: "{{ cifmw_operator_build_local_registry | default (0) }}"

I have already tested the same code here: #2672 with depends on on this pr openstack-k8s-operators/ironic-operator#510 and results

Controlled By:  ReplicaSet/ironic-operator-controller-manager-5c7847b8f4
Containers:
  manager:
    Container ID:  cri-o://397e36d59c9d180cd92358d0574a4911ce33cdf514d841b80934fe44e501d2ba
    Image:         38.102.83.177:5001/openstack-k8s-operators/ironic-operator:484955dc3ef2fdc2dcff640b3ff6182b38d8d772
    Image ID:      38.102.83.177:5001/openstack-k8s-operators/ironic-operator@sha256:c1bad99902b624fb749b5fe91fec1d7734a7c364fc835e430cbf317cb57c1374
    Port:          <none>

@hjensas
Copy link
Copy Markdown
Contributor

hjensas commented Jan 31, 2025

Closing, issue was fixed in another PR: #2672 which has merged.

@hjensas hjensas closed this Jan 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants