OCPBUGS-5999: 4.12 - remove goutils from dependency tree #3496

cheesesashimi · 2023-01-18T16:45:10Z

- What I did

Analyzed the MCO to understand where goutils was being introduced as a dependency. I discovered that it was introduced via the sprig template helper library. We only make use of two functions within that library (which do not depend on goutils). This enabled me to do the following:

Copy those funcs we use into our codebase.
Consolidate the use of those funcs into a single place. Further consolidation is possible, but outside the scope of this PR.
Wrote smoke test to validate that all templated manifests can be rendered and then decoded into the appropriate structs.
Removed sprig, goutils, and its dependent libraries from our vendor folder and go.mod / go.sum files.

Note to reviewer: I put the dependency removal in a commit by itself for easier review. This is manual cherry-pick of #3480.

- How to verify it

Run the unit test suite

- Description for the changelog
Remove goutils from our dependency tree

openshift-ci · 2023-01-18T16:45:13Z

@cheesesashimi: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

remove goutils

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 · 2023-01-18T16:45:15Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

openshift-ci-robot · 2023-01-18T16:47:41Z

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5999, which is invalid:

expected the bug to target the "4.12.z" version, but it targets "4.12.0" instead
expected Jira Issue OCPBUGS-5999 to depend on a bug targeting a version in 4.13.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

In response to this:

(grab text from 4.13 PR)

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 · 2023-01-18T16:47:42Z

@cheesesashimi: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

OCPBUGS-5999: remove goutils from dependency tree

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 · 2023-01-18T16:47:54Z

@cheesesashimi: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

OCPBUGS-5999: remove goutils from dependency tree

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 · 2023-01-18T16:47:54Z

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5999, which is invalid:

expected the bug to target the "4.12.z" version, but it targets "4.12.0" instead
expected Jira Issue OCPBUGS-5999 to depend on a bug targeting a version in 4.13.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

- What I did

Analyzed the MCO to understand where goutils was being introduced as a dependency. I discovered that it was introduced via the sprig template helper library. We only make use of two functions within that library (which do not depend on goutils). This enabled me to do the following:

Copy those funcs we use into our codebase.

Consolidate the use of those funcs into a single place. Further consolidation is possible, but outside the scope of this PR.

Wrote smoke test to validate that all templated manifests can be rendered and then decoded into the appropriate structs.

Removed sprig, goutils, and its dependent libraries from our vendor folder and go.mod / go.sum files.

Note to reviewer: I put the dependency removal in a commit by itself for easier review.

- How to verify it

Run the unit test suite

- Description for the changelog
Remove goutils from our dependency tree

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 · 2023-01-18T16:48:31Z

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5999, which is invalid:

expected Jira Issue OCPBUGS-5999 to depend on a bug targeting a version in 4.13.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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 · 2023-01-18T16:49:46Z

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5999, which is invalid:

expected Jira Issue OCPBUGS-5999 to depend on a bug targeting a version in 4.13.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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 · 2023-01-18T16:50:54Z

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5999, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.12.z) matches configured target version for branch (4.12.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-5696 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
dependent Jira Issue OCPBUGS-5696 targets the "4.13.0" version, which is one of the valid target versions: 4.13.0
bug has dependents

Requesting review from QA contact:
/cc @rioliu-rh

Details

In response to this:

/jira refresh

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 · 2023-01-18T17:33:32Z

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5999, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.12.z) matches configured target version for branch (4.12.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-5696 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
dependent Jira Issue OCPBUGS-5696 targets the "4.13.0" version, which is one of the valid target versions: 4.13.0
bug has dependents

Requesting review from QA contact:
/cc @rioliu-rh

Details

In response to this:

/jira refresh

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 · 2023-01-18T17:44:28Z

@cheesesashimi: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Retaining the bugzilla/valid-bug label as it was manually added.

Details

In response to this:

OCPBUGS-5999: 4.12 - remove goutils from dependency tree

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 · 2023-01-18T18:22:08Z

@cheesesashimi: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Retaining the bugzilla/valid-bug label as it was manually added.

Details

In response to this:

OCPBUGS-5999: 4.12 - remove goutils from dependency tree

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 · 2023-01-18T18:22:08Z

@cheesesashimi: This pull request references Jira Issue OCPBUGS-5999, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.12.z) matches configured target version for branch (4.12.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-5696 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
dependent Jira Issue OCPBUGS-5696 targets the "4.13.0" version, which is one of the valid target versions: 4.13.0
bug has dependents

Requesting review from QA contact:
/cc @rioliu-rh

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

Details

In response to this:

- What I did

Analyzed the MCO to understand where goutils was being introduced as a dependency. I discovered that it was introduced via the sprig template helper library. We only make use of two functions within that library (which do not depend on goutils). This enabled me to do the following:

Copy those funcs we use into our codebase.

Consolidate the use of those funcs into a single place. Further consolidation is possible, but outside the scope of this PR.

Wrote smoke test to validate that all templated manifests can be rendered and then decoded into the appropriate structs.

Removed sprig, goutils, and its dependent libraries from our vendor folder and go.mod / go.sum files.

Note to reviewer: I put the dependency removal in a commit by itself for easier review. This is manual cherry-pick of #3480.

- How to verify it

Run the unit test suite

- Description for the changelog
Remove goutils from our dependency tree

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 · 2023-01-18T19:26:39Z

@cheesesashimi: 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	`8459724`	link	false	`/test okd-scos-e2e-gcp-ovn-upgrade`
ci/prow/okd-scos-e2e-vsphere-ovn	`8459724`	link	false	`/test okd-scos-e2e-vsphere-ovn`
ci/prow/okd-scos-e2e-aws-ovn	`8459724`	link	false	`/test okd-scos-e2e-aws-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/test-infra repository. I understand the commands that are listed here.

yuqi-zhang

lgtm, seems like a clean cherry-pick, I couldn't quite tell if there was a diff between this and the 4.13 PR, but if there was any, likely doesn't affect anything

sinnykumari · 2023-01-19T10:52:13Z

/lgtm
/approve
/label backport-risk-assessed

openshift-ci · 2023-01-19T10:52:41Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

~~OWNERS~~ [cheesesashimi,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

cheesesashimi · 2023-01-19T14:08:24Z

lgtm, seems like a clean cherry-pick, I couldn't quite tell if there was a diff between this and the 4.13 PR, but if there was any, likely doesn't affect anything

Most of the merge conflict for this branch was happening in the go.sum file. It was easier to cherry-pick the code changes then run $ go mod tidy && go mod vendor to fix things.

sergiordlr · 2023-01-24T10:03:24Z

Verified that there was no reference to goutils in the repository and run test case "[sig-mco] MCO Author:mhanss-Longduration-NonPreRelease-Critical-42438-add journald systemd config [Disruptive] [Serial]" as a sanity check.

We add the qe-approve label

/label qe-approved

yuqi-zhang · 2023-01-26T00:49:41Z

@sergiordlr since this is 4.12, can you see if you can apply the cherry-pick approved label?

openshift-cherrypick-robot · 2023-01-26T12:41:18Z

@sergiordlr: once the present PR merges, I will cherry-pick it on top of approved in a new PR and assign it to you.

Details

In response to this:

/cherry-pick 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 kubernetes/test-infra repository.

sergiordlr · 2023-01-26T12:46:59Z

@sergiordlr since this is 4.12, can you see if you can apply the cherry-pick approved label?

/label cherry-pick-approved

openshift-ci-robot · 2023-01-26T15:36:54Z

@cheesesashimi: All pull requests linked via external trackers have merged:

openshift/machine-config-operator#3496

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

Details

In response to this:

- What I did

Analyzed the MCO to understand where goutils was being introduced as a dependency. I discovered that it was introduced via the sprig template helper library. We only make use of two functions within that library (which do not depend on goutils). This enabled me to do the following:

Copy those funcs we use into our codebase.

Consolidate the use of those funcs into a single place. Further consolidation is possible, but outside the scope of this PR.

Wrote smoke test to validate that all templated manifests can be rendered and then decoded into the appropriate structs.

Removed sprig, goutils, and its dependent libraries from our vendor folder and go.mod / go.sum files.

Note to reviewer: I put the dependency removal in a commit by itself for easier review. This is manual cherry-pick of #3480.

- How to verify it

Run the unit test suite

- Description for the changelog
Remove goutils from our dependency tree

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.

Last minute change in openshift#3496 resulted in the number being removed from the end of the `rhel-coros-8/9` image, it is now just simply in there as `rhel-coreos`, and as a result the regex that was scraping out the extensions images (because fcos/scos dont' ship them) no longer works. This adjusts the sed command in the Dockerfile so it matches again now that the number is missing, and the extensions are properly removed.

Last minute change in openshift#3496 resulted in the number being removed from the end of the `rhel-coros-8/9` image, it is now just simply in there as `rhel-coreos`, and as a result the regex that was scraping out the extensions images (because fcos/scos dont' ship them) no longer works. This adjusts the sed command in the Dockerfile so it matches again now that the number is missing, and the extensions are properly removed. (cherry picked from commit cb2958d)

cheesesashimi added 3 commits January 18, 2023 11:34

use common template rendering funcs

fc72e2e

adds smoke test for rendered assets

833f266

remove sprig / goutils / associated deps

8459724

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 18, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 18, 2023

cheesesashimi changed the title ~~remove goutils~~ OCPBUGS-5999: remove goutils from dependency tree Jan 18, 2023

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jan 18, 2023

openshift-ci bot requested a review from rioliu-rh January 18, 2023 16:50

cheesesashimi marked this pull request as ready for review January 18, 2023 16:51

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 18, 2023

openshift-ci bot requested review from jkyros and sinnykumari January 18, 2023 16:55

cheesesashimi changed the title ~~OCPBUGS-5999: remove goutils from dependency tree~~ OCPBUGS-5999: 4.12 - remove goutils from dependency tree Jan 18, 2023

openshift-ci bot requested a review from sergiordlr January 19, 2023 01:30

yuqi-zhang approved these changes Jan 19, 2023

View reviewed changes

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 19, 2023

openshift-ci bot assigned anuragthehatter, eurijon, mburman5, mhanss, rbbratta, reihl, rioliu-rh, sergiordlr, sunilcio and sinnykumari Jan 19, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 19, 2023

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jan 24, 2023

mburman5 removed their assignment Jan 26, 2023

openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 26, 2023

openshift-merge-robot merged commit e3dc943 into openshift:release-4.12 Jan 26, 2023

cgwalters mentioned this pull request Mar 10, 2023

COS-1926, MCO-116, OCPBUGS-8703, OCPBUGS-9951: rhel coreos 9 4.13 katamari #3604

Merged

cheesesashimi deleted the zzlotnik/remove-goutils-4.12 branch March 21, 2024 14:03

OCPBUGS-5999: 4.12 - remove goutils from dependency tree #3496

OCPBUGS-5999: 4.12 - remove goutils from dependency tree #3496

Uh oh!

Conversation

cheesesashimi commented Jan 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Jan 18, 2023

Uh oh!

openshift-ci bot commented Jan 18, 2023

Uh oh!

openshift-ci-robot commented Jan 18, 2023

Uh oh!

openshift-ci bot commented Jan 18, 2023

Uh oh!

openshift-ci bot commented Jan 18, 2023

Uh oh!

openshift-ci-robot commented Jan 18, 2023

Uh oh!

openshift-ci-robot commented Jan 18, 2023

Uh oh!

openshift-ci-robot commented Jan 18, 2023

Uh oh!

openshift-ci-robot commented Jan 18, 2023

Uh oh!

openshift-ci-robot commented Jan 18, 2023

Uh oh!

openshift-ci bot commented Jan 18, 2023

Uh oh!

openshift-ci bot commented Jan 18, 2023

Uh oh!

openshift-ci-robot commented Jan 18, 2023

Uh oh!

openshift-ci bot commented Jan 18, 2023

Uh oh!

yuqi-zhang left a comment

Choose a reason for hiding this comment

Uh oh!

sinnykumari commented Jan 19, 2023

Uh oh!

openshift-ci bot commented Jan 19, 2023

Uh oh!

cheesesashimi commented Jan 19, 2023

Uh oh!

sergiordlr commented Jan 24, 2023

Uh oh!

yuqi-zhang commented Jan 26, 2023

Uh oh!

openshift-cherrypick-robot commented Jan 26, 2023

Uh oh!

sergiordlr commented Jan 26, 2023

Uh oh!

openshift-ci-robot commented Jan 26, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

cheesesashimi commented Jan 18, 2023 •

edited

Loading