OCPBUGS-46412: Separate CPO containerfiles #5285
Conversation
openshift-ci-robot
added
jira/valid-reference
|
@celebdor: This pull request references Jira Issue OCPBUGS-44326, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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
bot
added
area/ci-tooling
|
/jira cherrypick OCPBUGS-46394 |
|
@celebdor: Jira Issue OCPBUGS-46394 has been cloned as Jira Issue OCPBUGS-46412. Will retitle bug to link to clone. In response to this:
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
bot
changed the title
|
@celebdor: This pull request references Jira Issue OCPBUGS-46412, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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. |
|
/retitle OCPBUGS-46412: Separate CPO containerfiles |
openshift-ci
bot
changed the title
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: bryan-cox, celebdor 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-ci
bot
added
the
approved
ART machinery checks that the FROM images are consistent in the release
payload. Since the Control Plane Operator does go in the release
payload, the work I did to have the FROM image references be
parametrized for Konflux, trips it up.
This PR separates the container files into:
- Containerfile.control-plane: For Konflux, using RH catalog/brew
- Dockerfile.control-plane: For ART/release-payload
To help developers avoid the situation where one changes one but not the
other, this commit adds a git pre-commit hook that enforces the only
differences to be in the "^FROM" lines.
In order to install this pre-commit hook, one can run:
pipx install pre-commit
pre-commit install
Then, any new commit that the developer attempts will have to conform to
the new hook (and a couple more I added like no whitespace at the end).
Signed-off-by: Antoni Segura Puimedon <[email protected]>
celebdor
force-pushed
the
OCPUBGS-44326-4.17
branch
from
ec3faea to
b26589d
Compare
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@celebdor: This pull request references Jira Issue OCPBUGS-46412, which is valid. The bug has been moved to the POST state. 7 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request. The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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. |
|
/retest |
1 similar comment
|
/retest |
| @@ -0,0 +1,27 @@ | |||
| FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 AS builder | |||
There was a problem hiding this comment.
I think we move from 1.22 to 1.23 recently.
There was a problem hiding this comment.
This is for 4.17. We were still on 1.22
| ARG BASE_IMAGE=registry.ci.openshift.org/ocp/4.18:base-rhel9 | ||
|
|
||
| FROM ${EL9_BUILD_IMAGE} AS builder | ||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder |
| ARG BASE_IMAGE=registry.ci.openshift.org/ocp/4.18:base-rhel9 | ||
|
|
||
| FROM ${EL9_BUILD_IMAGE} AS builder | ||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder |
There was a problem hiding this comment.
It should be 4.17? or 4.18?
Also the version for 1.23 on Golang side
There was a problem hiding this comment.
This is for 4.17. We were still on 1.22
|
/lgtm |
|
/lgtm |
|
@celebdor: all tests passed! Full PR test history. Your PR dashboard. 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. |
|
/retest-required |
1 similar comment
|
/retest-required |
What this PR does / why we need it:
ART machinery checks that the FROM images are consistent in the release payload. Since the Control Plane Operator does go in the release payload, the work I did to have the FROM image references be parametrized for Konflux, trips it up.
This PR separates the container files into:
To help developers avoid the situation where one changes one but not the other, this commit adds a git pre-commit hook that enforces the only differences to be in the "^FROM" lines.
In order to install this pre-commit hook, one can run:
Then, any new commit that the developer attempts will have to conform to the new hook (and a couple more I added like no whitespace at the end).
Which issue(s) this PR fixes (optional, use
fixes #<issue_number>(, fixes #<issue_number>, ...)format, where issue_number might be a GitHub issue, or a Jira story:Fixes #
Checklist