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

RHDEVDOCS-4861: Updated GitOps1.7 RN for an inaccuracy #55985

Merged
merged 1 commit into from
Feb 20, 2023

Conversation

shipsing
Copy link
Contributor

@shipsing shipsing commented Feb 16, 2023

Aligned team: Dev Tools

Purpose: To resolve the following issue:
https://issues.redhat.com/browse/RHDEVDOCS-4861

OCP version this PR applies to: enterprise 4.9 and later

Link to docs preview: https://55985--docspreview.netlify.app/openshift-enterprise/latest/cicd/gitops/gitops-release-notes.html#new-features-1-7-0_gitops-release-notes

Change Management
Need an ACK from Eng: @jaideepr97
Need an ACK from PM: @harrietgrace @wtam2018
Need an ACK from Product experience: @RickJWagner
Need an ACK from QE: @varshab1210
Need an ACK from DPM: @pmkovar
Need an ACK from CS: @Preeticp

Peer review: @Srivaralakshmi

@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 16, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 16, 2023

@shipsing: This pull request references RHDEVDOCS-4861 which is a valid jira issue.

In response to this:

NOTE: From GitOps 1.7.0 onwards, we will be documenting security issues in a new advisory format as part of errata updates.

Aligned team: Dev Tools

Purpose: To resolve the following issue:
https://issues.redhat.com/browse/RHDEVDOCS-4861

OCP version this PR applies to: enterprise 4.9 and later

Link to docs preview:

Change Management
Need an ACK from Eng:
Need an ACK from PM: @harrietgrace @wtam2018
Need an ACK from Product experience: @RickJWagner
Need an ACK from QE: @varshab1210
Need an ACK from DPM: @pmkovar
Need an ACK from CS: @Preeticp

Peer review:

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 openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 16, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 16, 2023

@shipsing: This pull request references RHDEVDOCS-4861 which is a valid jira issue.

In response to this:

NOTE: From GitOps 1.7.0 onwards, we will be documenting security issues in a new advisory format as part of errata updates.

Aligned team: Dev Tools

Purpose: To resolve the following issue:
https://issues.redhat.com/browse/RHDEVDOCS-4861

OCP version this PR applies to: enterprise 4.9 and later

Link to docs preview:

Change Management
Need an ACK from Eng: @jrao
Need an ACK from PM: @harrietgrace @wtam2018
Need an ACK from Product experience: @RickJWagner
Need an ACK from QE: @varshab1210
Need an ACK from DPM: @pmkovar
Need an ACK from CS: @Preeticp

Peer review:

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
Copy link

openshift-ci-robot commented Feb 16, 2023

@shipsing: This pull request references RHDEVDOCS-4861 which is a valid jira issue.

In response to this:

NOTE: From GitOps 1.7.0 onwards, we will be documenting security issues in a new advisory format as part of errata updates.

Aligned team: Dev Tools

Purpose: To resolve the following issue:
https://issues.redhat.com/browse/RHDEVDOCS-4861

OCP version this PR applies to: enterprise 4.9 and later

Link to docs preview:

Change Management
Need an ACK from Eng:
Need an ACK from PM: @harrietgrace @wtam2018
Need an ACK from Product experience: @RickJWagner
Need an ACK from QE: @varshab1210
Need an ACK from DPM: @pmkovar
Need an ACK from CS: @Preeticp

Peer review:

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
Copy link

openshift-ci-robot commented Feb 16, 2023

@shipsing: This pull request references RHDEVDOCS-4861 which is a valid jira issue.

In response to this:

NOTE: From GitOps 1.7.0 onwards, we will be documenting security issues in a new advisory format as part of errata updates.

Aligned team: Dev Tools

Purpose: To resolve the following issue:
https://issues.redhat.com/browse/RHDEVDOCS-4861

OCP version this PR applies to: enterprise 4.9 and later

Link to docs preview:

Change Management
Need an ACK from Eng: @jaideepr97
Need an ACK from PM: @harrietgrace @wtam2018
Need an ACK from Product experience: @RickJWagner
Need an ACK from QE: @varshab1210
Need an ACK from DPM: @pmkovar
Need an ACK from CS: @Preeticp

Peer review:

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.

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Feb 16, 2023

🤖 Updated build preview is available at:
https://55985--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/9160

@shipsing
Copy link
Contributor Author

@jaideepr97 @harrietgrace @wtam2018 @RickJWagner @varshab1210 @pmkovar @Preeticp, Could you please review this PR and share your feedback? Thanks

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 16, 2023

@shipsing: This pull request references RHDEVDOCS-4861 which is a valid jira issue.

In response to this:

Aligned team: Dev Tools

Purpose: To resolve the following issue:
https://issues.redhat.com/browse/RHDEVDOCS-4861

OCP version this PR applies to: enterprise 4.9 and later

Link to docs preview: https://55985--docspreview.netlify.app/openshift-enterprise/latest/cicd/gitops/gitops-release-notes.html#new-features-1-7-0_gitops-release-notes

Change Management
Need an ACK from Eng: @jaideepr97
Need an ACK from PM: @harrietgrace @wtam2018
Need an ACK from Product experience: @RickJWagner
Need an ACK from QE: @varshab1210
Need an ACK from DPM: @pmkovar
Need an ACK from CS: @Preeticp

Peer review:

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.

@jaideepr97
Copy link

LGTM thanks @shipsing

@varshab1210
Copy link

LGTM
Thanks!

@wtam2018
Copy link
Contributor

@ishitasequeira Please confirm the correction is correct It changes quite a bit from the original note.

@RickJWagner
Copy link

/label px-approved

@openshift-ci openshift-ci bot added the px-approved Signifies that Product Support has signed off on this PR label Feb 16, 2023
@ishitasequeira
Copy link

LGTM! Thanks!

@wtam2018
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 16, 2023
@harrietgrace
Copy link

Looks good!

@Preeticp
Copy link
Contributor

LGTM

Copy link
Member

@Srivaralakshmi Srivaralakshmi left a comment

Choose a reason for hiding this comment

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

@shipsing PTAL at the suggestions. Thanks!

modules/gitops-release-notes-1-7-0.adoc Outdated Show resolved Hide resolved
modules/gitops-release-notes-1-7-0.adoc Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 17, 2023
@shipsing
Copy link
Contributor Author

Thank you @Srivaralakshmi, incorporated your suggestions. Could you please verify and confirm?

@Srivaralakshmi
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 17, 2023
Copy link
Member

@Srivaralakshmi Srivaralakshmi left a comment

Choose a reason for hiding this comment

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

@shipsing Approved!

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 20, 2023

@shipsing: This pull request references RHDEVDOCS-4861 which is a valid jira issue.

In response to this:

Aligned team: Dev Tools

Purpose: To resolve the following issue:
https://issues.redhat.com/browse/RHDEVDOCS-4861

OCP version this PR applies to: enterprise 4.9 and later

Link to docs preview: https://55985--docspreview.netlify.app/openshift-enterprise/latest/cicd/gitops/gitops-release-notes.html#new-features-1-7-0_gitops-release-notes

Change Management
Need an ACK from Eng: @jaideepr97
Need an ACK from PM: @harrietgrace @wtam2018
Need an ACK from Product experience: @RickJWagner
Need an ACK from QE: @varshab1210
Need an ACK from DPM: @pmkovar
Need an ACK from CS: @Preeticp

Peer review: @Srivaralakshmi

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.

@bburt-rh bburt-rh added branch/enterprise-4.9 branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 peer-review-done Signifies that the peer review team has reviewed this PR dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs qe-approved Signifies that QE has signed off on this PR labels Feb 20, 2023
@bburt-rh bburt-rh added this to the Continuous Release milestone Feb 20, 2023
@bburt-rh bburt-rh merged commit e49f855 into openshift:main Feb 20, 2023
@bburt-rh
Copy link
Contributor

/cherrypick enterprise-4.9

@bburt-rh
Copy link
Contributor

/cherrypick enterprise-4.10

@bburt-rh
Copy link
Contributor

/cherrypick enterprise-4.11

@bburt-rh
Copy link
Contributor

/cherrypick enterprise-4.12

@bburt-rh
Copy link
Contributor

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@bburt-rh: new pull request created: #56124

In response to this:

/cherrypick enterprise-4.9

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-cherrypick-robot

@bburt-rh: #55985 failed to apply on top of branch "enterprise-4.10":

Applying: RHDEVDOCS-4861: Updated GitOps1.7 RN for an inaccuracy
.git/rebase-apply/patch:14: trailing whitespace.
* With this update, you can create applications, which are managed by the same control plane Argo CD instance, in any namespace in the same cluster. As an administrator, perform the following actions to enable this update: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/gitops-release-notes-1-7-0.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/gitops-release-notes-1-7-0.adoc
CONFLICT (content): Merge conflict in modules/gitops-release-notes-1-7-0.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 RHDEVDOCS-4861: Updated GitOps1.7 RN for an inaccuracy
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:

/cherrypick enterprise-4.10

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-cherrypick-robot

@bburt-rh: new pull request created: #56125

In response to this:

/cherrypick enterprise-4.11

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-cherrypick-robot

@bburt-rh: new pull request created: #56126

In response to this:

/cherrypick enterprise-4.12

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-cherrypick-robot

@bburt-rh: new pull request created: #56127

In response to this:

/cherrypick enterprise-4.13

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
branch/enterprise-4.9 branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs 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. peer-review-done Signifies that the peer review team has reviewed this PR px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet