Skip to content

Conversation

@lahinson
Copy link
Contributor

@lahinson lahinson commented Oct 28, 2025

Version(s): 4.14+

Issue: https://issues.redhat.com/browse/OSDOCS-16695

Link to docs preview:

QE review:
N/A for this PR

Additional information: This PR is part of the tiger team work to prepare content for migration to DITA.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 28, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 28, 2025

🤖 Wed Oct 29 16:47:37 - Prow CI generated the docs preview:
https://101242--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@lahinson lahinson force-pushed the osdocs-16995-add-content-types-f-i branch from b383ae5 to 84eec1f Compare October 28, 2025 18:48
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 28, 2025
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 28, 2025
@lahinson lahinson force-pushed the osdocs-16995-add-content-types-f-i branch from 84eec1f to 593e7ff Compare October 28, 2025 19:19
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 28, 2025
@lahinson lahinson force-pushed the osdocs-16995-add-content-types-f-i branch from 593e7ff to ac0c1f8 Compare October 28, 2025 19:22
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 28, 2025
@lahinson lahinson force-pushed the osdocs-16995-add-content-types-f-i branch from ac0c1f8 to 00b022d Compare October 29, 2025 14:56
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 29, 2025
@ShaunaDiaz ShaunaDiaz added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Oct 29, 2025
Copy link
Contributor

@ShaunaDiaz ShaunaDiaz left a comment

Choose a reason for hiding this comment

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

Just two real comments; #1 subjective and #2 out of scope.
LGTM!

//
// * security/file_integrity_operator/file-integrity-operator-understanding.adoc

:_mod-docs-content-type: CONCEPT
Copy link
Contributor

Choose a reason for hiding this comment

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

FWIW this looks like reference to me.

//
// * security/file_integrity_operator/file-integrity-operator-understanding.adoc

:_mod-docs-content-type: CONCEPT
Copy link
Contributor

Choose a reason for hiding this comment

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

I would probably call this Reference as well.

//
// * security/file_integrity_operator/file-integrity-operator-understanding.adoc

:_mod-docs-content-type: CONCEPT
Copy link
Contributor

Choose a reason for hiding this comment

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

I would probably call this Reference as well.

//
// * security/file_integrity_operator/file-integrity-operator-configuring.adoc

:_mod-docs-content-type: CONCEPT
Copy link
Contributor

Choose a reason for hiding this comment

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

According to https://github.com/redhat-documentation/modular-docs/blob/main/modular-docs-manual/files/TEMPLATE_CONCEPT_concept-explanation.adoc, there are not supposed to be gerunds in concept modules. Don't know if this is a DITA problem. Likely beyond the scope of this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right --there are not supposed to be gerunds in concept modules. You are also right that changing the title is beyond the scope of this PR.

//
// * installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc

:_mod-docs-content-type: CONCEPT
Copy link
Contributor

Choose a reason for hiding this comment

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

reference IMHO

@ShaunaDiaz ShaunaDiaz added ok-to-merge and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR labels Oct 29, 2025
@lahinson lahinson force-pushed the osdocs-16995-add-content-types-f-i branch from 00b022d to 46b859c Compare October 29, 2025 16:30
@openshift-ci
Copy link

openshift-ci bot commented Oct 29, 2025

@lahinson: all tests passed!

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.

@lahinson lahinson merged commit d0afe04 into openshift:main Oct 29, 2025
2 checks passed
@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.21

@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.20

@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.19

@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.18

@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.17

@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.16

@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.15

@openshift-cherrypick-robot

@lahinson: new pull request created: #101319

In response to this:

/cherrypick enterprise-4.21

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.

@lahinson
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@lahinson: new pull request created: #101320

In response to this:

/cherrypick enterprise-4.20

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.

@openshift-cherrypick-robot

@lahinson: new pull request created: #101321

In response to this:

/cherrypick enterprise-4.19

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.

@openshift-cherrypick-robot

@lahinson: new pull request created: #101322

In response to this:

/cherrypick enterprise-4.18

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.

@openshift-cherrypick-robot

@lahinson: new pull request created: #101323

In response to this:

/cherrypick enterprise-4.17

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.

@openshift-cherrypick-robot

@lahinson: #101242 failed to apply on top of branch "enterprise-4.16":

Applying: Adding content types to modules: F-I
Using index info to reconstruct a base tree...
M	modules/gcp-limits.adoc
M	modules/how-to-plan-your-environment-according-to-cluster-maximums.adoc
M	modules/identity-provider-oidc-supported.adoc
A	modules/images-configuration-parameters-hcp.adoc
M	modules/images-configuration-parameters.adoc
M	modules/images-using-imagestream-tags.adoc
M	modules/insights-operator-what-information-is-collected.adoc
M	modules/installation-arm-bootstrap.adoc
M	modules/installation-arm-control-plane.adoc
M	modules/installation-arm-dns.adoc
M	modules/installation-arm-image-storage.adoc
M	modules/installation-arm-vnet.adoc
M	modules/installation-arm-worker.adoc
M	modules/installation-aws-permissions.adoc
M	modules/installation-aws-regions-with-no-ami.adoc
M	modules/installation-aws-regions.adoc
M	modules/installation-aws-user-infra-rhcos-ami.adoc
M	modules/installation-azure-config-yaml.adoc
M	modules/installation-azure-regions.adoc
M	modules/installation-cloudformation-bootstrap.adoc
M	modules/installation-cloudformation-control-plane.adoc
M	modules/installation-cloudformation-dns.adoc
M	modules/installation-cloudformation-security.adoc
M	modules/installation-cloudformation-vpc.adoc
M	modules/installation-deployment-manager-bootstrap.adoc
M	modules/installation-deployment-manager-control-plane.adoc
M	modules/installation-deployment-manager-ext-lb.adoc
M	modules/installation-deployment-manager-firewall-rules.adoc
M	modules/installation-deployment-manager-iam-shared-vpc.adoc
M	modules/installation-deployment-manager-int-lb.adoc
M	modules/installation-deployment-manager-private-dns.adoc
M	modules/installation-deployment-manager-vpc.adoc
M	modules/installation-deployment-manager-worker.adoc
M	modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
M	modules/ipi-install-troubleshooting_unable-to-discover-new-bare-metal-hosts-using-the-bmc.adoc
M	modules/ipi-install-validation-checklist-for-installation.adoc
M	modules/ipi-install-validation-checklist-for-nodes.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ipi-install-validation-checklist-for-nodes.adoc
Auto-merging modules/ipi-install-validation-checklist-for-installation.adoc
Auto-merging modules/ipi-install-troubleshooting_unable-to-discover-new-bare-metal-hosts-using-the-bmc.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
Auto-merging modules/installation-deployment-manager-worker.adoc
Auto-merging modules/installation-deployment-manager-vpc.adoc
Auto-merging modules/installation-deployment-manager-private-dns.adoc
Auto-merging modules/installation-deployment-manager-int-lb.adoc
Auto-merging modules/installation-deployment-manager-iam-shared-vpc.adoc
Auto-merging modules/installation-deployment-manager-firewall-rules.adoc
Auto-merging modules/installation-deployment-manager-ext-lb.adoc
Auto-merging modules/installation-deployment-manager-control-plane.adoc
Auto-merging modules/installation-deployment-manager-bootstrap.adoc
Auto-merging modules/installation-cloudformation-vpc.adoc
Auto-merging modules/installation-cloudformation-security.adoc
Auto-merging modules/installation-cloudformation-dns.adoc
Auto-merging modules/installation-cloudformation-control-plane.adoc
Auto-merging modules/installation-cloudformation-bootstrap.adoc
Auto-merging modules/installation-azure-regions.adoc
Auto-merging modules/installation-azure-config-yaml.adoc
Auto-merging modules/installation-aws-user-infra-rhcos-ami.adoc
Auto-merging modules/installation-aws-regions.adoc
Auto-merging modules/installation-aws-regions-with-no-ami.adoc
Auto-merging modules/installation-aws-permissions.adoc
Auto-merging modules/installation-arm-worker.adoc
Auto-merging modules/installation-arm-vnet.adoc
Auto-merging modules/installation-arm-image-storage.adoc
Auto-merging modules/installation-arm-dns.adoc
Auto-merging modules/installation-arm-control-plane.adoc
Auto-merging modules/installation-arm-bootstrap.adoc
Auto-merging modules/insights-operator-what-information-is-collected.adoc
Auto-merging modules/images-using-imagestream-tags.adoc
Auto-merging modules/images-configuration-parameters.adoc
CONFLICT (modify/delete): modules/images-configuration-parameters-hcp.adoc deleted in HEAD and modified in Adding content types to modules: F-I. Version Adding content types to modules: F-I of modules/images-configuration-parameters-hcp.adoc left in tree.
Auto-merging modules/identity-provider-oidc-supported.adoc
Auto-merging modules/how-to-plan-your-environment-according-to-cluster-maximums.adoc
Auto-merging modules/gcp-limits.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Adding content types to modules: F-I

