Skip to content

Commit 3aa7123

Browse files
authored
Merge pull request #31549 from ctauchen/GH-28376-base64-error
Changed base64 option to make it platform-agnostic. Closes #28376
2 parents a046d56 + 9f3bb73 commit 3aa7123

11 files changed

+16
-16
lines changed

authentication/managing_cloud_provider_credentials/cco-mode-sts.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ Error from server (NotFound): secrets "aws-creds" not found
750750
.Example command with the Image Registry Operator
751751
[source,terminal]
752752
----
753-
$ oc get secrets -n openshift-image-registry installer-cloud-credentials -o json | jq -r .data.credentials | base64 -d
753+
$ oc get secrets -n openshift-image-registry installer-cloud-credentials -o json | jq -r .data.credentials | base64 --decode
754754
----
755755
+
756756
The output should show the role and web identity token that are used by the component and look similar to:

modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ $ oc policy add-role-to-user system:image-puller system:serviceaccount:sriov-con
315315
[source,bash]
316316
----
317317
SECRET=$(oc -n cnftests get secret | grep builder-docker | awk {'print $1'}
318-
TOKEN=$(oc -n cnftests get secret $SECRET -o jsonpath="{.data['\.dockercfg']}" | base64 -d | jq '.["image-registry.openshift-image-registry.svc:5000"].auth')
318+
TOKEN=$(oc -n cnftests get secret $SECRET -o jsonpath="{.data['\.dockercfg']}" | base64 --decode | jq '.["image-registry.openshift-image-registry.svc:5000"].auth')
319319
----
320320

321321
. Write a `dockerauth.json` similar to this:

modules/customize-certificates-manually-rotate-service-ca.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ using the following command.
2727
----
2828
$ oc get secrets/signing-key -n openshift-service-ca \
2929
-o template='{{index .data "tls.crt"}}' \
30-
| base64 -d \
30+
| base64 --decode \
3131
| openssl x509 -noout -enddate
3232
----
3333

modules/developer-cli-odo-pushing-the-odo-init-image-to-a-mirror-registry.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Depending on your operating system, you can push the `odo` init image to a clust
1717
+
1818
[source,terminal]
1919
----
20-
$ echo <content_of_additional_ca> | base64 -d > disconnect-ca.crt
20+
$ echo <content_of_additional_ca> | base64 --decode > disconnect-ca.crt
2121
----
2222

2323
. Copy the encoded root CA certificate to the appropriate location:
@@ -59,7 +59,7 @@ $ export ODO_BOOTSTRAPPER_IMAGE=<mirror-registry>:5000/openshiftdo/odo-init-imag
5959
+
6060
[source,terminal]
6161
----
62-
$ echo <content_of_additional_ca> | base64 -d > disconnect-ca.crt
62+
$ echo <content_of_additional_ca> | base64 --decode > disconnect-ca.crt
6363
----
6464

6565
. Copy the encoded root CA certificate to the appropriate location:
@@ -97,7 +97,7 @@ $ export ODO_BOOTSTRAPPER_IMAGE=<mirror-registry>:5000/openshiftdo/odo-init-imag
9797
+
9898
[source,terminal]
9999
----
100-
PS C:\> echo <content_of_additional_ca> | base64 -d > disconnect-ca.crt
100+
PS C:\> echo <content_of_additional_ca> | base64 --decode > disconnect-ca.crt
101101
----
102102

103103
. As an administrator, copy the encoded root CA certificate to the appropriate location by executing the following command:

modules/developer-cli-odo-pushing-the-odo-init-image-to-an-internal-registry-directly.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type: kubernetes.io/tls
4444
+
4545
[source,terminal]
4646
----
47-
$ echo <tls.crt> | base64 -d > ca.crt
47+
$ echo <tls.crt> | base64 --decode > ca.crt
4848
----
4949

5050
. Trust a CA in your client platform:
@@ -121,7 +121,7 @@ type: kubernetes.io/tls
121121
+
122122
[source,terminal]
123123
----
124-
$ echo <tls.crt> | base64 -d > ca.crt
124+
$ echo <tls.crt> | base64 --decode > ca.crt
125125
----
126126

127127
. Trust a CA in your client platform:
@@ -198,7 +198,7 @@ type: kubernetes.io/tls
198198
+
199199
[source,terminal]
200200
----
201-
PS C:\> echo <tls.crt> | base64 -d > ca.crt
201+
PS C:\> echo <tls.crt> | base64 --decode > ca.crt
202202
----
203203

204204
. As an administrator, trust a CA in your client platform by executing the following command:

modules/file-integrity-node-status-failure.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ File: /hostroot/etc/resolv.conf
109109
Events: <none>
110110
----
111111
112-
Due to the config map data size limit, AIDE logs over 1 MB are added to the failure config map as a base64-encoded gzip archive. In this case, you want to pipe the output of the above command to `base64 -d | gunzip`. Compressed logs are indicated by the presence of a `file-integrity.openshift.io/compressed` annotation key in the config map.
112+
Due to the config map data size limit, AIDE logs over 1 MB are added to the failure config map as a base64-encoded gzip archive. In this case, you want to pipe the output of the above command to `base64 --decode | gunzip`. Compressed logs are indicated by the presence of a `file-integrity.openshift.io/compressed` annotation key in the config map.

modules/identity-provider-htpasswd-update-users.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You can add or remove users from an existing HTPasswd identity provider.
2020
+
2121
[source,terminal]
2222
----
23-
$ oc get secret htpass-secret -ojsonpath={.data.htpasswd} -n openshift-config | base64 -d > users.htpasswd
23+
$ oc get secret htpass-secret -ojsonpath={.data.htpasswd} -n openshift-config | base64 --decode > users.htpasswd
2424
----
2525

2626
. Add or remove users from the `users.htpasswd` file.

modules/ignition-config-viewing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ the bootstrap machine from the output shown above:
4545

4646
[source,terminal]
4747
----
48-
$ echo VGhpcyBpcyB0aGUgYm9vdHN0cmFwIG5vZGU7IGl0IHdpbGwgYmUgZGVzdHJveWVkIHdoZW4gdGhlIG1hc3RlciBpcyBmdWxseSB1cC4KClRoZSBwcmltYXJ5IHNlcnZpY2UgaXMgImJvb3RrdWJlLnNlcnZpY2UiLiBUbyB3YXRjaCBpdHMgc3RhdHVzLCBydW4gZS5nLgoKICBqb3VybmFsY3RsIC1iIC1mIC11IGJvb3RrdWJlLnNlcnZpY2UK | base64 -d
48+
$ echo VGhpcyBpcyB0aGUgYm9vdHN0cmFwIG5vZGU7IGl0IHdpbGwgYmUgZGVzdHJveWVkIHdoZW4gdGhlIG1hc3RlciBpcyBmdWxseSB1cC4KClRoZSBwcmltYXJ5IHNlcnZpY2UgaXMgImJvb3RrdWJlLnNlcnZpY2UiLiBUbyB3YXRjaCBpdHMgc3RhdHVzLCBydW4gZS5nLgoKICBqb3VybmFsY3RsIC1iIC1mIC11IGJvb3RrdWJlLnNlcnZpY2UK | base64 --decode
4949
----
5050

5151
.Example output

modules/ipi-install-troubleshooting-misc-issues.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ $ oc get csr
194194
+
195195
[source,terminal]
196196
----
197-
$ oc get csr <pending_csr> -o jsonpath='{.spec.request}' | base64 -d | openssl req -noout -text
197+
$ oc get csr <pending_csr> -o jsonpath='{.spec.request}' | base64 --decode | openssl req -noout -text
198198
----
199199

200200
. Remove any `csr` that contains `Subject Name: localhost.localdomain`:

modules/migration-configuring-mcg.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@ $ oc get route -n openshift-storage s3
179179
+
180180
[source,terminal]
181181
----
182-
$ oc get secret -n openshift-storage migstorage -o go-template='{{ .data.AWS_ACCESS_KEY_ID }}' | base64 -d
182+
$ oc get secret -n openshift-storage migstorage -o go-template='{{ .data.AWS_ACCESS_KEY_ID }}' | base64 --decode
183183
----
184184

185185
* S3 provider secret access key:
186186
+
187187
[source,terminal]
188188
----
189-
$ oc get secret -n openshift-storage migstorage -o go-template='{{ .data.AWS_SECRET_ACCESS_KEY }}' | base64 -d
189+
$ oc get secret -n openshift-storage migstorage -o go-template='{{ .data.AWS_SECRET_ACCESS_KEY }}' | base64 --decode
190190
----

0 commit comments

Comments
 (0)