Merge remote-tracking branch 'origin/rhsm-oc' into integration_2024_w36

ci-scripts/cls_containerize.py

@@ -450,9 +450,6 @@ class Containerize():
 		cmd.cd(lSourcePath)
 		# if asterix, copy the entitlement and subscription manager configurations
 		if self.host == 'Red Hat':
-			cmd.run('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca')
-			cmd.run('cp /etc/rhsm/rhsm.conf ./rhsm-conf/')
-			cmd.run('cp /etc/rhsm/ca/redhat-uep.pem ./rhsm-ca/')
 			cmd.run('cp /etc/pki/entitlement/*.pem ./etc-pki-entitlement/')
 
 		baseImage = 'ran-base'

openshift/README.md

@@ -53,8 +53,6 @@ In case you have difficulties in following it then you can copy the
 certificates from an RHEL9 host
 
 ```bash
-oc create configmap rhsm-conf --from-file /etc/rhsm/rhsm.conf
-oc create configmap rhsm-ca --from-file /etc/rhsm/ca/redhat-uep.pem
 oc create secret generic etc-pki-entitlement --from-file /etc/pki/entitlement/{NUMBER_ON_YOUR_COMPUTER}.pem --from-file /etc/pki/entitlement/{NUMBER_ON_YOUR_COMPUTER}-key.pem
 ```
 

openshift/oai-gnb-fhi72-bc.yaml

@@ -32,13 +32,6 @@ spec:
           - secret:
               name: etc-pki-entitlement
             destinationDir: etc-pki-entitlement
-        configMaps:
-          - configMap:
-              name: rhsm-conf
-            destinationDir: rhsm-conf
-          - configMap:
-              name: rhsm-ca
-            destinationDir: rhsm-ca
     strategy:
         dockerStrategy:
             dockerfilePath: "docker/Dockerfile.gNB.fhi72.rhel9"

openshift/ran-base-bc.yaml

@@ -34,13 +34,6 @@ spec:
           - secret:
               name: etc-pki-entitlement
             destinationDir: etc-pki-entitlement
-        configMaps:
-          - configMap:
-              name: rhsm-conf
-            destinationDir: rhsm-conf
-          - configMap:
-              name: rhsm-ca
-            destinationDir: rhsm-ca
     strategy:
         dockerStrategy:
             dockerfilePath: "docker/Dockerfile.base.rhel9"