OKD-226: Dockerfile.rhel7: Add ARG TAGS=ocp

[Prashanth684]

Allow this ARG to be overriden by builds so that OKD builds may have the correct branding by default. OKD/SCOS builds pass the build-arg TAGS=scos so pkg/controllers/configobservation/oauth/brand_okd.go which has //go:build !ocp will be built instead of pkg/controllers/configobservation/oauth/brand_ocp.go which has //go:build ocp. This change should not affect the OCP build of the operator image.

[openshift-ci-robot]

@Prashanth684: This pull request references OKD-226 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 bug to target the "4.18.0" version, but no target version was set.

In response to this:

Allow this ARG to be overriden by builds so that OKD builds may have the correct branding by default. OKD/SCOS builds pass the build-arg TAGS=scos so pkg/controllers/configobservation/oauth/brand_okd.go which has //go:build !ocp will be built instead of pkg/controllers/configobservation/oauth/brand_ocp.go which has //go:build ocp. This change should not affect the OCP build of the operator image.

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.

[ausil]

/lgtm

[Prashanth684]

/cc @deads2k

[Prashanth684]

/retest

[deads2k]

please add a comment to the dockerfile linking to a doc that lists valid values of TAGS. openshift/enhancement preferred.

And any other "standard" build-args.

[ausil]

AFAIK any value other than ocp means OKD

[Prashanth684]

@deads2k added a link to the enhancement PR. This is good for an approval now.

[Prashanth684]

/retest

[ausil]

/retest

[ausil]

/retest

[ausil]

/lgtm

[liouk]

/retest-required

[liouk]

/lgtm

[deads2k]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ausil, deads2k, liouk, Prashanth684

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:

• OWNERS [deads2k]

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

[Prashanth684]

/test e2e-agnostic

[openshift-ci]

@Prashanth684: 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.

[Prashanth684]

/cherry-pick release-4.17

[openshift-cherrypick-robot]

@Prashanth684: #687 failed to apply on top of branch "release-4.17":

Applying: OKD-226: Dockerfile.rhel7: Add ARG TAGS=ocp
Using index info to reconstruct a base tree...
M	Dockerfile.rhel7
Falling back to patching base and 3-way merge...
Auto-merging Dockerfile.rhel7
CONFLICT (content): Merge conflict in Dockerfile.rhel7
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OKD-226: Dockerfile.rhel7: Add ARG TAGS=ocp
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.17

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.

[openshift-bot]

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-authentication-operator
This PR has been included in build ose-cluster-authentication-operator-container-v4.18.0-202409262111.p0.ge56f20d.assembly.stream.el9.
All builds following this will include this PR.