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

ztp: OCPBUGS-25820: Include SiteConfig error in SiteConfig Content #1818

Merged

Conversation

irinamihai
Copy link
Contributor

@irinamihai irinamihai commented Feb 9, 2024

Description:

  • When there is an error in SiteConfig, add the error as a field in the SiteConfig that's printed out.
    Example:
apiVersion: ran.openshift.io/v1
kind: SiteConfig
metadata:
    labels:
        app.kubernetes.io/instance: clusters
    name: mgmt-spoke1
    namespace: mgmt-spoke1
siteConfigError: >-Error: could not build the entire SiteConfig defined by/tmp/kust-plugin-config-2679372: stat custom-manifests/: no such file or directory spec: ...
  • Include a new parameter to the siteconfig-generator utility, stopOnError. When this field is set to true, the siteconfig-generator completely halts and does not continue if an error is detected. If the field is set to false, the siteconfig-generator prints the SiteConfig with the error included and then continues to processing the next SiteConfig file. stopOnError defaults to false.

Description:
- When there is an error in SiteConfig, add the error as a field
  in the SiteConfig that's printed out.
- Include a new parameter to the siteconfig-generator utility,
  stopOnError. When this field is set to true, the siteconfig-generator
  completely halts and does not continue if an error is detected.
  If the field is set to false, the siteconfig-generator prints
  the SiteConfig with the error included and then continues to
  processing the next SiteConfig file. stopOnError defaults to false.
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 9, 2024
@openshift-ci-robot
Copy link
Collaborator

@irinamihai: This pull request references Jira Issue OCPBUGS-25820, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

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.

In response to this:

Description:

  • When there is an error in SiteConfig, add the error as a field in the SiteConfig that's printed out.
  • Include a new parameter to the siteconfig-generator utility, stopOnError. When this field is set to true, the siteconfig-generator completely halts and does not continue if an error is detected. If the field is set to false, the siteconfig-generator prints the SiteConfig with the error included and then continues to processing the next SiteConfig file. stopOnError defaults to false.

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.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Feb 9, 2024
@openshift-ci openshift-ci bot requested review from lack and serngawy February 9, 2024 21:02
@irinamihai
Copy link
Contributor Author

irinamihai commented Feb 9, 2024

/cc @sabbir-47 @imiller0 @lack

@irinamihai
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Collaborator

@irinamihai: An error was encountered querying GitHub for users with public email (yliu1@redhat.com) for bug OCPBUGS-25820 on the Jira server at https://issues.redhat.com/. No known errors were detected, please see the full error message for details.

Full error message. Post "http://ghproxy/graphql": dial tcp 172.30.229.2:80: connect: connection refused

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

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 openshift-eng/jira-lifecycle-plugin repository.

@sabbir-47
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 13, 2024
Copy link
Contributor

openshift-ci bot commented Feb 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: irinamihai, lack

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 Feb 14, 2024
@lack
Copy link
Member

lack commented Feb 14, 2024

/jira refresh

@openshift-ci-robot
Copy link
Collaborator

@lack: This pull request references Jira Issue OCPBUGS-25820, which is invalid:

  • expected the bug to target only the "4.16.0" version, but multiple target versions were set

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.

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 openshift-eng/jira-lifecycle-plugin repository.

@lack
Copy link
Member

lack commented Feb 14, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 14, 2024
@openshift-ci-robot
Copy link
Collaborator

@lack: This pull request references Jira Issue OCPBUGS-25820, which is valid.

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

Requesting review from QA contact:
/cc @yliu127

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link
Contributor

openshift-ci bot commented Feb 14, 2024

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: yliu127.

Note that only openshift-kni members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@lack: This pull request references Jira Issue OCPBUGS-25820, which is valid.

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

Requesting review from QA contact:
/cc @yliu127

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 openshift-eng/jira-lifecycle-plugin repository.

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-merge-bot openshift-merge-bot bot merged commit 818f748 into openshift-kni:master Feb 14, 2024
6 checks passed
@openshift-ci-robot
Copy link
Collaborator

@irinamihai: Jira Issue OCPBUGS-25820: All pull requests linked via external trackers have merged:

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

In response to this:

Description:

  • When there is an error in SiteConfig, add the error as a field in the SiteConfig that's printed out.
    Example:
apiVersion: ran.openshift.io/v1
kind: SiteConfig
metadata:
   labels:
       app.kubernetes.io/instance: clusters
   name: mgmt-spoke1
   namespace: mgmt-spoke1
siteConfigError: >-Error: could not build the entire SiteConfig defined by/tmp/kust-plugin-config-2679372: stat custom-manifests/: no such file or directory spec: ...
  • Include a new parameter to the siteconfig-generator utility, stopOnError. When this field is set to true, the siteconfig-generator completely halts and does not continue if an error is detected. If the field is set to false, the siteconfig-generator prints the SiteConfig with the error included and then continues to processing the next SiteConfig file. stopOnError defaults to false.

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.

@irinamihai
Copy link
Contributor Author

/cherry-pick release-4.15

@openshift-cherrypick-robot

@irinamihai: new pull request created: #1822

In response to this:

/cherry-pick release-4.15

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.

@irinamihai
Copy link
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@irinamihai: #1818 failed to apply on top of branch "release-4.14":

Applying: ztp: OCPBUGS-25820: Include SiteConfig error in SiteConfig Content
Using index info to reconstruct a base tree...
M	ztp/siteconfig-generator/siteConfig/siteConfigHelper.go
Falling back to patching base and 3-way merge...
Auto-merging ztp/siteconfig-generator/siteConfig/siteConfigHelper.go
CONFLICT (content): Merge conflict in ztp/siteconfig-generator/siteConfig/siteConfigHelper.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ztp: OCPBUGS-25820: Include SiteConfig error in SiteConfig Content
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.14

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. 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.

None yet

5 participants