Skip to content

Conversation

@maxwelldb
Copy link
Contributor

@maxwelldb maxwelldb commented Oct 31, 2025

Version(s): 4.14+

Issue: OSDOCS-16694

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information: Tagging was done manually on a programmatically determined list of core modules. Modules that do not include a content type and do not have the following prefixes were included:
'/(about-gitops|argo-cd|go-|cluster-logging|log6x|es-|developer-cli-odo|sbo-|op-|monitoring-|serverless-|codeready-workspaces|kn-|knative-|odc-|ossm-|distr-tracing-|cco-dashboard|dedicated|rosa|sd-|osd-|configuring-a-proxy-|sd-hcp-|ibi-|rdma-|cnf-|eco-|kmm-|ptp-|psap-|telco-|ztp-|oadp-)'

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 31, 2025

🤖 Sat Nov 01 01:25:50 - Prow CI generated the docs preview:
https://101515--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@maxwelldb maxwelldb force-pushed the add-types-ae-osdocs16694 branch from aec2cbd to 57d04e7 Compare November 1, 2025 01:09
@openshift-ci
Copy link

openshift-ci bot commented Nov 1, 2025

@maxwelldb: 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.

@xenolinux xenolinux 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 Nov 3, 2025
Copy link
Contributor

@xenolinux xenolinux left a comment

Choose a reason for hiding this comment

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

LGTM

@xenolinux xenolinux removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Nov 3, 2025
@xenolinux xenolinux merged commit f4e619b into openshift:main Nov 3, 2025
2 checks passed
@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.12

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@xenolinux: #101515 failed to apply on top of branch "enterprise-4.12":

Applying: add content types to untagged modules OSDOCS-16694
Using index info to reconstruct a base tree...
M	modules/admission-plug-ins-default.adoc
M	modules/admission-webhooks-about.adoc
M	modules/alternatives-to-storing-admin-secrets-in-kube-system.adoc
M	modules/api-compatibility-common-terminology.adoc
M	modules/api-compatibility-guidelines.adoc
M	modules/applications-create-using-cli-modify.adoc
M	modules/arch-cluster-operators.adoc
M	modules/arch-olm-operators.adoc
M	modules/architecture-machine-config-pools.adoc
M	modules/architecture-machine-roles.adoc
M	modules/architecture-platform-introduction.adoc
M	modules/builds-adding-source-clone-secrets.adoc
M	modules/builds-docker-strategy.adoc
M	modules/builds-dockerfile-source.adoc
M	modules/builds-input-secrets-configmaps.adoc
M	modules/builds-output-image-environment-variables.adoc
M	modules/builds-output-image-labels.adoc
M	modules/builds-strategy-s2i-environment-variables.adoc
M	modules/builds-troubleshooting-service-certificate-generation.adoc
M	modules/builds-using-external-artifacts.adoc
M	modules/ccs-aws-customer-requirements.adoc
M	modules/ccs-aws-provisioned.adoc
M	modules/ccs-gcp-customer-requirements.adoc
M	modules/ccs-gcp-iam.adoc
M	modules/ccs-gcp-provisioned.adoc
M	modules/cli-getting-help.adoc
M	modules/cli-installing-cli-web-console.adoc
M	modules/cluster-authentication-operator.adoc
M	modules/cluster-autoscaler-operator.adoc
M	modules/cluster-capi-operator.adoc
M	modules/cluster-cloud-controller-manager-operator.adoc
M	modules/cluster-config-operator.adoc
M	modules/cluster-dns-operator.adoc
M	modules/cluster-kube-scheduler-operator.adoc
M	modules/cluster-kube-storage-version-migrator-operator.adoc
M	modules/cluster-machine-approver-operator.adoc
M	modules/cluster-node-tuning-operator-default-profiles-set.adoc
M	modules/cluster-node-tuning-operator-verify-profiles.adoc
M	modules/cluster-openshift-controller-manager-operators.adoc
M	modules/cluster-storage-operator.adoc
M	modules/cluster-version-operator.adoc
M	modules/compliance-applying.adoc
M	modules/control-plane-machine-set-operator.adoc
M	modules/creating-machines-bare-metal.adoc
M	modules/custom-tuning-example.adoc
M	modules/custom-tuning-specification.adoc
M	modules/deploy-red-hat-openshift-container-storage.adoc
M	modules/deployments-comparing-deploymentconfigs.adoc
M	modules/deployments-deploymentconfigs.adoc
M	modules/deployments-rolling-strategy.adoc
M	modules/digging-into-machine-config.adoc
M	modules/dr-scenario-cluster-state-issues.adoc
M	modules/dynamic-provisioning-available-plugins.adoc
M	modules/dynamic-provisioning-aws-definition.adoc
M	modules/dynamic-provisioning-defining-storage-class.adoc
M	modules/dynamic-provisioning-gce-definition.adoc
M	modules/dynamic-provisioning-storage-class-definition.adoc
M	modules/dynamic-provisioning-vsphere-definition.adoc
M	modules/etcd-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/etcd-operator.adoc
Auto-merging modules/dynamic-provisioning-vsphere-definition.adoc
Auto-merging modules/dynamic-provisioning-storage-class-definition.adoc
Auto-merging modules/dynamic-provisioning-gce-definition.adoc
Auto-merging modules/dynamic-provisioning-defining-storage-class.adoc
Auto-merging modules/dynamic-provisioning-aws-definition.adoc
Auto-merging modules/dynamic-provisioning-available-plugins.adoc
Auto-merging modules/dr-scenario-cluster-state-issues.adoc
Auto-merging modules/digging-into-machine-config.adoc
Auto-merging modules/deployments-rolling-strategy.adoc
Auto-merging modules/deployments-deploymentconfigs.adoc
Auto-merging modules/deployments-comparing-deploymentconfigs.adoc
Auto-merging modules/deploy-red-hat-openshift-container-storage.adoc
Auto-merging modules/custom-tuning-specification.adoc
Auto-merging modules/custom-tuning-example.adoc
Auto-merging modules/creating-machines-bare-metal.adoc
Auto-merging modules/control-plane-machine-set-operator.adoc
Auto-merging modules/compliance-applying.adoc
Auto-merging modules/cluster-version-operator.adoc
Auto-merging modules/cluster-storage-operator.adoc
Auto-merging modules/cluster-openshift-controller-manager-operators.adoc
Auto-merging modules/cluster-node-tuning-operator-verify-profiles.adoc
Auto-merging modules/cluster-node-tuning-operator-default-profiles-set.adoc
Auto-merging modules/cluster-machine-approver-operator.adoc
Auto-merging modules/cluster-kube-storage-version-migrator-operator.adoc
Auto-merging modules/cluster-kube-scheduler-operator.adoc
Auto-merging modules/cluster-dns-operator.adoc
Auto-merging modules/cluster-config-operator.adoc
Auto-merging modules/cluster-cloud-controller-manager-operator.adoc
CONFLICT (content): Merge conflict in modules/cluster-cloud-controller-manager-operator.adoc
Auto-merging modules/cluster-capi-operator.adoc
Auto-merging modules/cluster-autoscaler-operator.adoc
Auto-merging modules/cluster-authentication-operator.adoc
Auto-merging modules/cli-installing-cli-web-console.adoc
Auto-merging modules/cli-getting-help.adoc
Auto-merging modules/ccs-gcp-provisioned.adoc
Auto-merging modules/ccs-gcp-iam.adoc
Auto-merging modules/ccs-gcp-customer-requirements.adoc
Auto-merging modules/ccs-aws-provisioned.adoc
Auto-merging modules/ccs-aws-customer-requirements.adoc
Auto-merging modules/builds-using-external-artifacts.adoc
Auto-merging modules/builds-troubleshooting-service-certificate-generation.adoc
Auto-merging modules/builds-strategy-s2i-environment-variables.adoc
Auto-merging modules/builds-output-image-labels.adoc
Auto-merging modules/builds-output-image-environment-variables.adoc
Auto-merging modules/builds-input-secrets-configmaps.adoc
Auto-merging modules/builds-dockerfile-source.adoc
Auto-merging modules/builds-docker-strategy.adoc
Auto-merging modules/builds-adding-source-clone-secrets.adoc
Auto-merging modules/architecture-platform-introduction.adoc
Auto-merging modules/architecture-machine-roles.adoc
Auto-merging modules/architecture-machine-config-pools.adoc
Auto-merging modules/arch-olm-operators.adoc
Auto-merging modules/arch-cluster-operators.adoc
Auto-merging modules/applications-create-using-cli-modify.adoc
Auto-merging modules/api-compatibility-guidelines.adoc
Auto-merging modules/api-compatibility-common-terminology.adoc
Auto-merging modules/alternatives-to-storing-admin-secrets-in-kube-system.adoc
Auto-merging modules/admission-webhooks-about.adoc
Auto-merging modules/admission-plug-ins-default.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 add content types to untagged modules OSDOCS-16694

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

@openshift-cherrypick-robot

@xenolinux: #101515 failed to apply on top of branch "enterprise-4.13":

Applying: add content types to untagged modules OSDOCS-16694
Using index info to reconstruct a base tree...
M	modules/admission-plug-ins-default.adoc
M	modules/admission-webhooks-about.adoc
M	modules/alternatives-to-storing-admin-secrets-in-kube-system.adoc
M	modules/api-compatibility-common-terminology.adoc
M	modules/api-compatibility-guidelines.adoc
M	modules/applications-create-using-cli-modify.adoc
M	modules/arch-olm-operators.adoc
M	modules/architecture-machine-config-pools.adoc
M	modules/architecture-machine-roles.adoc
M	modules/architecture-platform-introduction.adoc
M	modules/builds-adding-source-clone-secrets.adoc
M	modules/builds-dockerfile-source.adoc
M	modules/builds-output-image-environment-variables.adoc
M	modules/builds-output-image-labels.adoc
M	modules/builds-secrets-restrictions.adoc
M	modules/builds-strategy-s2i-environment-variables.adoc
M	modules/builds-troubleshooting-service-certificate-generation.adoc
M	modules/builds-using-external-artifacts.adoc
M	modules/ccs-aws-customer-requirements.adoc
M	modules/ccs-aws-provisioned.adoc
M	modules/ccs-gcp-customer-requirements.adoc
M	modules/ccs-gcp-iam.adoc
M	modules/ccs-gcp-provisioned.adoc
M	modules/cli-getting-help.adoc
M	modules/cli-installing-cli-web-console.adoc
M	modules/cluster-authentication-operator.adoc
M	modules/cluster-autoscaler-operator.adoc
M	modules/cluster-capi-operator.adoc
M	modules/cluster-cloud-controller-manager-operator.adoc
M	modules/cluster-config-operator.adoc
M	modules/cluster-dns-operator.adoc
M	modules/cluster-kube-scheduler-operator.adoc
M	modules/cluster-kube-storage-version-migrator-operator.adoc
M	modules/cluster-machine-approver-operator.adoc
M	modules/cluster-node-tuning-operator-default-profiles-set.adoc
M	modules/cluster-node-tuning-operator-verify-profiles.adoc
M	modules/cluster-openshift-controller-manager-operators.adoc
M	modules/cluster-storage-operator.adoc
M	modules/cluster-version-operator.adoc
M	modules/control-plane-machine-set-operator.adoc
M	modules/creating-machines-bare-metal.adoc
M	modules/custom-tuning-specification.adoc
M	modules/deploy-red-hat-openshift-container-storage.adoc
M	modules/deployments-comparing-deploymentconfigs.adoc
M	modules/deployments-deploymentconfigs.adoc
M	modules/digging-into-machine-config.adoc
M	modules/dr-scenario-cluster-state-issues.adoc
M	modules/dynamic-provisioning-available-plugins.adoc
M	modules/dynamic-provisioning-aws-definition.adoc
M	modules/dynamic-provisioning-defining-storage-class.adoc
M	modules/dynamic-provisioning-gce-definition.adoc
M	modules/dynamic-provisioning-storage-class-definition.adoc
M	modules/etcd-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/etcd-operator.adoc
Auto-merging modules/dynamic-provisioning-storage-class-definition.adoc
Auto-merging modules/dynamic-provisioning-gce-definition.adoc
Auto-merging modules/dynamic-provisioning-defining-storage-class.adoc
Auto-merging modules/dynamic-provisioning-aws-definition.adoc
Auto-merging modules/dynamic-provisioning-available-plugins.adoc
Auto-merging modules/dr-scenario-cluster-state-issues.adoc
Auto-merging modules/digging-into-machine-config.adoc
Auto-merging modules/deployments-deploymentconfigs.adoc
Auto-merging modules/deployments-comparing-deploymentconfigs.adoc
Auto-merging modules/deploy-red-hat-openshift-container-storage.adoc
Auto-merging modules/custom-tuning-specification.adoc
Auto-merging modules/creating-machines-bare-metal.adoc
Auto-merging modules/control-plane-machine-set-operator.adoc
Auto-merging modules/cluster-version-operator.adoc
Auto-merging modules/cluster-storage-operator.adoc
Auto-merging modules/cluster-openshift-controller-manager-operators.adoc
Auto-merging modules/cluster-node-tuning-operator-verify-profiles.adoc
Auto-merging modules/cluster-node-tuning-operator-default-profiles-set.adoc
Auto-merging modules/cluster-machine-approver-operator.adoc
Auto-merging modules/cluster-kube-storage-version-migrator-operator.adoc
Auto-merging modules/cluster-kube-scheduler-operator.adoc
Auto-merging modules/cluster-dns-operator.adoc
Auto-merging modules/cluster-config-operator.adoc
Auto-merging modules/cluster-cloud-controller-manager-operator.adoc
CONFLICT (content): Merge conflict in modules/cluster-cloud-controller-manager-operator.adoc
Auto-merging modules/cluster-capi-operator.adoc
Auto-merging modules/cluster-autoscaler-operator.adoc
Auto-merging modules/cluster-authentication-operator.adoc
Auto-merging modules/cli-installing-cli-web-console.adoc
Auto-merging modules/cli-getting-help.adoc
Auto-merging modules/ccs-gcp-provisioned.adoc
Auto-merging modules/ccs-gcp-iam.adoc
Auto-merging modules/ccs-gcp-customer-requirements.adoc
Auto-merging modules/ccs-aws-provisioned.adoc
Auto-merging modules/ccs-aws-customer-requirements.adoc
Auto-merging modules/builds-using-external-artifacts.adoc
Auto-merging modules/builds-troubleshooting-service-certificate-generation.adoc
Auto-merging modules/builds-strategy-s2i-environment-variables.adoc
Auto-merging modules/builds-secrets-restrictions.adoc
Auto-merging modules/builds-output-image-labels.adoc
Auto-merging modules/builds-output-image-environment-variables.adoc
Auto-merging modules/builds-dockerfile-source.adoc
Auto-merging modules/builds-adding-source-clone-secrets.adoc
Auto-merging modules/architecture-platform-introduction.adoc
Auto-merging modules/architecture-machine-roles.adoc
Auto-merging modules/architecture-machine-config-pools.adoc
Auto-merging modules/arch-olm-operators.adoc
Auto-merging modules/applications-create-using-cli-modify.adoc
Auto-merging modules/api-compatibility-guidelines.adoc
Auto-merging modules/api-compatibility-common-terminology.adoc
Auto-merging modules/alternatives-to-storing-admin-secrets-in-kube-system.adoc
Auto-merging modules/admission-webhooks-about.adoc
Auto-merging modules/admission-plug-ins-default.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 add content types to untagged modules OSDOCS-16694

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

4 participants