In response to this:

/cherrypick enterprise-4.16

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.

@openshift-cherrypick-robot

@lahinson: #101242 failed to apply on top of branch "enterprise-4.15":

Applying: Adding content types to modules: F-I
Using index info to reconstruct a base tree...
M	modules/gcp-limits.adoc
M	modules/how-to-plan-your-environment-according-to-cluster-maximums.adoc
M	modules/identity-provider-oidc-supported.adoc
A	modules/images-configuration-parameters-hcp.adoc
M	modules/images-configuration-parameters.adoc
M	modules/images-using-imagestream-tags.adoc
M	modules/insights-operator-what-information-is-collected.adoc
M	modules/installation-arm-bootstrap.adoc
M	modules/installation-arm-control-plane.adoc
M	modules/installation-arm-dns.adoc
M	modules/installation-arm-image-storage.adoc
M	modules/installation-arm-vnet.adoc
M	modules/installation-arm-worker.adoc
M	modules/installation-aws-permissions.adoc
M	modules/installation-aws-regions-with-no-ami.adoc
M	modules/installation-aws-regions.adoc
M	modules/installation-aws-user-infra-rhcos-ami.adoc
M	modules/installation-azure-config-yaml.adoc
M	modules/installation-azure-regions.adoc
M	modules/installation-azure-stack-hub-config-yaml.adoc
M	modules/installation-cloudformation-bootstrap.adoc
M	modules/installation-cloudformation-control-plane.adoc
M	modules/installation-cloudformation-dns.adoc
M	modules/installation-cloudformation-security.adoc
M	modules/installation-cloudformation-vpc.adoc
M	modules/installation-deployment-manager-bootstrap.adoc
M	modules/installation-deployment-manager-control-plane.adoc
M	modules/installation-deployment-manager-ext-lb.adoc
M	modules/installation-deployment-manager-firewall-rules.adoc
M	modules/installation-deployment-manager-iam-shared-vpc.adoc
M	modules/installation-deployment-manager-int-lb.adoc
M	modules/installation-deployment-manager-private-dns.adoc
M	modules/installation-deployment-manager-vpc.adoc
M	modules/installation-deployment-manager-worker.adoc
M	modules/installation-gcp-config-yaml.adoc
M	modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc
M	modules/installation-user-infra-generate.adoc
M	modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
M	modules/ipi-install-troubleshooting_unable-to-discover-new-bare-metal-hosts-using-the-bmc.adoc
M	modules/ipi-install-validation-checklist-for-installation.adoc
M	modules/ipi-install-validation-checklist-for-nodes.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ipi-install-validation-checklist-for-nodes.adoc
Auto-merging modules/ipi-install-validation-checklist-for-installation.adoc
Auto-merging modules/ipi-install-troubleshooting_unable-to-discover-new-bare-metal-hosts-using-the-bmc.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
Auto-merging modules/installation-user-infra-generate.adoc
Auto-merging modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc
Auto-merging modules/installation-gcp-config-yaml.adoc
Auto-merging modules/installation-deployment-manager-worker.adoc
Auto-merging modules/installation-deployment-manager-vpc.adoc
Auto-merging modules/installation-deployment-manager-private-dns.adoc
Auto-merging modules/installation-deployment-manager-int-lb.adoc
Auto-merging modules/installation-deployment-manager-iam-shared-vpc.adoc
Auto-merging modules/installation-deployment-manager-firewall-rules.adoc
Auto-merging modules/installation-deployment-manager-ext-lb.adoc
Auto-merging modules/installation-deployment-manager-control-plane.adoc
Auto-merging modules/installation-deployment-manager-bootstrap.adoc
Auto-merging modules/installation-cloudformation-vpc.adoc
Auto-merging modules/installation-cloudformation-security.adoc
Auto-merging modules/installation-cloudformation-dns.adoc
Auto-merging modules/installation-cloudformation-control-plane.adoc
Auto-merging modules/installation-cloudformation-bootstrap.adoc
Auto-merging modules/installation-azure-stack-hub-config-yaml.adoc
Auto-merging modules/installation-azure-regions.adoc
Auto-merging modules/installation-azure-config-yaml.adoc
Auto-merging modules/installation-aws-user-infra-rhcos-ami.adoc
Auto-merging modules/installation-aws-regions.adoc
Auto-merging modules/installation-aws-regions-with-no-ami.adoc
Auto-merging modules/installation-aws-permissions.adoc
Auto-merging modules/installation-arm-worker.adoc
Auto-merging modules/installation-arm-vnet.adoc
Auto-merging modules/installation-arm-image-storage.adoc
Auto-merging modules/installation-arm-dns.adoc
Auto-merging modules/installation-arm-control-plane.adoc
Auto-merging modules/installation-arm-bootstrap.adoc
Auto-merging modules/insights-operator-what-information-is-collected.adoc
Auto-merging modules/images-using-imagestream-tags.adoc
Auto-merging modules/images-configuration-parameters.adoc
CONFLICT (modify/delete): modules/images-configuration-parameters-hcp.adoc deleted in HEAD and modified in Adding content types to modules: F-I. Version Adding content types to modules: F-I of modules/images-configuration-parameters-hcp.adoc left in tree.
Auto-merging modules/identity-provider-oidc-supported.adoc
Auto-merging modules/how-to-plan-your-environment-according-to-cluster-maximums.adoc
Auto-merging modules/gcp-limits.adoc
CONFLICT (content): Merge conflict in modules/gcp-limits.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Adding content types to modules: F-I

In response to this:

/cherrypick enterprise-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-sigs/prow repository.

@openshift-cherrypick-robot

@lahinson: #101242 failed to apply on top of branch "enterprise-4.14":

Applying: Adding content types to modules: F-I
Using index info to reconstruct a base tree...
M	modules/gcp-limits.adoc
M	modules/how-to-plan-your-environment-according-to-cluster-maximums.adoc
M	modules/identity-provider-oidc-supported.adoc
A	modules/images-configuration-parameters-hcp.adoc
M	modules/images-configuration-parameters.adoc
M	modules/images-using-imagestream-tags.adoc
M	modules/insights-operator-what-information-is-collected.adoc
M	modules/installation-arm-bootstrap.adoc
M	modules/installation-arm-control-plane.adoc
M	modules/installation-arm-dns.adoc
M	modules/installation-arm-image-storage.adoc
M	modules/installation-arm-vnet.adoc
M	modules/installation-arm-worker.adoc
M	modules/installation-aws-permissions.adoc
M	modules/installation-aws-regions-with-no-ami.adoc
M	modules/installation-aws-regions.adoc
M	modules/installation-aws-user-infra-rhcos-ami.adoc
M	modules/installation-azure-config-yaml.adoc
M	modules/installation-azure-regions.adoc
M	modules/installation-azure-stack-hub-config-yaml.adoc
M	modules/installation-cloudformation-bootstrap.adoc
M	modules/installation-cloudformation-control-plane.adoc
M	modules/installation-cloudformation-dns.adoc
M	modules/installation-cloudformation-security.adoc
M	modules/installation-cloudformation-vpc.adoc
M	modules/installation-deployment-manager-bootstrap.adoc
M	modules/installation-deployment-manager-control-plane.adoc
M	modules/installation-deployment-manager-ext-lb.adoc
M	modules/installation-deployment-manager-firewall-rules.adoc
M	modules/installation-deployment-manager-iam-shared-vpc.adoc
M	modules/installation-deployment-manager-int-lb.adoc
M	modules/installation-deployment-manager-private-dns.adoc
M	modules/installation-deployment-manager-vpc.adoc
M	modules/installation-deployment-manager-worker.adoc
M	modules/installation-gcp-config-yaml.adoc
M	modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc
M	modules/installation-osp-accessing-api-no-floating.adoc
M	modules/installation-osp-accessing-api.adoc
M	modules/installation-osp-api-octavia.adoc
M	modules/installation-osp-bootstrap-machine.adoc
M	modules/installation-osp-config-yaml.adoc
M	modules/installation-osp-control-compute-machines.adoc
M	modules/installation-osp-custom-subnet.adoc
M	modules/installation-osp-provider-network-preparation.adoc
M	modules/installation-osp-provider-networks.adoc
M	modules/installation-user-infra-generate.adoc
M	modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
M	modules/ipi-install-troubleshooting_unable-to-discover-new-bare-metal-hosts-using-the-bmc.adoc
M	modules/ipi-install-validation-checklist-for-installation.adoc
M	modules/ipi-install-validation-checklist-for-nodes.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ipi-install-validation-checklist-for-nodes.adoc
Auto-merging modules/ipi-install-validation-checklist-for-installation.adoc
Auto-merging modules/ipi-install-troubleshooting_unable-to-discover-new-bare-metal-hosts-using-the-bmc.adoc
Auto-merging modules/installation-user-infra-machines-advanced-customizing-iso-or-pxe.adoc
Auto-merging modules/installation-user-infra-generate.adoc
Auto-merging modules/installation-osp-provider-networks.adoc
Auto-merging modules/installation-osp-provider-network-preparation.adoc
Auto-merging modules/installation-osp-custom-subnet.adoc
Auto-merging modules/installation-osp-control-compute-machines.adoc
Auto-merging modules/installation-osp-config-yaml.adoc
Auto-merging modules/installation-osp-bootstrap-machine.adoc
Auto-merging modules/installation-osp-api-octavia.adoc
Auto-merging modules/installation-osp-accessing-api.adoc
Auto-merging modules/installation-osp-accessing-api-no-floating.adoc
Auto-merging modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc
Auto-merging modules/installation-gcp-config-yaml.adoc
Auto-merging modules/installation-deployment-manager-worker.adoc
Auto-merging modules/installation-deployment-manager-vpc.adoc
Auto-merging modules/installation-deployment-manager-private-dns.adoc
Auto-merging modules/installation-deployment-manager-int-lb.adoc
Auto-merging modules/installation-deployment-manager-iam-shared-vpc.adoc
Auto-merging modules/installation-deployment-manager-firewall-rules.adoc
Auto-merging modules/installation-deployment-manager-ext-lb.adoc
Auto-merging modules/installation-deployment-manager-control-plane.adoc
Auto-merging modules/installation-deployment-manager-bootstrap.adoc
Auto-merging modules/installation-cloudformation-vpc.adoc
Auto-merging modules/installation-cloudformation-security.adoc
Auto-merging modules/installation-cloudformation-dns.adoc
Auto-merging modules/installation-cloudformation-control-plane.adoc
Auto-merging modules/installation-cloudformation-bootstrap.adoc
Auto-merging modules/installation-azure-stack-hub-config-yaml.adoc
Auto-merging modules/installation-azure-regions.adoc
Auto-merging modules/installation-azure-config-yaml.adoc
Auto-merging modules/installation-aws-user-infra-rhcos-ami.adoc
Auto-merging modules/installation-aws-regions.adoc
Auto-merging modules/installation-aws-regions-with-no-ami.adoc
Auto-merging modules/installation-aws-permissions.adoc
Auto-merging modules/installation-arm-worker.adoc
Auto-merging modules/installation-arm-vnet.adoc
Auto-merging modules/installation-arm-image-storage.adoc
Auto-merging modules/installation-arm-dns.adoc
Auto-merging modules/installation-arm-control-plane.adoc
Auto-merging modules/installation-arm-bootstrap.adoc
Auto-merging modules/insights-operator-what-information-is-collected.adoc
Auto-merging modules/images-using-imagestream-tags.adoc
Auto-merging modules/images-configuration-parameters.adoc
CONFLICT (modify/delete): modules/images-configuration-parameters-hcp.adoc deleted in HEAD and modified in Adding content types to modules: F-I. Version Adding content types to modules: F-I of modules/images-configuration-parameters-hcp.adoc left in tree.
Auto-merging modules/identity-provider-oidc-supported.adoc
Auto-merging modules/how-to-plan-your-environment-according-to-cluster-maximums.adoc
Auto-merging modules/gcp-limits.adoc
CONFLICT (content): Merge conflict in modules/gcp-limits.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Adding content types to modules: F-I

In response to this:

/cherrypick enterprise-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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants