Skip to content

AGENT-1326, MCO-1961: copy image-references for machine-config-controller bootstrap#10134

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
andfasano:add-image-references-for-mcc-bootstrap
Dec 2, 2025
Merged

AGENT-1326, MCO-1961: copy image-references for machine-config-controller bootstrap#10134
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
andfasano:add-image-references-for-mcc-bootstrap

Conversation

@andfasano
Copy link
Copy Markdown
Contributor

There are currently two different machine-config-controller controllers under work that are requiring to extract the image references data during the bootstrap (OSImageStream and InternalReleaseImage).
This patch copies the image-references file in the expected destination folder

cc @pablintino

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Nov 28, 2025

@andfasano: This pull request references AGENT-1326 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

This pull request references MCO-1961 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

There are currently two different machine-config-controller controllers under work that are requiring to extract the image references data during the bootstrap (OSImageStream and InternalReleaseImage).
This patch copies the image-references file in the expected destination folder

cc @pablintino

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 28, 2025
@openshift-ci openshift-ci Bot requested review from jhixson74 and sadasu November 28, 2025 18:30
@andfasano
Copy link
Copy Markdown
Contributor Author

Note (and just for the IRI controller): the current new version of openshift/machine-config-operator#5452 is not currently requiring this change, but in any case it could be potentially useful for the future.

@patrickdillon
Copy link
Copy Markdown
Contributor

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Dec 1, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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

The pull request process is described 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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 1, 2025
@andfasano
Copy link
Copy Markdown
Contributor Author

/test ?

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Dec 1, 2025

@andfasano: The following commands are available to trigger required jobs:

/test artifacts-images
/test e2e-agent-compact-ipv4
/test e2e-aws-ovn
/test e2e-aws-ovn-edge-zones-manifest-validation
/test e2e-aws-ovn-upi
/test e2e-azure-nat-gateway-single-zone
/test e2e-azure-ovn
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upi
/test e2e-metal-ipi-ovn-ipv6
/test e2e-openstack-ovn
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi
/test gofmt
/test golint
/test govet
/test images
/test integration-tests
/test integration-tests-nodejoiner
/test okd-scos-images
/test openstack-manifests
/test shellcheck
/test unit
/test verify-codegen
/test verify-deps
/test verify-vendor
/test yaml-lint

The following commands are available to trigger optional jobs:

/test aws-private
/test azure-ovn-marketplace-images
/test azure-private
/test e2e-agent-4control-ipv4
/test e2e-agent-5control-ipv4
/test e2e-agent-compact-ipv4-appliance-diskimage
/test e2e-agent-compact-ipv4-iso-no-registry
/test e2e-agent-compact-ipv4-none-platform
/test e2e-agent-compact-ipv6-minimaliso
/test e2e-agent-ha-dualstack
/test e2e-agent-sno-ipv4-pxe
/test e2e-agent-sno-ipv6
/test e2e-agent-two-node-fencing-ipv4
/test e2e-aws-byo-subnet-role-security-groups
/test e2e-aws-custom-dns-techpreview
/test e2e-aws-default-config
/test e2e-aws-overlay-mtu-ovn-1200
/test e2e-aws-ovn-custom-iam-profile
/test e2e-aws-ovn-edge-zones
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-heterogeneous
/test e2e-aws-ovn-imdsv2
/test e2e-aws-ovn-proxy
/test e2e-aws-ovn-public-ipv4-pool
/test e2e-aws-ovn-public-ipv4-pool-disabled
/test e2e-aws-ovn-public-subnets
/test e2e-aws-ovn-shared-vpc-custom-security-groups
/test e2e-aws-ovn-shared-vpc-edge-zones
/test e2e-aws-ovn-single-node
/test e2e-aws-ovn-techpreview
/test e2e-aws-ovn-upgrade
/test e2e-aws-upi-proxy
/test e2e-azure-custom-dns-techpreview
/test e2e-azure-default-config
/test e2e-azure-ovn-multidisk-techpreview
/test e2e-azure-ovn-resourcegroup
/test e2e-azure-ovn-shared-vpc
/test e2e-azure-ovn-techpreview
/test e2e-azure-ovn-upi
/test e2e-azurestack
/test e2e-azurestack-upi
/test e2e-crc
/test e2e-external-aws
/test e2e-external-aws-ccm
/test e2e-gcp-custom-dns
/test e2e-gcp-custom-endpoints
/test e2e-gcp-default-config
/test e2e-gcp-ovn-byo-vpc
/test e2e-gcp-ovn-heterogeneous
/test e2e-gcp-ovn-techpreview
/test e2e-gcp-ovn-xpn
/test e2e-gcp-secureboot
/test e2e-gcp-upgrade
/test e2e-gcp-upi-xpn
/test e2e-gcp-xpn-dedicated-dns-project
/test e2e-ibmcloud-ovn
/test e2e-metal-assisted
/test e2e-metal-ipi-ovn
/test e2e-metal-ipi-ovn-dualstack
/test e2e-metal-ipi-ovn-swapped-hosts
/test e2e-metal-ipi-ovn-virtualmedia
/test e2e-metal-ovn-two-node-arbiter
/test e2e-metal-ovn-two-node-fencing
/test e2e-metal-single-node-live-iso
/test e2e-nutanix-ovn
/test e2e-openstack-ccpmso
/test e2e-openstack-ccpmso-zone
/test e2e-openstack-dualstack
/test e2e-openstack-dualstack-upi
/test e2e-openstack-externallb
/test e2e-openstack-nfv-intel
/test e2e-openstack-proxy
/test e2e-openstack-singlestackv6
/test e2e-powervs-capi-ovn
/test e2e-vsphere-externallb-ovn
/test e2e-vsphere-host-groups-ovn-techpreview
/test e2e-vsphere-multi-vcenter-ovn
/test e2e-vsphere-ovn-disk-setup-techpreview
/test e2e-vsphere-ovn-hybrid-env
/test e2e-vsphere-ovn-multi-disk
/test e2e-vsphere-ovn-multi-network
/test e2e-vsphere-ovn-techpreview
/test e2e-vsphere-ovn-upi-zones
/test e2e-vsphere-ovn-zones
/test e2e-vsphere-ovn-zones-techpreview
/test e2e-vsphere-static-ovn
/test gcp-custom-endpoints-proxy-wif
/test gcp-private
/test okd-scos-e2e-aws-ovn
/test okd-scos-e2e-vsphere-ovn

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-installer-main-artifacts-images
pull-ci-openshift-installer-main-e2e-aws-ovn
pull-ci-openshift-installer-main-gofmt
pull-ci-openshift-installer-main-golint
pull-ci-openshift-installer-main-govet
pull-ci-openshift-installer-main-images
pull-ci-openshift-installer-main-okd-scos-e2e-vsphere-ovn
pull-ci-openshift-installer-main-okd-scos-images
pull-ci-openshift-installer-main-shellcheck
pull-ci-openshift-installer-main-unit
pull-ci-openshift-installer-main-verify-codegen
pull-ci-openshift-installer-main-verify-deps
pull-ci-openshift-installer-main-verify-vendor
pull-ci-openshift-installer-main-yaml-lint
Details

In response to this:

/test ?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@andfasano
Copy link
Copy Markdown
Contributor Author

/test e2e-agent-compact-ipv4
/test e2e-aws-ovn
/test e2e-azure-ovn
/test e2e-gcp-ovn
/test e2e-metal-ipi-ovn
/test e2e-vsphere-static-ovn

@ptalgulk01
Copy link
Copy Markdown

Pre-merge verification steps:

Environment Setup
OpenShift Version: 4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest
Platform: AWS

Manual installation

$ oc adm -a pull-secret.txt release extract --tools registry.build07.ci.openshift.org/ci-ln-lwgh7m2/release:latest
$ tar -xvf  openshift-install-linux-4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest.tar.gz
$ ./openshift-install create cluster
<provide the creds>
  • Get the bootstrap node and monitor the files present in /etc/mcc/bootstrap
