Skip to content
This repository has been archived by the owner on Dec 1, 2022. It is now read-only.

[RELEASE-1.4] Inject images, generate manifests #1169

Merged
merged 2 commits into from
Jul 13, 2022

Conversation

skonto
Copy link

@skonto skonto commented Jul 12, 2022

Cherry-pick with modifications of #1150.
We need this so that make generated-files at the S-O works as expected for 1.25 (coming next).
Also uses image injection. Will do one for 1.5 too.
Blocks openshift-knative/serverless-operator#1642 as we are moving to 1.25 after the cut.

@skonto skonto requested a review from nak3 July 12, 2022 17:33
@skonto skonto changed the title inject images, generate manifests [RELEASE-1.4] Inject images, generate manifests Jul 12, 2022
@openshift-ci openshift-ci bot requested a review from rhuss July 12, 2022 17:37
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 12, 2022
@skonto
Copy link
Author

skonto commented Jul 12, 2022

/retest

@skonto
Copy link
Author

skonto commented Jul 12, 2022

Pulling image quay.io/operator-framework/opm:latest ...
time="2022-07-12T21:14:54Z" level=info msg="Image operating system mismatch: image uses OS \"linux\"+architecture \"arm64\", expecting one of \"linux+amd64\""

Seems an image issue.. Image was updated 5h ago. Some jobs finished before the change.

$ docker inspect quay.io/operator-framework/opm:latest
[
    {
        "Id": "sha256:8b9ae2680dad80bc049184257e4bca091bc6b231ba41e462c22a11a8c36e0717",
        "RepoTags": [
            "quay.io/operator-framework/opm:latest"
        ],
        "RepoDigests": [
            "quay.io/operator-framework/opm@sha256:36ec416ae930318f087668b2b9696b3fdae1cf818cbb605306ce2f9431086ee9"
        ],
        "Parent": "",
        "Comment": "buildkit.dockerfile.v0",
        "Created": "2022-07-04T13:58:01.150325787Z",
...
        "Architecture": "arm64",
        "Os": "linux",

In jobs we use amd64.

@nak3
Copy link

nak3 commented Jul 13, 2022

/lgtm
Ah, this is a cherry-pick for #1150 😅

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 13, 2022
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 2 against base HEAD a7bbf63 and 8 for PR HEAD 5b8af06 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 1 against base HEAD a7bbf63 and 7 for PR HEAD 5b8af06 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD a7bbf63 and 6 for PR HEAD 5b8af06 in total

@nak3
Copy link

nak3 commented Jul 13, 2022

/lgtm cancel

The CI keeps running. We should run it after openshift-knative/serverless-operator#1644 was solved.

@nak3 nak3 removed the lgtm Indicates that a PR is ready to be merged. label Jul 13, 2022
@skonto
Copy link
Author

skonto commented Jul 13, 2022

/retest

@openshift-ci
Copy link

openshift-ci bot commented Jul 13, 2022

@skonto: 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/test-infra repository. I understand the commands that are listed here.

@nak3
Copy link

nak3 commented Jul 13, 2022

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Jul 13, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nak3, skonto

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 13, 2022
@openshift-ci openshift-ci bot merged commit 6f80f86 into openshift:release-v1.4 Jul 13, 2022
openshift-merge-robot pushed a commit that referenced this pull request Jul 27, 2022
* [RELEASE-1.4] Inject images, generate manifests (#1169)

* inject images, generate manifests (#1150)

* Revert temoprary branch for image injection (#1159)

Co-authored-by: Kenjiro Nakayama <[email protected]>

* fixes for 1.5

* Kourier image injection (#1173)

* Revert temoprary branch for image injection (#1186)

Co-authored-by: Kenjiro Nakayama <[email protected]>
openshift-merge-robot pushed a commit that referenced this pull request Aug 1, 2022
* [RELEASE-1.4] Inject images, generate manifests (#1169)

* inject images, generate manifests (#1150)

* Revert temoprary branch for image injection (#1159)

Co-authored-by: Kenjiro Nakayama <[email protected]>

* fixes for 1.6

* Kourier image injection (#1173)

* Revert temoprary branch for image injection (#1186)

Co-authored-by: Kenjiro Nakayama <[email protected]>
openshift-merge-robot pushed a commit that referenced this pull request Aug 2, 2022
* [RELEASE-1.4] Inject images, generate manifests (#1169)

* inject images, generate manifests (#1150)

* Revert temoprary branch for image injection (#1159)

Co-authored-by: Kenjiro Nakayama <[email protected]>

* fixes for main

* Kourier image injection (#1173)

* Revert temoprary branch for image injection (#1186)

* add pdb fix

* Revert "add pdb fix"

This reverts commit 1790632.

Co-authored-by: Kenjiro Nakayama <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants