Skip to content

Commit 4745665

Browse files
authored
Merge pull request #36246 from xJustin/sca-pick-to-main
Picking OCM SCA merge from enterprise-4.9 to main
2 parents baeebd7 + e451f6a commit 4745665

File tree

5 files changed

+82
-0
lines changed

5 files changed

+82
-0
lines changed

_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,8 @@ Topics:
480480
File: using-insights-to-identify-issues-with-your-cluster
481481
- Name: Using remote health reporting in a restricted network
482482
File: remote-health-reporting-from-restricted-network
483+
- Name: Configuring RHEL Simple Content Access
484+
File: insights-operator-simple-access
483485
- Name: Gathering data about your cluster
484486
File: gathering-cluster-data
485487
Distros: openshift-enterprise,openshift-origin
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * support/remote_health_monitoring/insights-operator-simple-access.adoc
4+
5+
6+
[id="insights-operator-configuring-sca_{context}"]
7+
= Configuring Simple Content Access import interval
8+
9+
You can configure how often the Insights Operator imports the RHEL Simple Content Access (SCA) certificates using the `support` secret in the `openshift-config` namespace. The certificate import normally occurs every 8 hours, but you may want to shorten this interval if you update your SCA configuration in Red Hat Subscription Management.
10+
11+
This procedure describes how to update the import interval to one hour.
12+
13+
.Prerequisites
14+
15+
* You are logged in to the {product-title} web console as `cluster-admin`.
16+
17+
.Procedure
18+
19+
. Navigate to *Workloads* -> *Secrets*.
20+
. Search for the *support* secret using the *Search by name* field. If it does not exist, click *Create* -> *Key/value secret* to create it.
21+
. Click the *Options* menu {kebab}, and then click *Edit Secret*.
22+
. Click *Add Key/Value*.
23+
. Create a key named `ocmInterval` with a value of `1h`, and click *Save*.
24+
+
25+
[NOTE]
26+
====
27+
The interval `1h` can also be entered as `60m` for 60 minutes.
28+
====
29+
+
30+
. Navigate to *Workloads* -> *Pods*
31+
. Select the `openshift-insights` project.
32+
. Find the `insights-operator` pod.
33+
. To restart the `insights-operator` pod, click the *Options* menu {kebab}, and then click *Delete Pod*.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * support/remote_health_monitoring/insights-operator-simple-access.adoc
4+
5+
6+
[id="insights-operator-disabling-sca_{context}"]
7+
= Disabling Simple Content Access import
8+
9+
You can disable the import of RHEL Simple Content Access certificates using the `support` secret in the `openshift-config` namespace.
10+
11+
.Prerequisites
12+
13+
* You are logged in to the {product-title} web console as `cluster-admin`.
14+
15+
.Procedure
16+
17+
. Navigate to *Workloads* -> *Secrets*.
18+
. Search for the *support* secret using the *Search by name* field. If it does not exist, click *Create* -> *Key/value secret* to create it.
19+
. Click the *Options* menu {kebab}, and then click *Edit Secret*.
20+
. Click *Add Key/Value*.
21+
. Create a key named `ocmPullDisabled` with a value of `true`, and click *Save*.
22+
. Navigate to *Workloads* -> *Pods*
23+
. Select the `openshift-insights` project.
24+
. Find the `insights-operator` pod.
25+
. To restart the `insights-operator` pod, click the *Options* menu {kebab}, and then click *Delete Pod*.

modules/nodes-cluster-enabling-features-about.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ The following Technology Preview features are enabled by this feature set:
2222

2323
* link:https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/#certificate-rotation[RotateKubeletServerCertificate]. Enables the rotation of the server TLS certificate on the kubelet.
2424
* link:https://kubernetes.io/docs/concepts/policy/pid-limiting/#pod-pid-limits[Pod PID limits (SupportPodPidsLimit)]. Enables limiting process IDs (PIDs) in pods.
25+
* `InsightsOperatorPullingSCA`. Enables importing of RHEL Simple Content Access (SCA) certificates from {cloud-redhat-com}.
2526

2627
|===
2728

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[id="insights-operator-simple-access"]
2+
= Importing RHEL Simple Content Access certificates with Insights Operator
3+
include::modules/common-attributes.adoc[]
4+
:context: remote-health-reporting-from-restricted-network
5+
:FeatureName: `InsightsOperatorPullingSCA`
6+
7+
toc::[]
8+
9+
Insights Operator can import your RHEL Simple Content Access (SCA) certificates from {cloud-redhat-com}. SCA is a capability in Red Hat’s subscription tools which simplifies the behavior of the entitlement tooling. It is easier to consume the content provided by your Red Hat subscriptions without the complexity of configuring subscription tooling. After importing the certificates, they are stored in the `etc-pki-entitlement` secret in the `openshift-config-managed` namespace.
10+
11+
Insights Operator imports SCA certificates every 8 hours by default, but can be configured or disabled using the `support` secret in the `openshift-config` namespace.
12+
13+
In {product-title} 4.9, this feature is in Technology Preview and must be enabled using the `TechPreviewNoUpgrade` Feature Set. See xref:../../nodes/clusters/nodes-cluster-enabling-features.adoc[_Enabling OpenShift Container Platform features using FeatureGates_] for more information.
14+
15+
For more information about Simple Content Access certificates see the link:https://access.redhat.com/articles/simple-content-access[_Simple Content Access_] article in the Red Hat Knowledgebase.
16+
17+
include::modules/technology-preview.adoc[leveloffset=+1]
18+
19+
include::modules/insights-operator-configuring-sca.adoc[leveloffset=+1]
20+
21+
include::modules/insights-operator-disabling-sca.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)