Azure
/
ARO-RP
зеркало из https://github.com/Azure/ARO-RP.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

add vmssDomainNameLabel

This commit is contained in:
Jim Minter 2020-01-10 19:00:44 -06:00
Родитель e90eb9c2b6
Коммит 160884d443
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 0730CBDA10D1A2D3
3 изменённых файлов: 19 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
deploy/rp-production-parameters.json
Просмотреть файл

@ -49,6 +49,9 @@
},
"sshPublicKey": {
"value": ""
},
"vmssDomainNameLabel": {
"value": ""
}
}
}

12
deploy/rp-production.json
Просмотреть файл

@ -64,6 +64,9 @@
},
"sshPublicKey": {
"type": "string"
},
"vmssDomainNameLabel": {
"type": "string"
}
},
"resources": [
@ -198,7 +201,12 @@
},
"primary": true,
"publicIPAddressConfiguration": {
"name": "rp-vmss-pip"
"name": "rp-vmss-pip",
"properties": {
"dnsSettings": {
"domainNameLabel": "[parameters('vmssDomainNameLabel')]"
}
}
},
"loadBalancerBackendAddressPools": [
{
@ -223,7 +231,7 @@
"autoUpgradeMinorVersion": true,
"settings": {},
"protectedSettings": {
"script": "[base64(concat(base64ToString('c2V0IC1leAoK'),'MDMCERTIFICATE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmCertificate')),''')\n','MDMFRONTENDURL=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmFrontendUrl')),''')\n','MDMMETRICNAMESPACE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmMetricNamespace')),''')\n','MDMMONITORINGACCOUNT=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmMonitoringAccount')),''')\n','MDMPRIVATEKEY=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmPrivateKey')),''')\n','PULLSECRET=$(base64 -d \u003c\u003c\u003c''',base64(parameters('pullSecret')),''')\n','RPIMAGE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpImage')),''')\n','RPIMAGEAUTH=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpImageAuth')),''')\n','\n',base64ToString('c3lzdGVtY3RsIHN0b3AgYXJvcnAuc2VydmljZSB8fCB0cnVlCgp5dW0gLXkgdXBkYXRlIC14IFdBTGludXhBZ2VudAoKcnBtIC0taW1wb3J0IGh0dHBzOi8vZGwuZmVkb3JhcHJvamVjdC5vcmcvcHViL2VwZWwvUlBNLUdQRy1LRVktRVBFTC04Cgp5dW0gLXkgaW5zdGFsbCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL2VwZWwtcmVsZWFzZS1sYXRlc3QtOC5ub2FyY2gucnBtIHx8IHRydWUKCmNhdCA+L2V0Yy95dW0ucmVwb3MuZC9henVyZS1jbGkucmVwbyA8PCdFT0YnClthenVyZWNvcmVdCm5hbWU9YXp1cmVjb3JlCmJhc2V1cmw9aHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL3l1bXJlcG9zL2F6dXJlY29yZQplbmFibGVkPXllcwpncGdjaGVjaz1ubwpFT0YKCnl1bSAteSBpbnN0YWxsIGF6c2VjLWNsYW1hdiBhenNlYy1tb25pdG9yIGF6dXJlLW1kc2QgYXp1cmUtc2VjdXJpdHkgcG9kbWFuLWRvY2tlcgoKZmlyZXdhbGwtY21kIC0tYWRkLXBvcnQ9NDQzL3RjcCAtLXBlcm1hbmVudAoKaWYgW1sgLW4gIiRSUElNQUdFQVVUSCIgXV07IHRoZW4KICBta2RpciAtcCAvcm9vdC8uZG9ja2VyCgogIGNhdCA+L3Jvb3QvLmRvY2tlci9jb25maWcuanNvbiA8PEVPRgp7CgkiYXV0aHMiOiB7CgkJIiR7UlBJTUFHRSUlLyp9IjogewoJCQkiYXV0aCI6ICIkUlBJTUFHRUFVVEgiCgkJfQoJfQp9CkVPRgoKZWxzZQogIHJtIC1yZiAvcm9vdC8uZG9ja2VyCmZpCgpta2RpciAtcCAvZXRjL21kbQplY2hvICIkTURNQ0VSVElGSUNBVEUiID4vZXRjL21kbS9jZXJ0LnBlbQplY2hvICIkTURNUFJJVkFURUtFWSIgPi9ldGMvbWRtL2tleS5wZW0KY2hvd24gLVIgMTAwMDoxMDAwIC9ldGMvbWRtCmNobW9kIDA2MDAgL2V0Yy9tZG0va2V5LnBlbQoKY2F0ID4vZXRjL3N5c2NvbmZpZy9tZG0gPDxFT0YKTURNSU1BR0U9J2Fyb3N2Yy5henVyZWNyLmlvL21kbToyMDE5LjgwMS4xMjI4LTY2Y2FjMScKRU9GCgpjYXQgPi9ldGMvc3lzY29uZmlnL2Fyb3JwIDw8RU9GClBVTExfU0VDUkVUPSckUFVMTFNFQ1JFVCcKUlBJTUFHRT0nJFJQSU1BR0UnCkVPRgoKY2F0ID4vZXRjL3N5c3RlbWQvc3lzdGVtL21kbS5zZXJ2aWNlIDw8RU9GCltVbml0XQoKW1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9tZG0KRXhlY1N0YXJ0UHJlPS0vdXNyL2Jpbi9kb2NrZXIgcm0gLWYgJU4KRXhlY1N0YXJ0UHJlPS91c3IvYmluL2RvY2tlciBwdWxsIFwkTURNSU1BR0UKRXhlY1N0YXJ0PS91c3IvYmluL2RvY2tlciBydW4gXAogIC0taG9zdG5hbWUgJUggXAogIC0tbmFtZSAlTiBcCiAgLS1ybSBcCiAgLXYgL2V0Yy9tZG06L2V0Yy9tZG0gXAogIC12IC92YXIvZXR3Oi92YXIvZXR3IFwKICBcJE1ETUlNQUdFCiAgLUZyb250RW5kVXJsIFwkTURNRlJPTlRFTkRVUkwKICAtTW9uaXRvcmluZ0FjY291bnQgXCRNRE1NT05JVE9SSU5HQUNDT1VOVAogIC1NZXRyaWNOYW1lc3BhY2UgXCRNRE1NRVRSSUNOQU1FU1BBQ0UKICAtQ2VydEZpbGUgL2V0Yy9tZG0vY2VydC5wZW0KICAtUHJpdmF0ZUtleUZpbGUgL2V0Yy9tZG0va2V5LnBlbQpFeGVjU3RvcD0vdXNyL2Jpbi9kb2NrZXIgc3RvcCAlTgpSZXN0YXJ0PWFsd2F5cwoKW0luc3RhbGxdCldhbnRlZEJ5PW11bHRpLXVzZXIudGFyZ2V0CkVPRgoKY2F0ID4vZXRjL3N5c3RlbWQvc3lzdGVtL2Fyb3JwLnNlcnZpY2UgPDxFT0YKW1VuaXRdCgpbU2VydmljZV0KRW52aXJvbm1lbnRGaWxlPS9ldGMvc3lzY29uZmlnL2Fyb3JwCkV4ZWNTdGFydFByZT0tL3Vzci9iaW4vZG9ja2VyIHJtIC1mICVOCkV4ZWNTdGFydFByZT0vdXNyL2Jpbi9kb2NrZXIgcHVsbCBcJFJQSU1BR0UKRXhlY1N0YXJ0PS91c3IvYmluL2RvY2tlciBydW4gXAogIC0taG9zdG5hbWUgJUggXAogIC0tbmFtZSAlTiBcCiAgLS1ybSBcCiAgLWUgUFVMTF9TRUNSRVQgXAogIC1wIDQ0Mzo4NDQzIFwKICBcJFJQSU1BR0UgXAogIHJwCkV4ZWNTdG9wPS91c3IvYmluL2RvY2tlciBzdG9wIC10IDkwICVOClJlc3RhcnQ9YWx3YXlzCgpbSW5zdGFsbF0KV2FudGVkQnk9bXVsdGktdXNlci50YXJnZXQKRU9GCgpmb3Igc2VydmljZSBpbiBhcm9ycCBjaHJvbnlkIG1kbTsgZG8KICBzeXN0ZW1jdGwgZW5hYmxlICRzZXJ2aWNlLnNlcnZpY2UKZG9uZQoKY2hjb24gLVIgc3lzdGVtX3U6b2JqZWN0X3I6dmFyX2xvZ190OnMwIC92YXIvb3B0L21pY3Jvc29mdC9saW51eG1vbmFnZW50Cgpmb3Igc2VydmljZSBpbiBhdW9tcyBhenNlY2QgYXpzZWNtb25kIG1kc2QgbWRtOyBkbwogIHN5c3RlbWN0bCBkaXNhYmxlICRzZXJ2aWNlLnNlcnZpY2UKICBzeXN0ZW1jdGwgbWFzayAkc2VydmljZS5zZXJ2aWNlCmRvbmUKCnJtIC9ldGMvcnN5c2xvZ2QuMTAtbWRzZC5jb25mCgpybSAvZXRjL21vdGQuZC8qCj4vZXRjL2NvbnRhaW5lcnMvbm9kb2NrZXIKCihzbGVlcCAzMDsgcmVib290KSAmCg==')))]"
"script": "[base64(concat(base64ToString('c2V0IC1leAoK'),'MDMCERTIFICATE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmCertificate')),''')\n','MDMFRONTENDURL=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmFrontendUrl')),''')\n','MDMMETRICNAMESPACE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmMetricNamespace')),''')\n','MDMMONITORINGACCOUNT=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmMonitoringAccount')),''')\n','MDMPRIVATEKEY=$(base64 -d \u003c\u003c\u003c''',base64(parameters('mdmPrivateKey')),''')\n','PULLSECRET=$(base64 -d \u003c\u003c\u003c''',base64(parameters('pullSecret')),''')\n','RPIMAGE=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpImage')),''')\n','RPIMAGEAUTH=$(base64 -d \u003c\u003c\u003c''',base64(parameters('rpImageAuth')),''')\n','\n',base64ToString('c3lzdGVtY3RsIHN0b3AgYXJvcnAuc2VydmljZSB8fCB0cnVlCgp5dW0gLXkgdXBkYXRlIC14IFdBTGludXhBZ2VudAoKcnBtIC0taW1wb3J0IGh0dHBzOi8vZGwuZmVkb3JhcHJvamVjdC5vcmcvcHViL2VwZWwvUlBNLUdQRy1LRVktRVBFTC04Cgp5dW0gLXkgaW5zdGFsbCBodHRwczovL2RsLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9lcGVsL2VwZWwtcmVsZWFzZS1sYXRlc3QtOC5ub2FyY2gucnBtIHx8IHRydWUKCmNhdCA+L2V0Yy95dW0ucmVwb3MuZC9henVyZS1jbGkucmVwbyA8PCdFT0YnClthenVyZWNvcmVdCm5hbWU9YXp1cmVjb3JlCmJhc2V1cmw9aHR0cHM6Ly9wYWNrYWdlcy5taWNyb3NvZnQuY29tL3l1bXJlcG9zL2F6dXJlY29yZQplbmFibGVkPXllcwpncGdjaGVjaz1ubwpFT0YKCnl1bSAteSBpbnN0YWxsIGF6c2VjLWNsYW1hdiBhenNlYy1tb25pdG9yIGF6dXJlLW1kc2QgYXp1cmUtc2VjdXJpdHkgcG9kbWFuLWRvY2tlcgoKZmlyZXdhbGwtY21kIC0tYWRkLXBvcnQ9NDQzL3RjcCAtLXBlcm1hbmVudAoKaWYgW1sgLW4gIiRSUElNQUdFQVVUSCIgXV07IHRoZW4KICBta2RpciAtcCAvcm9vdC8uZG9ja2VyCgogIGNhdCA+L3Jvb3QvLmRvY2tlci9jb25maWcuanNvbiA8PEVPRgp7CgkiYXV0aHMiOiB7CgkJIiR7UlBJTUFHRSUlLyp9IjogewoJCQkiYXV0aCI6ICIkUlBJTUFHRUFVVEgiCgkJfQoJfQp9CkVPRgoKZWxzZQogIHJtIC1yZiAvcm9vdC8uZG9ja2VyCmZpCgpta2RpciAtcCAvZXRjL21kbQplY2hvICIkTURNQ0VSVElGSUNBVEUiID4vZXRjL21kbS9jZXJ0LnBlbQplY2hvICIkTURNUFJJVkFURUtFWSIgPi9ldGMvbWRtL2tleS5wZW0KY2hvd24gLVIgMTAwMDoxMDAwIC9ldGMvbWRtCmNobW9kIDA2MDAgL2V0Yy9tZG0va2V5LnBlbQoKY2F0ID4vZXRjL3N5c2NvbmZpZy9tZG0gPDxFT0YKTURNSU1BR0U9J2Fyb3N2Yy5henVyZWNyLmlvL21kbToyMDE5LjgwMS4xMjI4LTY2Y2FjMScKRU9GCgpjYXQgPi9ldGMvc3lzY29uZmlnL2Fyb3JwIDw8RU9GClBVTExfU0VDUkVUPSckUFVMTFNFQ1JFVCcKUlBJTUFHRT0nJFJQSU1BR0UnCkVPRgoKY2F0ID4vZXRjL3N5c3RlbWQvc3lzdGVtL21kbS5zZXJ2aWNlIDw8RU9GCltVbml0XQoKW1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9tZG0KRXhlY1N0YXJ0UHJlPS0vdXNyL2Jpbi9kb2NrZXIgcm0gLWYgJU4KRXhlY1N0YXJ0UHJlPS91c3IvYmluL2RvY2tlciBwdWxsIFwkTURNSU1BR0UKRXhlY1N0YXJ0PS91c3IvYmluL2RvY2tlciBydW4gXAogIC0taG9zdG5hbWUgJUggXAogIC0tbmFtZSAlTiBcCiAgLS1ybSBcCiAgLXYgL2V0Yy9tZG06L2V0Yy9tZG0gXAogIC12IC92YXIvZXR3Oi92YXIvZXR3IFwKICBcJE1ETUlNQUdFIFwKICAtRnJvbnRFbmRVcmwgXCRNRE1GUk9OVEVORFVSTCBcCiAgLU1vbml0b3JpbmdBY2NvdW50IFwkTURNTU9OSVRPUklOR0FDQ09VTlQgXAogIC1NZXRyaWNOYW1lc3BhY2UgXCRNRE1NRVRSSUNOQU1FU1BBQ0UgXAogIC1DZXJ0RmlsZSAvZXRjL21kbS9jZXJ0LnBlbSBcCiAgLVByaXZhdGVLZXlGaWxlIC9ldGMvbWRtL2tleS5wZW0KRXhlY1N0b3A9L3Vzci9iaW4vZG9ja2VyIHN0b3AgJU4KUmVzdGFydD1hbHdheXMKCltJbnN0YWxsXQpXYW50ZWRCeT1tdWx0aS11c2VyLnRhcmdldApFT0YKCmNhdCA+L2V0Yy9zeXN0ZW1kL3N5c3RlbS9hcm9ycC5zZXJ2aWNlIDw8RU9GCltVbml0XQoKW1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9hcm9ycApFeGVjU3RhcnRQcmU9LS91c3IvYmluL2RvY2tlciBybSAtZiAlTgpFeGVjU3RhcnRQcmU9L3Vzci9iaW4vZG9ja2VyIHB1bGwgXCRSUElNQUdFCkV4ZWNTdGFydD0vdXNyL2Jpbi9kb2NrZXIgcnVuIFwKICAtLWhvc3RuYW1lICVIIFwKICAtLW5hbWUgJU4gXAogIC0tcm0gXAogIC1lIFBVTExfU0VDUkVUIFwKICAtcCA0NDM6ODQ0MyBcCiAgXCRSUElNQUdFIFwKICBycApFeGVjU3RvcD0vdXNyL2Jpbi9kb2NrZXIgc3RvcCAtdCA5MCAlTgpSZXN0YXJ0PWFsd2F5cwoKW0luc3RhbGxdCldhbnRlZEJ5PW11bHRpLXVzZXIudGFyZ2V0CkVPRgoKZm9yIHNlcnZpY2UgaW4gYXJvcnAgY2hyb255ZDsgZG8KICBzeXN0ZW1jdGwgZW5hYmxlICRzZXJ2aWNlLnNlcnZpY2UKZG9uZQoKY2hjb24gLVIgc3lzdGVtX3U6b2JqZWN0X3I6dmFyX2xvZ190OnMwIC92YXIvb3B0L21pY3Jvc29mdC9saW51eG1vbmFnZW50Cgpmb3Igc2VydmljZSBpbiBhdW9tcyBhenNlY2QgYXpzZWNtb25kIG1kc2Q7IGRvCiAgc3lzdGVtY3RsIGRpc2FibGUgJHNlcnZpY2Uuc2VydmljZQogIHN5c3RlbWN0bCBtYXNrICRzZXJ2aWNlLnNlcnZpY2UKZG9uZQoKcm0gL2V0Yy9yc3lzbG9nZC4xMC1tZHNkLmNvbmYKCnJtIC9ldGMvbW90ZC5kLyoKPi9ldGMvY29udGFpbmVycy9ub2RvY2tlcgoKKHNsZWVwIDMwOyByZWJvb3QpICYK')))]"
}
}
}

6
pkg/deploy/rp.go
Просмотреть файл

@ -389,6 +389,11 @@ rm /etc/motd.d/*
Primary: to.BoolPtr(true),
PublicIPAddressConfiguration: &mgmtcompute.VirtualMachineScaleSetPublicIPAddressConfiguration{
Name: to.StringPtr("rp-vmss-pip"),
VirtualMachineScaleSetPublicIPAddressConfigurationProperties: &mgmtcompute.VirtualMachineScaleSetPublicIPAddressConfigurationProperties{
DNSSettings: &mgmtcompute.VirtualMachineScaleSetPublicIPAddressConfigurationDNSSettings{
DomainNameLabel: to.StringPtr("[parameters('vmssDomainNameLabel')]"),
},
},
},
LoadBalancerBackendAddressPools: &[]mgmtcompute.SubResource{
{
@ -776,6 +781,7 @@ func (g *generator) template() *arm.Template {
"rpImage",
"rpImageAuth",
"sshPublicKey",
"vmssDomainNameLabel",
)
} else {
params = append(params,