Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-13547: Use payload-version flag to set release version consistently across components #3701

Merged

Conversation

JoelSpeed
Copy link
Contributor

- What I did

Adds a --payload-version flag to all the components in this repo (MCC, MCS, MCO, MCD) so that they consistently populate the release version into version.ReleaseVersion. The payload version is already used in MCO in a couple of places via env vars, so this includes a backwards compatible env var pre-population, but the intention is to remove that shortly (once the installer populates the flag for the bootstrap) and then the only, and consistent way to set the release version within the MCO suite would be via the flag. In code/tests it can be set via setting version.ReleaseVersion.

This should make the usage consistent across the codebase ahead of introducing feature gate changes on top of this.

- How to verify it

Should be no functional changes, will want to check the various manifests are generated with the correct versions.

- Description for the changelog

Use consistent payload-version flag to load release version information.

N.B: 0.0.1-snapshot is a magic string that is replaced during the payload build process, so the install manifests for MCO should get the correct version when the payload is built.

@openshift-ci openshift-ci bot requested review from cgwalters and yuqi-zhang May 9, 2023 16:25
@JoelSpeed
Copy link
Contributor Author

Test failures are kinda weird, and looking at some other jobs, I'm wondering if there's a race here.
The machine-config-daemon render seems to rely on the machine-config-controller render, but the machine-config-controller render comes after the machine-config-daemon render. So because the MCD render failed (daemonset degraded because they can't find the rendered MC), this prevents us from ever creating the rendered MC.

Does anyone know why they are that way around?

Going to retest to get more data

/retest

@JoelSpeed JoelSpeed force-pushed the payload-version-flag branch from bcf716e to 0d5d9fd Compare May 10, 2023 15:33
@JoelSpeed JoelSpeed force-pushed the payload-version-flag branch from 0d5d9fd to 131bf03 Compare May 11, 2023 09:37
@JoelSpeed
Copy link
Contributor Author

I've successfully installed a cluster from this PR this morning, after some teething trouble, I think this is good to go.
The PR should be inert in terms of feature changes, since it's only adding a flag that is defaulting to the existing method, looking up via env var.

Copy link
Contributor

@sinnykumari sinnykumari left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 11, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 11, 2023

@JoelSpeed: The following tests 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/okd-scos-e2e-gcp-ovn-upgrade 131bf03 link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/e2e-alibabacloud-ovn 131bf03 link false /test e2e-alibabacloud-ovn

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.

@JoelSpeed JoelSpeed changed the title Use payload-version flag to set release version consistently across components OCPBUGS-13547: Use payload-version flag to set release version consistently across components May 11, 2023
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels May 11, 2023
@openshift-ci-robot
Copy link
Contributor

@JoelSpeed: This pull request references Jira Issue OCPBUGS-13547, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

- What I did

Adds a --payload-version flag to all the components in this repo (MCC, MCS, MCO, MCD) so that they consistently populate the release version into version.ReleaseVersion. The payload version is already used in MCO in a couple of places via env vars, so this includes a backwards compatible env var pre-population, but the intention is to remove that shortly (once the installer populates the flag for the bootstrap) and then the only, and consistent way to set the release version within the MCO suite would be via the flag. In code/tests it can be set via setting version.ReleaseVersion.

This should make the usage consistent across the codebase ahead of introducing feature gate changes on top of this.

- How to verify it

Should be no functional changes, will want to check the various manifests are generated with the correct versions.

- Description for the changelog

Use consistent payload-version flag to load release version information.

N.B: 0.0.1-snapshot is a magic string that is replaced during the payload build process, so the install manifests for MCO should get the correct version when the payload is built.

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.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 11, 2023
@openshift-ci openshift-ci bot requested a review from sunzhaohua2 May 11, 2023 15:36
Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

/lgtm

Thanks Joel!

/hold

For qe verification. Although I think this might be ok as-is since the env var overrides the new flag, so feel free to unhold if we feel that isn't needed

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 11, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 11, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed, sinnykumari, yuqi-zhang

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 [sinnykumari,yuqi-zhang]

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

@JoelSpeed
Copy link
Contributor Author

For qe verification. Although I think this might be ok as-is since the env var overrides the new flag, so feel free to unhold if we feel that isn't needed

I'm going to skip on this as this change should be inert, as you say, the change is still using the old env var for now and the rest of the changes are all contained in adding a new flag, which shouldn't need any additional validation other than x thing runs, which E2E has proven.

Will make sure E2E check on MCO when we do the end to end test with the installer bit as well and 3688

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 15, 2023
@openshift-merge-robot openshift-merge-robot merged commit 49f32d4 into openshift:master May 15, 2023
@openshift-ci-robot
Copy link
Contributor

@JoelSpeed: Jira Issue OCPBUGS-13547: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-13547 has not been moved to the MODIFIED state.

In response to this:

- What I did

Adds a --payload-version flag to all the components in this repo (MCC, MCS, MCO, MCD) so that they consistently populate the release version into version.ReleaseVersion. The payload version is already used in MCO in a couple of places via env vars, so this includes a backwards compatible env var pre-population, but the intention is to remove that shortly (once the installer populates the flag for the bootstrap) and then the only, and consistent way to set the release version within the MCO suite would be via the flag. In code/tests it can be set via setting version.ReleaseVersion.

This should make the usage consistent across the codebase ahead of introducing feature gate changes on top of this.

- How to verify it

Should be no functional changes, will want to check the various manifests are generated with the correct versions.

- Description for the changelog

Use consistent payload-version flag to load release version information.

N.B: 0.0.1-snapshot is a magic string that is replaced during the payload build process, so the install manifests for MCO should get the correct version when the payload is built.

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.

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants