Merge pull request #85655 from stevsmit/ocpbugs-35945-ir

stevsmit · web-flow · commit 5538381fa178 · 2024-12-03T13:42:30.000-05:00
Updates a few IR commands
diff --git a/modules/registry-configuring-registry-storage-rhodf-cephrgw.adoc b/modules/registry-configuring-registry-storage-rhodf-cephrgw.adoc
@@ -82,7 +82,7 @@ $ route_host=$(oc get route ocs-storagecluster-cephobjectstore -n openshift-stor
 +
 [source,terminal]
 ----
-$ oc extract secret/router-certs-default  -n openshift-ingress  --confirm
+$ oc extract secret/$(oc get ingresscontroller -n openshift-ingress-operator default -o json | jq '.spec.defaultCertificate.name // "router-certs-default"' -r) -n openshift-ingress --confirm
 ----
 +
 [source,terminal]
diff --git a/modules/registry-exposing-default-registry-manually.adoc b/modules/registry-exposing-default-registry-manually.adoc
@@ -35,7 +35,7 @@ $ HOST=$(oc get route default-route -n openshift-image-registry --template='{{ .
 +
 [source,terminal]
 ----
-$ oc get secret -n openshift-ingress  router-certs-default -o go-template='{{index .data "tls.crt"}}' | base64 -d | sudo tee /etc/pki/ca-trust/source/anchors/${HOST}.crt  > /dev/null
+$ oc extract secret/$(oc get ingresscontroller -n openshift-ingress-operator default -o json | jq '.spec.defaultCertificate.name // "router-certs-default"' -r) -n openshift-ingress --confirm
 ----
 
 . Enable the cluster's default certificate to trust the route using the following commands:

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ $ route_host=$(oc get route ocs-storagecluster-cephobjectstore -n openshift-stor`
`82`	`82`	`+`
`83`	`83`	`[source,terminal]`
`84`	`84`	`----`
`85`		`-$ oc extract secret/router-certs-default -n openshift-ingress --confirm`
	`85`	`+$ oc extract secret/$(oc get ingresscontroller -n openshift-ingress-operator default -o json \| jq '.spec.defaultCertificate.name // "router-certs-default"' -r) -n openshift-ingress --confirm`
`86`	`86`	`----`
`87`	`87`	`+`
`88`	`88`	`[source,terminal]`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ $ HOST=$(oc get route default-route -n openshift-image-registry --template='{{ .`
`35`	`35`	`+`
`36`	`36`	`[source,terminal]`
`37`	`37`	`----`
`38`		`-$ oc get secret -n openshift-ingress router-certs-default -o go-template='{{index .data "tls.crt"}}' \| base64 -d \| sudo tee /etc/pki/ca-trust/source/anchors/${HOST}.crt > /dev/null`
	`38`	`+$ oc extract secret/$(oc get ingresscontroller -n openshift-ingress-operator default -o json \| jq '.spec.defaultCertificate.name // "router-certs-default"' -r) -n openshift-ingress --confirm`
`39`	`39`	`----`
`40`	`40`
`41`	`41`	`. Enable the cluster's default certificate to trust the route using the following commands:`