$ ssh core@3.236.254.171
[root@ip-10-0-177-182 core]# ls /etc/mcc/bootstrap/ | grep -i image-ref
image-references
[root@ip-10-0-177-182 core]# head -15 /etc/mcc/bootstrap/image-references
  {
    "kind": "ImageStream",
    "apiVersion": "image.openshift.io/v1",
    "metadata": {
      "name": "4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest",
      "creationTimestamp": "2025-12-02T04:28:54Z",
      "annotations": {
        "release.openshift.io/from-image-stream": "ci-ln-lwgh7m2/stable"
      }
    },
    "spec": {
      "lookupPolicy": {
        "local": false
      },
  • Verify MCC is running
[root@ip-10-0-177-182 core]# crictl ps | grep machine-config
3ff9fbe2a18dc       65fdc9116500daafa33e6c5bb5697282bf88b8d3f0edf0357b81b1cf3f847ff9                                                                  15 minutes ago      Running             machine-config-server            0                   56782ed1c0b5e       bootstrap-machine-config-operator-ip-10-0-177-182    default
  • Check cluster is up
$ oc get clusterversions.config.openshift.io 
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest   True        False         5m41s   Cluster version is 4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest

$ oc get co machine-config
NAME             VERSION                                                AVAILABLE   PROGRESSING   DEGRADED   SINCE   MESSAGE
machine-config   4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest   True        False         False      29m   

/verified by @ptalgulk01
/label qe-approved

@openshift-ci openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label Dec 2, 2025
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Dec 2, 2025

@andfasano: This pull request references AGENT-1326 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

This pull request references MCO-1961 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

There are currently two different machine-config-controller controllers under work that are requiring to extract the image references data during the bootstrap (OSImageStream and InternalReleaseImage).
This patch copies the image-references file in the expected destination folder

cc @pablintino

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@ptalgulk01: This PR has been marked as verified by @ptalgulk01.

Details

In response to this:

Pre-merge verification steps:

Environment Setup
OpenShift Version: 4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest
Platform: AWS

Manual installation

$ oc adm -a pull-secret.txt release extract --tools registry.build07.ci.openshift.org/ci-ln-lwgh7m2/release:latest
$ tar -xvf  openshift-install-linux-4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest.tar.gz
$ ./openshift-install create cluster
<provide the creds>
  • Get the bootstrap node and monitor the files present in /etc/mcc/bootstrap
$ ssh core@3.236.254.171
[root@ip-10-0-177-182 core]# ls /etc/mcc/bootstrap/ | grep -i image-ref
image-references
[root@ip-10-0-177-182 core]# head -15 /etc/mcc/bootstrap/image-references
 {
   "kind": "ImageStream",
   "apiVersion": "image.openshift.io/v1",
   "metadata": {
     "name": "4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest",
     "creationTimestamp": "2025-12-02T04:28:54Z",
     "annotations": {
       "release.openshift.io/from-image-stream": "ci-ln-lwgh7m2/stable"
     }
   },
   "spec": {
     "lookupPolicy": {
       "local": false
     },
  • Verify MCC is running
[root@ip-10-0-177-182 core]# crictl ps | grep machine-config
3ff9fbe2a18dc       65fdc9116500daafa33e6c5bb5697282bf88b8d3f0edf0357b81b1cf3f847ff9                                                                  15 minutes ago      Running             machine-config-server            0                   56782ed1c0b5e       bootstrap-machine-config-operator-ip-10-0-177-182    default
  • Check cluster is up
$ oc get clusterversions.config.openshift.io 
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest   True        False         5m41s   Cluster version is 4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest

$ oc get co machine-config
NAME             VERSION                                                AVAILABLE   PROGRESSING   DEGRADED   SINCE   MESSAGE
machine-config   4.21.0-0-2025-12-02-042848-test-ci-ln-lwgh7m2-latest   True        False         False      29m   

/verified by @ptalgulk01
/label qe-approved

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 2, 2025
@pablintino
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Dec 2, 2025
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Dec 2, 2025

@andfasano: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-metal-ipi-ovn 7b3f1b4 link false /test e2e-metal-ipi-ovn

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot Bot merged commit 98521ad into openshift:main Dec 2, 2025
19 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants