Hotfix - MSI RP endpoint env var (#3881)

* Add missing RP-Config param to RP deploy ARM template * Plumb msiRpEndpoint ARM parameter through to RP environment variable * Regenerate RP ARM template * Remove duplicated MSI_RP_ENDPOINT envvar in RP env * Add env var to aro-rp.service startup * Regenerate RP ARM template --------- Co-authored-by: Tanmay Satam <[email protected]>
Azure · Oct 4, 2024 · 3ba0b23 · 3ba0b23
1 parent a024907
commit 3ba0b23
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/pkg/deploy/assets/gateway-production.json b/pkg/deploy/assets/gateway-production.json
diff --git a/pkg/deploy/assets/rp-production-parameters.json b/pkg/deploy/assets/rp-production-parameters.json
@@ -99,6 +99,9 @@
         "mdsdEnvironment": {
             "value": ""
         },
+        "msiRpEndpoint": {
+            "value": ""
+        },
         "nonZonalRegions": {
             "value": [
                 "eastasia",

diff --git a/pkg/deploy/assets/rp-production.json b/pkg/deploy/assets/rp-production.json
diff --git a/pkg/deploy/generator/resources_rp.go b/pkg/deploy/generator/resources_rp.go
@@ -384,6 +384,7 @@ func (g *generator) rpVMSS() *arm.Resource {
 		"keyvaultPrefix",
 		"mdmFrontendUrl",
 		"mdsdEnvironment",
+		"msiRpEndpoint",
 		"portalAccessGroupIds",
 		"portalClientId",
 		"portalElevatedGroupIds",

diff --git a/pkg/deploy/generator/scripts/util-services.sh b/pkg/deploy/generator/scripts/util-services.sh
@@ -134,6 +134,7 @@ ExecStart=/usr/bin/podman run \
   -e ARO_ADOPT_BY_HIVE \
   -e OIDC_AFD_ENDPOINT \
   -e OIDC_STORAGE_ACCOUNT_NAME \
+  -e MSI_RP_ENDPOINT \
   -m 2g \
   -p 443:8443 \
   -v /etc/aro-rp:/etc/aro-rp \

diff --git a/pkg/deploy/generator/templates_rp.go b/pkg/deploy/generator/templates_rp.go
@@ -77,6 +77,7 @@ func (g *generator) rpTemplate() *arm.Template {
 			"vmssCleanupEnabled",
 			"vmssName",
 			"oidcStorageAccountName",
+			"msiRpEndpoint",
 
 			// TODO: Replace with Live Service Configuration in KeyVault
 			"clustersInstallViaHive",