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

OSDOCS-3644 RN: installer capabilities #46411

Merged
merged 1 commit into from
Jul 22, 2022

Conversation

bscott-rh
Copy link
Contributor

@bscott-rh bscott-rh commented Jun 6, 2022

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 6, 2022
@bscott-rh
Copy link
Contributor Author

@jianlinliu hello Jianlin, could you please take a look at this release note for CORS-1873? I will circle back closer to GA and update the "Additional information" link once the main PR is complete. Thank you very much.

@jianlinliu
Copy link

@jinyunma @shellyyang1989 when you have time, pls help review this PR.

@@ -100,6 +100,12 @@ For more information, see xref:../installing/installing_aws/installing-aws-secre

//For more information, see ../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[Installing a cluster on Nutanix].

[id="ocp-4-11-capabilities"]
==== Additional customization when installing {product-title}
{product-title} 4.11 allows you to disable the installation of the `metal3` API, the optional `redhat-marketplace` Operators, and the `samples` content that is stored in the `openshift` namespace. You can disable these features by setting the `baselineCapabilitySet` and `additionalEnabledCapabilities` parameters in the `install-config.yaml` configuration file prior to installation.
Copy link

Choose a reason for hiding this comment

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

redhat-marketplace looks like one optional operator catalog for marketplace, see doc Red Hat-provided Operator catalogs. Maybe it is better to describe three operator names instead of its function here - baremetal, marketplace, and openshift-smaples, which also are the valid value for additionalEnabledCapabilities.
cc: @jianzhangbjz if more comments.

Choose a reason for hiding this comment

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

I'm not sure if the metal3 API and the samples content are the proper expression. So involving @pamoedom @tisutisu to take a look.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the feedback. I have updated the release notes to take this into account - can you please review?

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 10, 2022
@shellyyang1989
Copy link

Cluster administrators can enable a capability if it was not enabled during the installation. If a capability has ever been enabled before it can not be disabled.

I feel ^ is worth highlighting in the RN.

https://issues.redhat.com/browse/OTA-555

@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 14, 2022
@bscott-rh
Copy link
Contributor Author

Cluster administrators can enable a capability if it was not enabled during the installation. If a capability has ever been enabled before it can not be disabled.

I feel ^ is worth highlighting in the RN.

https://issues.redhat.com/browse/OTA-555

Thanks Shelly, I have added this to the end of the note. Can you please review?

@shellyyang1989
Copy link

Cluster administrators can enable a capability if it was not enabled during the installation. If a capability has ever been enabled before it can not be disabled.

I feel ^ is worth highlighting in the RN.
https://issues.redhat.com/browse/OTA-555

Thanks Shelly, I have added this to the end of the note. Can you please review?

Thanks for the update!
@LalatenduMohanty could you please help review if possible? Thanks!

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 28, 2022
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 28, 2022
@bscott-rh bscott-rh force-pushed the OSDOCS-3644-RN branch 2 times, most recently from 45d0bb3 to 86f07e1 Compare July 6, 2022 13:26
Copy link
Member

@LalatenduMohanty LalatenduMohanty left a comment

Choose a reason for hiding this comment

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

looks good to me

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 21, 2022
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 21, 2022
@@ -162,6 +162,12 @@ You are no longer required to configure AWS VPC endpoints when installing a rest

For more information, see xref:../installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc#installation-custom-aws-vpc-requirements_installing-restricted-networks-aws-installer-provisioned[Requirements for using your VPC].

[id="ocp-4-11-capabilities"]
==== Additional customization when installing {product-title}
{product-title} 4.11 allows you to disable the installation of the `baremetal` and `marketplace` Operators, and the `openshift-samples` content that is stored in the `openshift` namespace. You can disable these features by setting the `baselineCapabilitySet` and `additionalEnabledCapabilities` parameters in the `install-config.yaml` configuration file prior to installation. If you disable any of these capabilities during the installation, you can enable them after the cluster is installed. Once a capability has been enabled, it cannot be disabled again.

Choose a reason for hiding this comment

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

the openshift-samples content that is stored in the openshift namespace.

Actually, they are ImageStream resources that are managed by the sample operator.

@jianzhangbjz
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2022
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2022
@openshift-ci
Copy link

openshift-ci bot commented Jul 22, 2022

New changes are detected. LGTM label has been removed.

Copy link
Contributor

@kelbrown20 kelbrown20 left a comment

Choose a reason for hiding this comment

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

Just some small things. Other than that, this LGTM!

@@ -162,6 +162,12 @@ You are no longer required to configure AWS VPC endpoints when installing a rest

For more information, see xref:../installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc#installation-custom-aws-vpc-requirements_installing-restricted-networks-aws-installer-provisioned[Requirements for using your VPC].

[id="ocp-4-11-capabilities"]
==== Additional customization when installing {product-title}
{product-title} 4.11 allows you to disable the installation of the `baremetal` and `marketplace` Operators, and the `openshift-samples` content that is stored in the `openshift` namespace. You can disable these features by setting the `baselineCapabilitySet` and `additionalEnabledCapabilities` parameters in the `install-config.yaml` configuration file prior to installation. If you disable any of these capabilities during the installation, you can enable them after the cluster is installed. Once a capability has been enabled, it cannot be disabled again.
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe instead of
You can disable these features by setting the baselineCapabilitySet and additionalEnabledCapabilities parameters in the install-config.yaml,
Try:
You can disable these features by adding the baselineCapabilitySet and additionalEnabledCapabilities parameters to the install-config.yaml

setting makes it sounds like its going to say setting to something
Just a suggestion though, up to you!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good suggestion, "adding" sounds better to me.

==== Additional customization when installing {product-title}
{product-title} 4.11 allows you to disable the installation of the `baremetal` and `marketplace` Operators, and the `openshift-samples` content that is stored in the `openshift` namespace. You can disable these features by setting the `baselineCapabilitySet` and `additionalEnabledCapabilities` parameters in the `install-config.yaml` configuration file prior to installation. If you disable any of these capabilities during the installation, you can enable them after the cluster is installed. Once a capability has been enabled, it cannot be disabled again.

For more information, see the "Installation configuration parameters" section of the installation documentation for your platform.
Copy link
Contributor

@kelbrown20 kelbrown20 Jul 22, 2022

Choose a reason for hiding this comment

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

Did you want this Installation configuration parameters to be a link, since this isn't a module. I know most of the other RN sections use the links

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not putting a link here since it's a platform-agnostic feature, and I'd have to link to a specific platform's page (since we don't have a configuration parameters table in our "install on any platform" page).

@@ -162,6 +162,12 @@ You are no longer required to configure AWS VPC endpoints when installing a rest

For more information, see xref:../installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc#installation-custom-aws-vpc-requirements_installing-restricted-networks-aws-installer-provisioned[Requirements for using your VPC].

[id="ocp-4-11-capabilities"]
==== Additional customization when installing {product-title}
{product-title} 4.11 allows you to disable the installation of the `baremetal` and `marketplace` Operators, and the `openshift-samples` content that is stored in the `openshift` namespace. You can disable these features by adding the `baselineCapabilitySet` and `additionalEnabledCapabilities` parameters to the `install-config.yaml` configuration file prior to installation. If you disable any of these capabilities during the installation, you can enable them after the cluster is installed. Once a capability has been enabled, it cannot be disabled again.
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't these be Bare Metal and Market Place Operators, since it's referring to the actual Operator?

Only use "once" when referred to time: https://www.ibm.com/docs/en/ibm-style?topic=word-usage#once

Probably swap for "When"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Wouldn't these be Bare Metal and Market Place Operators, since it's referring to the actual Operator?

Only use "once" when referred to time: https://www.ibm.com/docs/en/ibm-style?topic=word-usage#once

Probably swap for "When"

I have seen the baremetal and marketplace Operators referred to in a few different ways in various places in the doc - (metal3, baremetal, Bare Metal, Baremetal, marketplace, redhat-marketplace, Red Hat Marketplace, etc). So I decided to refer to them by the same names that will be used in the actual parameters in the install-config.yaml file (which I got from the dev doc here ).

Is it okay to say "After a capability is enabled..." to indicate that you can't disable the operator after it's been installed?

Copy link
Member

Choose a reason for hiding this comment

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

Regarding the first: Sure. The inconsistency drives me insane (not here, just in general in the docs), but I can see why you chose to put those in backticks since they're part of the config YAML. That sounds good to me.

Regarding the second: Yes that sounds good to me!

@stevsmit stevsmit added the peer-review-done Signifies that the peer review team has reviewed this PR label Jul 22, 2022
@stevsmit stevsmit merged commit 614d861 into openshift:enterprise-4.11 Jul 22, 2022
@bergerhoffer bergerhoffer modified the milestones: Next Release, OCP 4.11 GA Aug 9, 2022
@bscott-rh bscott-rh deleted the OSDOCS-3644-RN branch October 30, 2023 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.11 peer-review-done Signifies that the peer review team has reviewed 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