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

NO-JIRA: Always recreate manifests #511

Merged

Conversation

stephenfin
Copy link
Contributor

  • hack: Address shellcheck issues
  • hack: Make HyperShift asset generation optional
  • hack: Always recreate manifests

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 30, 2024
@openshift-ci-robot
Copy link
Contributor

@stephenfin: This pull request explicitly references no jira issue.

In response to this:

  • hack: Address shellcheck issues
  • hack: Make HyperShift asset generation optional
  • hack: Always recreate manifests

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.

@stephenfin
Copy link
Contributor Author

Pulling this out of #510 to see if I can isolate why the CI is unhappy with this.

@jsafrane
Copy link
Contributor

@stephenfin please run make update to fix verify-kustomize-assets.

@stephenfin
Copy link
Contributor Author

stephenfin commented Sep 30, 2024

@stephenfin please run make update to fix verify-kustomize-assets.

That's the issue: I did, and things just work locally yet the job is not happy:

❯ git clean -xfd
Removing _output/
❯ make update && echo "done" || echo "failed"
Running `gofmt -s -l -w` on 40 file(s).
Using existing yq from "_output/tools/bin/yq-2.4.0"
Using existing yaml-patch from "_output/tools/bin/yaml-patch-v0.0.11"
( echo '# *** AUTOMATICALLY GENERATED FILE - DO NOT EDIT ***'; _output/tools/bin/yaml-patch-v0.0.11 -o './profile-patches/hypershift/06_operator_cr.yaml-patch' < '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/06_operator_cr.yaml' ) > '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/06_operator_cr-hypershift.yaml'
( echo '# *** AUTOMATICALLY GENERATED FILE - DO NOT EDIT ***'; _output/tools/bin/yaml-patch-v0.0.11 -o './profile-patches/hypershift/07_service_account.yaml-patch' < '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/07_service_account.yaml' ) > '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/07_service_account-hypershift.yaml'
( echo '# *** AUTOMATICALLY GENERATED FILE - DO NOT EDIT ***'; _output/tools/bin/yaml-patch-v0.0.11 -o './profile-patches/hypershift/08_operator_rbac.yaml-patch' < '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/08_operator_rbac.yaml' ) > '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/08_operator_rbac-hypershift.yaml'
( echo '# *** AUTOMATICALLY GENERATED FILE - DO NOT EDIT ***'; _output/tools/bin/yaml-patch-v0.0.11 -o './profile-patches/hypershift/10_deployment.yaml-patch' < '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/10_deployment.yaml' ) > '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/10_deployment-hypershift.yaml'
( echo '# *** AUTOMATICALLY GENERATED FILE - DO NOT EDIT ***'; _output/tools/bin/yaml-patch-v0.0.11 -o './profile-patches/hypershift/11_cluster_operator.yaml-patch' < '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/11_cluster_operator.yaml' ) > '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/11_cluster_operator-hypershift.yaml'
( echo '# *** AUTOMATICALLY GENERATED FILE - DO NOT EDIT ***'; _output/tools/bin/yaml-patch-v0.0.11 -o './profile-patches/ibm-cloud-managed/10_deployment.yaml-patch' < '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/10_deployment.yaml' ) > '/home/stephenfin/Development/shiftstack/cluster-storage-operator/manifests/10_deployment-ibm-cloud-managed.yaml'
./hack/generate-manifests.sh
done

Am I missing something obvious or is the job broken?

@jsafrane
Copy link
Contributor

The job is broken for a long time. I can see it reported the same oc: command not found, but ended up green from some reason.

I'm fixing it in openshift/release#57308

@stephenfin
Copy link
Contributor Author

stephenfin commented Sep 30, 2024

The job is broken for a long time. I can see it reported the same oc: command not found, but ended up green from some reason.

I'm fixing it in openshift/release#57308

Okay, cool. I had an alternative suggestion locally, namely using kustomize build instead of oc kustomize, that I've just pushed. wdyt about that approach instead?

Scrub that. That changes the update makefile target which isn't the thing that's failing.

@jsafrane
Copy link
Contributor

jsafrane commented Oct 1, 2024

/retest-required

@jsafrane
Copy link
Contributor

jsafrane commented Oct 1, 2024

/test verify-kustomize-assets

Copy link
Contributor

openshift-ci bot commented Oct 1, 2024

@stephenfin: The following test 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/e2e-gcp-manual-oidc 8fafb84 link false /test e2e-gcp-manual-oidc

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.

@jsafrane
Copy link
Contributor

jsafrane commented Oct 1, 2024

/retest-required
/lgtm
/approve
/label px-approved
/label docs-approved
/label qe-approved
Not user facing, no generated yaml file has changed.

@openshift-ci openshift-ci bot added px-approved Signifies that Product Support has signed off on this PR docs-approved Signifies that Docs has signed off on this PR qe-approved Signifies that QE has signed off on this PR labels Oct 1, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 1, 2024
Copy link
Contributor

openshift-ci bot commented Oct 1, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, stephenfin

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 1, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit a9bac4e into openshift:master Oct 1, 2024
18 of 19 checks passed
@stephenfin stephenfin deleted the always-recreate-manifests branch October 1, 2024 17:32
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. docs-approved Signifies that Docs has signed off on this PR 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. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants