Skip to content

Commit bfa3774

Browse files
authored
Merge pull request #51013 from xJustin/sca-fix-1
CCXDEV-9284: Clarify SCA entitlement section
2 parents 2f9ab8d + 8b50eef commit bfa3774

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

_topic_maps/_topic_map.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ Topics:
625625
File: using-insights-operator
626626
- Name: Using remote health reporting in a restricted network
627627
File: remote-health-reporting-from-restricted-network
628-
- Name: Importing simple content access certificates with Insights Operator
628+
- Name: Importing simple content access entitlements with Insights Operator
629629
File: insights-operator-simple-access
630630
- Name: Gathering data about your cluster
631631
File: gathering-cluster-data

modules/insights-operator-configuring-sca.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[id="insights-operator-configuring-sca_{context}"]
88
= Configuring simple content access import interval
99

10-
You can configure how often the Insights Operator imports the simple content access certificates using the `support` secret in the `openshift-config` namespace. The certificate import normally occurs every 8 hours, but you can shorten this interval if you update your simple content access configuration in Red Hat Subscription Management.
10+
You can configure how often the Insights Operator imports the simple content access entitlements using the `support` secret in the `openshift-config` namespace. The entitlement import normally occurs every eight hours, but you can shorten this interval if you update your simple content access configuration in Red Hat Subscription Management.
1111

1212
This procedure describes how to update the import interval to one hour.
1313

modules/insights-operator-disabling-sca.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[id="insights-operator-disabling-sca_{context}"]
88
= Disabling simple content access import
99

10-
You can disable the import of simple content access certificates using the `support` secret in the `openshift-config` namespace.
10+
You can disable the importing of simple content access entitlements using the `support` secret in the `openshift-config` namespace.
1111

1212
.Prerequisites
1313

@@ -22,7 +22,7 @@ You can disable the import of simple content access certificates using the `supp
2222
. Click *Add Key/Value*.
2323
. Create a key named `scaPullDisabled` with a value of `true`, and click *Save*.
2424
+
25-
The simple content access certificate import is now disabled.
25+
The simple content access entitlement import is now disabled.
2626
+
2727
[NOTE]
2828
====

support/remote_health_monitoring/insights-operator-simple-access.adoc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
:_content-type: ASSEMBLY
22
[id="insights-operator-simple-access"]
3-
= Importing simple content access certificates with Insights Operator
3+
= Importing simple content access entitlements with Insights Operator
44
include::_attributes/common-attributes.adoc[]
55
:context: remote-health-reporting-from-restricted-network
66
:FeatureName: `InsightsOperatorPullingSCA`
77

88
toc::[]
99

10-
Insights Operator periodically imports your simple content access certificates from {cluster-manager-url} and stores them in the `etc-pki-entitlement` secret in the `openshift-config-managed` namespace. Simple content access is a capability in Red Hat subscription tools which simplifies the behavior of the entitlement tooling. This feature makes it easier to consume the content provided by your Red Hat subscriptions without the complexity of configuring subscription tooling.
10+
Insights Operator periodically imports your simple content access entitlements from {cluster-manager-url} and stores them in the `etc-pki-entitlement` secret in the `openshift-config-managed` namespace. Simple content access is a capability in Red Hat subscription tools which simplifies the behavior of the entitlement tooling. This feature makes it easier to consume the content provided by your Red Hat subscriptions without the complexity of configuring subscription tooling.
1111

12-
Insights Operator imports simple content access certificates every 8 hours by default, but can be configured or disabled using the `support` secret in the `openshift-config` namespace.
12+
Insights Operator imports simple content access entitlements every eight hours, but can be configured or disabled using the `support` secret in the `openshift-config` namespace.
13+
14+
[NOTE]
15+
=====
16+
Simple content access must be enabled in Red Hat Subscription Management for the importing to function.
17+
=====
1318

1419
[role="_additional-resources"]
1520
.Additional resources
1621

1722
* See link:https://access.redhat.com/documentation/en-us/subscription_central/2021/html-single/getting_started_with_simple_content_access/index#assembly-about-simplecontent[About simple content access] in the Red Hat Subscription Central documentation, for more information about simple content access.
1823
19-
* See xref:../../cicd/builds/running-entitled-builds.adoc[Using Red Hat subscriptions in builds], for more information about using simple content access certificates in {product-title} entitled builds.
24+
* See xref:../../cicd/builds/running-entitled-builds.adoc[Using Red Hat subscriptions in builds] for more information about using simple content access entitlements in {product-title} builds.
2025
2126
include::modules/insights-operator-configuring-sca.adoc[leveloffset=+1]
2227

0 commit comments

Comments
 (0)