Skip to content

Conversation

@bgilbert
Copy link
Contributor

@bgilbert bgilbert commented Jun 25, 2021

  • Update remaining Ignition spec 2.2.0 configs to 3.1.0
  • Drop obsolete or empty fields
  • Sort some sections into a more logical field order
  • Convert decimal file modes to octal
  • Drop media type from data URLs
  • Unquote file path
  • Consistently use overwrite: true in SCTP docs

cc @bobfuru @miabbott

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 25, 2021
@netlify
Copy link

netlify bot commented Jun 25, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 6b479c3

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/60dba98ab6a11100073b625f

😎 Browse the preview: https://deploy-preview-33957--osdocs.netlify.app

@bobfuru bobfuru added this to the Next Release milestone Jun 25, 2021
@bobfuru
Copy link
Contributor

bobfuru commented Jun 25, 2021

LGTM!

Copy link
Member

@miabbott miabbott left a comment

Choose a reason for hiding this comment

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

One nit, but otherwise LGTM

- Update remaining Ignition spec 2.2.0 configs to 3.1.0
- Drop obsolete or empty fields
- Sort some sections into a more logical field order
- Convert decimal file modes to octal
- Drop media type from data URLs
- Unquote file path
- Consistently use overwrite: true in SCTP docs
@bgilbert
Copy link
Contributor Author

Updated, including a few more small cleanups.

@bobfuru bobfuru merged commit 0caeb07 into openshift:master Jun 30, 2021
@bobfuru
Copy link
Contributor

bobfuru commented Jun 30, 2021

/cherrypick enterprise-4.8

@bobfuru
Copy link
Contributor

bobfuru commented Jun 30, 2021

/cherrypick enterprise-4.7

@bobfuru
Copy link
Contributor

bobfuru commented Jun 30, 2021

/cherrypick enterprise-4.6

@openshift-cherrypick-robot

@bobfuru: new pull request created: #34134

Details

In response to this:

/cherrypick enterprise-4.8

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

@bobfuru: #33957 failed to apply on top of branch "enterprise-4.7":

Applying: Update Ignition spec 2.2.0 configs; clean up some configs
Using index info to reconstruct a base tree...
M	modules/compliance-review.adoc
A	modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc deleted in HEAD and modified in Update Ignition spec 2.2.0 configs; clean up some configs. Version Update Ignition spec 2.2.0 configs; clean up some configs of modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc left in tree.
Auto-merging modules/compliance-review.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 Update Ignition spec 2.2.0 configs; clean up some configs
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".

Details

In response to this:

/cherrypick enterprise-4.7

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

@bobfuru: #33957 failed to apply on top of branch "enterprise-4.6":

Applying: Update Ignition spec 2.2.0 configs; clean up some configs
Using index info to reconstruct a base tree...
A	modules/cnf-installing-the-operators.adoc
M	modules/compliance-review.adoc
A	modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc
A	modules/networking-osp-enabling-metadata.adoc
A	modules/networking-osp-enabling-vfio-noiommu.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/networking-osp-enabling-vfio-noiommu.adoc deleted in HEAD and modified in Update Ignition spec 2.2.0 configs; clean up some configs. Version Update Ignition spec 2.2.0 configs; clean up some configs of modules/networking-osp-enabling-vfio-noiommu.adoc left in tree.
CONFLICT (modify/delete): modules/networking-osp-enabling-metadata.adoc deleted in HEAD and modified in Update Ignition spec 2.2.0 configs; clean up some configs. Version Update Ignition spec 2.2.0 configs; clean up some configs of modules/networking-osp-enabling-metadata.adoc left in tree.
CONFLICT (modify/delete): modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc deleted in HEAD and modified in Update Ignition spec 2.2.0 configs; clean up some configs. Version Update Ignition spec 2.2.0 configs; clean up some configs of modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc left in tree.
Auto-merging modules/compliance-review.adoc
CONFLICT (modify/delete): modules/cnf-installing-the-operators.adoc deleted in HEAD and modified in Update Ignition spec 2.2.0 configs; clean up some configs. Version Update Ignition spec 2.2.0 configs; clean up some configs of modules/cnf-installing-the-operators.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update Ignition spec 2.2.0 configs; clean up some configs
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".

Details

In response to this:

/cherrypick enterprise-4.6

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.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants