Skip to content

Commit 5cac65f

Browse files
authored
Merge pull request #39388 from codyhoag/azure-upi-security-fix
BZ#2030348 Fix Azure UPI storage creation to remove security risk
2 parents 4d3cacf + f9a0fdd commit 5cac65f

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

modules/installation-azure-user-infra-uploading-rhcos.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ endif::ash[]
115115
+
116116
[source,terminal]
117117
----
118-
$ az storage container create --name files --account-name ${CLUSTER_NAME}sa --account-key ${ACCOUNT_KEY} --public-access blob
118+
$ az storage container create --name files --account-name ${CLUSTER_NAME}sa --account-key ${ACCOUNT_KEY}
119119
----
120120
+
121121
[source,terminal]

modules/installation-creating-azure-bootstrap.adoc

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,20 @@ support with your installation logs.
4141
this topic and save it as `04_bootstrap.json` in your cluster's installation directory. This template
4242
describes the bootstrap machine that your cluster requires.
4343

44-
. Export the following variables required by the bootstrap machine deployment:
44+
. Export the bootstrap ignition variable:
45+
+
46+
[source,terminal]
47+
----
48+
$ bootstrap_url_expiry=`date -u -d "10 hours" '+%Y-%m-%dT%H:%MZ'`
49+
----
50+
+
51+
[source,terminal]
52+
----
53+
$ export BOOTSTRAP_URL=`az storage blob generate-sas -c 'files' -n 'bootstrap.ign' --https-only --full-uri --permissions r --expiry $bootstrap_url_expiry --account-name ${CLUSTER_NAME}sa --account-key ${ACCOUNT_KEY} -o tsv`
54+
----
4555
+
4656
[source,terminal]
4757
----
48-
$ export BOOTSTRAP_URL=`az storage blob url --account-name ${CLUSTER_NAME}sa --account-key ${ACCOUNT_KEY} -c "files" -n "bootstrap.ign" -o tsv`
4958
$ export BOOTSTRAP_IGNITION=`jq -rcnM --arg v "3.2.0" --arg url ${BOOTSTRAP_URL} '{ignition:{version:$v,config:{replace:{source:$url}}}}' | base64 | tr -d '\n'`
5059
----
5160

0 commit comments

Comments
 (0)