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

Add RHEL support for Swarm Mode (#1455) 

* Added support for Swarm Mode on RHEL

* Add RHEL support to classic and vmas

* Fix OS image parameters for classic swarm
This commit is contained in:
Thomas Conté 2017-09-20 23:09:25 +02:00 коммит произвёл Jack Francis
Родитель 521584a3f1
Коммит 24a6467e97
18 изменённых файлов: 389 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

38
examples/swarmmode-rhel.json Normal file
Просмотреть файл

@ -0,0 +1,38 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "SwarmMode"
},
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2",
"distro": "rhel"
},
"agentPoolProfiles": [
{
"name": "agentpublic",
"count": 3,
"vmSize": "Standard_D2_v2",
"dnsPrefix": "",
"ports": [
80,
443,
8080
],
"distro": "rhel"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
}
}
}

62
parts/configure-swarmmode-cluster.sh
Просмотреть файл

@ -33,6 +33,7 @@ DOCKERCOMPOSEDOWNLOADURL=${10}
VMNAME=`hostname`
VMNUMBER=`echo $VMNAME | sed 's/.*[^0-9]\([0-9]\+\)*$/\1/'`
VMPREFIX=`echo $VMNAME | sed 's/\(.*[^0-9]\)*[0-9]\+$/\1/'`
OS="$(. /etc/os-release; echo $ID)"
echo "Master Count: $MASTERCOUNT"
echo "Master Prefix: $MASTERPREFIX"
@ -41,11 +42,32 @@ echo "vmname: $VMNAME"
echo "VMNUMBER: $VMNUMBER, VMPREFIX: $VMPREFIX"
echo "BASESUBNET: $BASESUBNET"
echo "AZUREUSER: $AZUREUSER"
echo "OS ID: $OS"
###################
# Common Functions
###################
isUbuntu()
{
if [ "$OS" == "ubuntu" ]
then
return 0
else
return 1
fi
}
isRHEL()
{
if [ "$OS" == "rhel" ]
then
return 0
else
return 1
fi
}
ensureAzureNetwork()
{
# ensure the network works
@ -150,7 +172,7 @@ fi
echo "Installing and configuring Docker"
installDocker()
installDockerUbuntu()
{
for i in {1..10}; do
apt-get install -y apt-transport-https ca-certificates curl software-properties-common
@ -168,6 +190,36 @@ installDocker()
sleep 10
done
}
installDockerRHEL()
{
for i in {1..10}; do
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
yum makecache fast
yum -y install docker-ce
if [ $? -eq 0 ]
then
systemctl enable docker
systemctl start docker
echo "Docker installed successfully"
break
fi
sleep 10
done
}
installDocker()
{
if isUbuntu ; then
installDockerUbuntu
elif isRHEL ; then
installDockerRHEL
else
echo "OS not supported, aborting install"
exit 5
fi
}
time installDocker
sudo usermod -aG docker $AZUREUSER
@ -205,6 +257,14 @@ installDockerCompose()
time installDockerCompose
chmod +x /usr/local/bin/docker-compose
if ismaster && isRHEL ; then
echo "Opening Docker ports"
firewall-cmd --add-port=2375/tcp --permanent
firewall-cmd --add-port=2377/tcp --permanent
firewall-cmd --reload
fi
echo "Restarting Docker"
sudo systemctl daemon-reload
sudo service docker restart

22
parts/swarmagentresourcesclassic.t
Просмотреть файл

@ -128,7 +128,9 @@
"adminUsername": "[variables('adminUsername')]",
"computerNamePrefix": "[variables('{{.Name}}VMNamePrefix')]",
{{if IsSwarmMode}}
{{if not .IsRHEL}}
{{GetAgentSwarmModeCustomData .}}
{{end}}
{{else}}
{{GetAgentSwarmCustomData .}}
{{end}}
@ -170,6 +172,26 @@
{{end}}
}
}
{{if .IsRHEL}}
,"extensionProfile": {
"extensions": [
{
"name": "configure{{.Name}}",
"properties": {
"publisher": "Microsoft.Azure.Extensions",
"settings": {
"commandToExecute": "[variables('agentCustomScript')]",
"fileUris": [
"[concat('{{ GetConfigurationScriptRootURL }}', variables('configureClusterScriptFile'))]"
]
},
"type": "CustomScript",
"typeHandlerVersion": "2.0"
}
}
]
}
{{end}}
}
},
"sku": {

36
parts/swarmagentresourcesvmas.t
Просмотреть файл

@ -182,7 +182,9 @@
"adminUsername": "[variables('adminUsername')]",
"computername": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]",
{{if IsSwarmMode}}
{{if not .IsRHEL}}
{{GetAgentSwarmModeCustomData .}}
{{end}}
{{else}}
{{GetAgentSwarmCustomData .}}
{{end}}
@ -205,10 +207,10 @@
"storageProfile": {
{{GetDataDisks .}}
"imageReference": {
"offer": "[variables('osImageOffer')]",
"publisher": "[variables('osImagePublisher')]",
"sku": "[variables('osImageSKU')]",
"version": "[variables('osImageVersion')]"
"offer": "[variables('{{.Name}}OSImageOffer')]",
"publisher": "[variables('{{.Name}}OSImagePublisher')]",
"sku": "[variables('{{.Name}}OSImageSKU')]",
"version": "[variables('{{.Name}}OSImageVersion')]"
}
,"osDisk": {
@ -228,3 +230,29 @@
},
"type": "Microsoft.Compute/virtualMachines"
}
{{if .IsRHEL}}
,{
"apiVersion": "[variables('apiVersionDefault')]",
"copy": {
"count": "[variables('{{.Name}}Count')]",
"name": "vmLoopNode"
},
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset'))))]"
],
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')), '/configureagent')]",
"properties": {
"publisher": "Microsoft.Azure.Extensions",
"settings": {
"commandToExecute": "[variables('agentCustomScript')]",
"fileUris": [
"[concat('{{ GetConfigurationScriptRootURL }}', variables('configureClusterScriptFile'))]"
]
},
"type": "CustomScript",
"typeHandlerVersion": "2.0"
},
"type": "Microsoft.Compute/virtualMachines/extensions"
}
{{end}}

30
parts/swarmagentresourcesvmss.t
Просмотреть файл

@ -127,7 +127,9 @@
"adminUsername": "[variables('adminUsername')]",
"computerNamePrefix": "[variables('{{.Name}}VMNamePrefix')]",
{{if IsSwarmMode}}
{{if not .IsRHEL}}
{{GetAgentSwarmModeCustomData .}}
{{end}}
{{else}}
{{GetAgentSwarmCustomData .}}
{{end}}
@ -149,10 +151,10 @@
},
"storageProfile": {
"imageReference": {
"offer": "[variables('osImageOffer')]",
"publisher": "[variables('osImagePublisher')]",
"sku": "[variables('osImageSKU')]",
"version": "[variables('osImageVersion')]"
"offer": "[variables('{{.Name}}OSImageOffer')]",
"publisher": "[variables('{{.Name}}OSImagePublisher')]",
"sku": "[variables('{{.Name}}OSImageSKU')]",
"version": "[variables('{{.Name}}OSImageVersion')]"
},
{{GetDataDisks .}}
"osDisk": {
@ -173,6 +175,26 @@
{{end}}
}
}
{{if .IsRHEL}}
,"extensionProfile": {
"extensions": [
{
"name": "configure{{.Name}}",
"properties": {
"publisher": "Microsoft.Azure.Extensions",
"settings": {
"commandToExecute": "[variables('agentCustomScript')]",
"fileUris": [
"[concat('{{ GetConfigurationScriptRootURL }}', variables('configureClusterScriptFile'))]"
]
},
"type": "CustomScript",
"typeHandlerVersion": "2.0"
}
}
]
}
{{end}}
}
},
"sku": {

13
parts/swarmagentvars.t
Просмотреть файл

@ -1,5 +1,18 @@
{{if not .IsRHEL}}
"{{.Name}}RunCmd": "[concat('runcmd:\n {{GetSwarmAgentPreprovisionExtensionCommands .}} \n- [ /bin/bash, /opt/azure/containers/install-cluster.sh ]\n\n')]",
"{{.Name}}RunCmdFile": "[concat(' - content: |\n #!/bin/bash\n ','sudo mkdir -p /var/log/azure\n ',variables('agentCustomScript'),'\n path: /opt/azure/containers/install-cluster.sh\n permissions: \"0744\"\n')]",
{{end}}
{{if IsSwarmMode }}
"{{.Name}}OSImageOffer": {{GetAgentOSImageOffer .}},
"{{.Name}}OSImagePublisher": {{GetAgentOSImagePublisher .}},
"{{.Name}}OSImageSKU": {{GetAgentOSImageSKU .}},
"{{.Name}}OSImageVersion": {{GetAgentOSImageVersion .}},
{{else}}
"{{.Name}}OSImageOffer": "[variables('osImageOffer')]",
"{{.Name}}OSImagePublisher": "[variables('osImagePublisher')]",
"{{.Name}}OSImageSKU": "[variables('osImageSKU')]",
"{{.Name}}OSImageVersion": "[variables('osImageVersion')]",
{{end}}
"{{.Name}}Count": "[parameters('{{.Name}}Count')]",
"{{.Name}}VMNamePrefix": "[concat(variables('orchestratorName'), '-{{.Name}}-', variables('nameSuffix'))]",
"{{.Name}}VMSize": "[parameters('{{.Name}}VMSize')]",

23
parts/swarmmasterresources.t
Просмотреть файл

@ -206,7 +206,9 @@
"adminUsername": "[variables('adminUsername')]",
"computername": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
{{if .OrchestratorProfile.IsSwarmMode}}
{{GetMasterSwarmModeCustomData}}
{{if not .MasterProfile.IsRHEL}}
{{GetMasterSwarmModeCustomData}}
{{end}}
{{else}}
{{GetMasterSwarmCustomData}}
{{end}}
@ -228,10 +230,17 @@
},
"storageProfile": {
"imageReference": {
{{if .OrchestratorProfile.IsSwarmMode}}
"offer": "[variables('masterOSImageOffer')]",
"publisher": "[variables('masterOSImagePublisher')]",
"sku": "[variables('masterOSImageSKU')]",
"version": "[variables('masterOSImageVersion')]"
{{else}}
"offer": "[variables('osImageOffer')]",
"publisher": "[variables('osImagePublisher')]",
"sku": "[variables('osImageSKU')]",
"version": "[variables('osImageVersion')]"
{{end}}
},
"osDisk": {
"caching": "ReadWrite"
@ -262,13 +271,17 @@
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"publisher": "Microsoft.Azure.Extensions",
"settings": {
"commandToExecute": "[variables('masterCustomScript')]",
"fileUris": []
"fileUris": [
{{if .MasterProfile.IsRHEL}}
"[concat('{{ GetConfigurationScriptRootURL }}', variables('configureClusterScriptFile'))]"
{{end}}
]
},
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4"
"type": "CustomScript",
"typeHandlerVersion": "2.0"
},
"type": "Microsoft.Compute/virtualMachines/extensions"
}

20
parts/swarmmastervars.t
Просмотреть файл

@ -6,7 +6,11 @@
{{else}}
"configureClusterScriptFile": "configure-swarm-cluster.sh",
{{end}}
{{if .MasterProfile.IsRHEL}}
"agentCustomScript": "[concat('/usr/bin/nohup /bin/bash -c \"/bin/bash ',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1 &\" &')]",
{{else}}
"agentCustomScript": "[concat('/usr/bin/nohup /bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1 &\" &')]",
{{end}}
"agentMaxVMs": 100,
"clusterInstallParameters": "[concat(variables('orchestratorVersion'), ' ',variables('dockerComposeVersion'), ' ',variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'),' ', parameters('dockerEngineDownloadRepo'), ' ', parameters('dockerComposeDownloadURL'))]",
{{if .LinuxProfile.HasSecrets}}
@ -36,7 +40,11 @@
{{else}}
"masterCount": {{.MasterProfile.Count}},
{{end}}
{{if .MasterProfile.IsRHEL}}
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash ',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
{{else}}
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
{{end}}
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
"masterLbBackendPoolName": "[concat(variables('orchestratorName'), '-master-pool-', variables('nameSuffix'))]",
"masterLbID": "[resourceId('Microsoft.Network/loadBalancers',variables('masterLbName'))]",
@ -92,15 +100,17 @@
}
]
],
"osImageOffer": "[parameters('osImageOffer')]",
"osImagePublisher": "[parameters('osImagePublisher')]",
{{if .OrchestratorProfile.IsSwarmMode}}
"orchestratorName": "swarmm",
"osImageSKU": "[parameters('osImageSKU')]",
"osImageVersion": "[parameters('osImageVersion')]",
"masterOSImageOffer": {{GetMasterOSImageOffer}},
"masterOSImagePublisher": {{GetMasterOSImagePublisher}},
"masterOSImageSKU": {{GetMasterOSImageSKU}},
"masterOSImageVersion": {{GetMasterOSImageVersion}},
{{GetSwarmModeVersions}}
{{else}}
"orchestratorName": "swarm",
"osImageOffer": "[parameters('osImageOffer')]",
"osImagePublisher": "[parameters('osImagePublisher')]",
"osImageSKU": "14.04.5-LTS",
"osImageVersion": "14.04.201706190",
{{getSwarmVersions}}
@ -169,4 +179,4 @@
]
{{end}}
{{end}}

5
pkg/acsengine/const.go
Просмотреть файл

@ -177,3 +177,8 @@ const (
AzureChinaCloudDCOSBootstrapDownloadURL = "https://acsengine.blob.core.chinacloudapi.cn/dcos/%s.bootstrap.tar.xz"
//AzureEdgeDCOSWindowsBootstrapDownloadURL
)
const (
//DefaultConfigurationScriptRootURL Root URL for configuration script (used for script extension on RHEL)
DefaultConfigurationScriptRootURL = "https://raw.githubusercontent.com/Azure/acs-engine/master/parts/"
)

50
pkg/acsengine/defaults.go
Просмотреть файл

@ -36,14 +36,22 @@ var (
DockerComposeDownloadURL: "https://github.com/docker/compose/releases/download",
}
//DefaultOSImageConfig is the default Linux distribution.
DefaultOSImageConfig = AzureOSImageConfig{
//DefaultUbuntuImageConfig is the default Linux distribution.
DefaultUbuntuImageConfig = AzureOSImageConfig{
ImageOffer: "UbuntuServer",
ImageSku: "16.04-LTS",
ImagePublisher: "Canonical",
ImageVersion: "16.04.201706191",
}
//DefaultRHELOSImageConfig is the RHEL Linux distribution.
DefaultRHELOSImageConfig = AzureOSImageConfig{
ImageOffer: "RHEL",
ImageSku: "7.3",
ImagePublisher: "RedHat",
ImageVersion: "latest",
}
//AzureCloudSpec is the default configurations for global azure.
AzureCloudSpec = AzureEnvironmentSpecConfig{
//DockerSpecConfig specify the docker engine download repo
@ -56,7 +64,10 @@ var (
ResourceManagerVMDNSSuffix: "cloudapp.azure.com",
},
OSImageConfig: DefaultOSImageConfig,
OSImageConfig: map[api.Distro]AzureOSImageConfig{
api.Ubuntu: DefaultUbuntuImageConfig,
api.RHEL: DefaultRHELOSImageConfig,
},
}
//AzureGermanCloudSpec is the German cloud config.
@ -67,11 +78,14 @@ var (
EndpointConfig: AzureEndpointConfig{
ResourceManagerVMDNSSuffix: "cloudapp.microsoftazure.de",
},
OSImageConfig: AzureOSImageConfig{
ImageOffer: "UbuntuServer",
ImageSku: "16.04-LTS",
ImagePublisher: "Canonical",
ImageVersion: "16.04.201701130",
OSImageConfig: map[api.Distro]AzureOSImageConfig{
api.Ubuntu: {
ImageOffer: "UbuntuServer",
ImageSku: "16.04-LTS",
ImagePublisher: "Canonical",
ImageVersion: "16.04.201701130",
},
api.RHEL: DefaultRHELOSImageConfig,
},
}
@ -83,7 +97,10 @@ var (
EndpointConfig: AzureEndpointConfig{
ResourceManagerVMDNSSuffix: "cloudapp.windowsazure.us",
},
OSImageConfig: DefaultOSImageConfig,
OSImageConfig: map[api.Distro]AzureOSImageConfig{
api.Ubuntu: DefaultUbuntuImageConfig,
api.RHEL: DefaultRHELOSImageConfig,
},
}
//AzureChinaCloudSpec is the configurations for Azure China (Mooncake)
@ -111,7 +128,10 @@ var (
EndpointConfig: AzureEndpointConfig{
ResourceManagerVMDNSSuffix: "cloudapp.chinacloudapi.cn",
},
OSImageConfig: DefaultOSImageConfig,
OSImageConfig: map[api.Distro]AzureOSImageConfig{
api.Ubuntu: DefaultUbuntuImageConfig,
api.RHEL: DefaultRHELOSImageConfig,
},
}
)
@ -260,6 +280,12 @@ func setMasterNetworkDefaults(a *api.Properties) {
if a.MasterProfile == nil {
return
}
// Set default Distro to Ubuntu
if a.MasterProfile.Distro == "" {
a.MasterProfile.Distro = api.Ubuntu
}
if !a.MasterProfile.IsCustomVNET() {
if a.OrchestratorProfile.OrchestratorType == api.Kubernetes {
if a.OrchestratorProfile.IsVNETIntegrated() {
@ -318,6 +344,10 @@ func setAgentNetworkDefaults(a *api.Properties) {
if profile.OSType == "" {
profile.OSType = api.Linux
}
// set default Distro to Ubuntu
if profile.Distro == "" {
profile.Distro = api.Ubuntu
}
// Set the default number of IP addresses allocated for agents.
if profile.IPAddressCount == 0 {

68
pkg/acsengine/engine.go
Просмотреть файл

@ -9,6 +9,7 @@ import (
"fmt"
"hash/fnv"
"io/ioutil"
"log"
"math/rand"
"net/http"
"regexp"
@ -271,6 +272,10 @@ func (t *TemplateGenerator) GenerateTemplate(containerService *api.ContainerServ
}
}()
if !ValidateDistro(containerService) {
return templateRaw, parametersRaw, certsGenerated, fmt.Errorf("Invalid distro")
}
var b bytes.Buffer
if err = templ.ExecuteTemplate(&b, baseFile, properties); err != nil {
return templateRaw, parametersRaw, certsGenerated, err
@ -402,6 +407,23 @@ func GetCloudSpecConfig(location string) AzureEnvironmentSpecConfig {
}
}
// ValidateDistro checks if the requested orchestrator type is supported on the requested Linux distro.
func ValidateDistro(cs *api.ContainerService) bool {
// Check Master distro
if cs.Properties.MasterProfile != nil && cs.Properties.MasterProfile.Distro == api.RHEL && cs.Properties.OrchestratorProfile.OrchestratorType != api.SwarmMode {
log.Fatalf("Orchestrator type %s not suported on RHEL Master", cs.Properties.OrchestratorProfile.OrchestratorType)
return false
}
// Check Agent distros
for _, agentProfile := range cs.Properties.AgentPoolProfiles {
if agentProfile.Distro == api.RHEL && cs.Properties.OrchestratorProfile.OrchestratorType != api.SwarmMode {
log.Fatalf("Orchestrator type %s not suported on RHEL Agent", cs.Properties.OrchestratorProfile.OrchestratorType)
return false
}
}
return true
}
// GetCloudTargetEnv determines and returns whether the region is a sovereign cloud which
// have their own data compliance regulations (China/Germany/USGov) or standard
// Azure public cloud
@ -427,10 +449,10 @@ func getParameters(cs *api.ContainerService, isClassicMode bool) (paramsMap, err
// Master Parameters
addValue(parametersMap, "location", location)
addValue(parametersMap, "osImageOffer", cloudSpecConfig.OSImageConfig.ImageOffer)
addValue(parametersMap, "osImageSKU", cloudSpecConfig.OSImageConfig.ImageSku)
addValue(parametersMap, "osImagePublisher", cloudSpecConfig.OSImageConfig.ImagePublisher)
addValue(parametersMap, "osImageVersion", cloudSpecConfig.OSImageConfig.ImageVersion)
addValue(parametersMap, "osImageOffer", cloudSpecConfig.OSImageConfig[api.Ubuntu].ImageOffer)
addValue(parametersMap, "osImageSKU", cloudSpecConfig.OSImageConfig[api.Ubuntu].ImageSku)
addValue(parametersMap, "osImagePublisher", cloudSpecConfig.OSImageConfig[api.Ubuntu].ImagePublisher)
addValue(parametersMap, "osImageVersion", cloudSpecConfig.OSImageConfig[api.Ubuntu].ImageVersion)
addValue(parametersMap, "fqdnEndpointSuffix", cloudSpecConfig.EndpointConfig.ResourceManagerVMDNSSuffix)
addValue(parametersMap, "targetEnvironment", GetCloudTargetEnv(location))
addValue(parametersMap, "linuxAdminUsername", properties.LinuxProfile.AdminUsername)
@ -1028,6 +1050,44 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
"HasWindowsSecrets": func() bool {
return cs.Properties.WindowsProfile.HasSecrets()
},
"GetConfigurationScriptRootURL": func() string {
if cs.Properties.LinuxProfile.ScriptRootURL == "" {
return DefaultConfigurationScriptRootURL
}
return cs.Properties.LinuxProfile.ScriptRootURL
},
"GetMasterOSImageOffer": func() string {
cloudSpecConfig := GetCloudSpecConfig(cs.Location)
return fmt.Sprintf("\"%s\"", cloudSpecConfig.OSImageConfig[cs.Properties.MasterProfile.Distro].ImageOffer)
},
"GetMasterOSImagePublisher": func() string {
cloudSpecConfig := GetCloudSpecConfig(cs.Location)
return fmt.Sprintf("\"%s\"", cloudSpecConfig.OSImageConfig[cs.Properties.MasterProfile.Distro].ImagePublisher)
},
"GetMasterOSImageSKU": func() string {
cloudSpecConfig := GetCloudSpecConfig(cs.Location)
return fmt.Sprintf("\"%s\"", cloudSpecConfig.OSImageConfig[cs.Properties.MasterProfile.Distro].ImageSku)
},
"GetMasterOSImageVersion": func() string {
cloudSpecConfig := GetCloudSpecConfig(cs.Location)
return fmt.Sprintf("\"%s\"", cloudSpecConfig.OSImageConfig[cs.Properties.MasterProfile.Distro].ImageVersion)
},
"GetAgentOSImageOffer": func(profile *api.AgentPoolProfile) string {
cloudSpecConfig := GetCloudSpecConfig(cs.Location)
return fmt.Sprintf("\"%s\"", cloudSpecConfig.OSImageConfig[profile.Distro].ImageOffer)
},
"GetAgentOSImagePublisher": func(profile *api.AgentPoolProfile) string {
cloudSpecConfig := GetCloudSpecConfig(cs.Location)
return fmt.Sprintf("\"%s\"", cloudSpecConfig.OSImageConfig[profile.Distro].ImagePublisher)
},
"GetAgentOSImageSKU": func(profile *api.AgentPoolProfile) string {
cloudSpecConfig := GetCloudSpecConfig(cs.Location)
return fmt.Sprintf("\"%s\"", cloudSpecConfig.OSImageConfig[profile.Distro].ImageSku)
},
"GetAgentOSImageVersion": func(profile *api.AgentPoolProfile) string {
cloudSpecConfig := GetCloudSpecConfig(cs.Location)
return fmt.Sprintf("\"%s\"", cloudSpecConfig.OSImageConfig[profile.Distro].ImageVersion)
},
"PopulateClassicModeDefaultValue": func(attr string) string {
var val string
if !t.ClassicMode {

2
pkg/acsengine/types.go
Просмотреть файл

@ -71,7 +71,7 @@ type AzureEnvironmentSpecConfig struct {
KubernetesSpecConfig KubernetesSpecConfig
DCOSSpecConfig DCOSSpecConfig
EndpointConfig AzureEndpointConfig
OSImageConfig AzureOSImageConfig
OSImageConfig map[api.Distro]AzureOSImageConfig
}
// Context represents the object that is passed to the package

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

@ -20,6 +20,12 @@ const (
Linux OSType = "Linux"
)
// the LinuxDistros supported by vlabs
const (
Ubuntu Distro = "ubuntu"
RHEL Distro = "rhel"
)
const (
// SwarmVersion is the Swarm orchestrator version
SwarmVersion = "swarm:1.1.0"

3
pkg/api/converterfromapi.go
Просмотреть файл

@ -548,6 +548,7 @@ func convertLinuxProfileToVLabs(obj *LinuxProfile, vlabsProfile *vlabs.LinuxProf
convertKeyVaultSecretsToVlabs(&s, secret)
vlabsProfile.Secrets = append(vlabsProfile.Secrets, *secret)
}
vlabsProfile.ScriptRootURL = obj.ScriptRootURL
}
func convertWindowsProfileToV20160930(api *WindowsProfile, v20160930 *v20160930.WindowsProfile) {
@ -731,6 +732,7 @@ func convertMasterProfileToVLabs(api *MasterProfile, vlabsProfile *vlabs.MasterP
convertExtensionToVLabs(&extension, vlabsExtension)
vlabsProfile.Extensions = append(vlabsProfile.Extensions, *vlabsExtension)
}
vlabsProfile.Distro = vlabs.Distro(api.Distro)
}
func convertKeyVaultSecretsToVlabs(api *KeyVaultSecrets, vlabsSecrets *vlabs.KeyVaultSecrets) {
@ -822,6 +824,7 @@ func convertAgentPoolProfileToVLabs(api *AgentPoolProfile, p *vlabs.AgentPoolPro
convertExtensionToVLabs(&extension, vlabsExtension)
p.Extensions = append(p.Extensions, *vlabsExtension)
}
p.Distro = vlabs.Distro(api.Distro)
}
func convertDiagnosticsProfileToV20160930(api *DiagnosticsProfile, dp *v20160930.DiagnosticsProfile) {

4
pkg/api/convertertoapi.go
Просмотреть файл

@ -473,6 +473,7 @@ func convertVLabsLinuxProfile(vlabs *vlabs.LinuxProfile, api *LinuxProfile) {
convertVLabsKeyVaultSecrets(&s, secret)
api.Secrets = append(api.Secrets, *secret)
}
api.ScriptRootURL = vlabs.ScriptRootURL
}
func convertV20160930WindowsProfile(v20160930 *v20160930.WindowsProfile, api *WindowsProfile) {
@ -719,6 +720,8 @@ func convertVLabsMasterProfile(vlabs *vlabs.MasterProfile, api *MasterProfile) {
convertVLabsExtension(&extension, apiExtension)
api.Extensions = append(api.Extensions, *apiExtension)
}
api.Distro = Distro(vlabs.Distro)
}
func convertV20160930AgentPoolProfile(v20160930 *v20160930.AgentPoolProfile, availabilityProfile string, api *AgentPoolProfile) {
@ -815,6 +818,7 @@ func convertVLabsAgentPoolProfile(vlabs *vlabs.AgentPoolProfile, api *AgentPoolP
convertVLabsExtension(&extension, apiExtension)
api.Extensions = append(api.Extensions, *apiExtension)
}
api.Distro = Distro(vlabs.Distro)
}
func convertVLabsKeyVaultSecrets(vlabs *vlabs.KeyVaultSecrets, api *KeyVaultSecrets) {

19
pkg/api/types.go
Просмотреть файл

@ -98,7 +98,9 @@ type LinuxProfile struct {
SSH struct {
PublicKeys []PublicKey `json:"publicKeys"`
} `json:"ssh"`
Secrets []KeyVaultSecrets `json:"secrets,omitempty"`
Secrets []KeyVaultSecrets `json:"secrets,omitempty"`
Distro Distro `json:"distro,omitempty"`
ScriptRootURL string `json:"scriptroot,omitempty"`
}
// PublicKey represents an SSH key for LinuxProfile
@ -195,6 +197,7 @@ type MasterProfile struct {
OAuthEnabled bool `json:"oauthEnabled"`
PreprovisionExtension *Extension `json:"preProvisionExtension"`
Extensions []Extension `json:"extensions"`
Distro Distro `json:"distro,omitempty"`
// Master LB public endpoint/FQDN with port
// The format will be FQDN:2376
@ -236,6 +239,7 @@ type AgentPoolProfile struct {
VnetSubnetID string `json:"vnetSubnetID,omitempty"`
Subnet string `json:"subnet"`
IPAddressCount int `json:"ipAddressCount,omitempty"`
Distro Distro `json:"distro,omitempty"`
FQDN string `json:"fqdn,omitempty"`
CustomNodeLabels map[string]string `json:"customNodeLabels,omitempty"`
@ -301,6 +305,9 @@ type KeyVaultCertificate struct {
// OSType represents OS types of agents
type OSType string
// Distro represents Linux distro to use for Linux VMs
type Distro string
// HostedMasterProfile defines properties for a hosted master
type HostedMasterProfile struct {
// Master public endpoint/FQDN with port
@ -431,6 +438,11 @@ func (m *MasterProfile) IsStorageAccount() bool {
return m.StorageProfile == StorageAccount
}
// IsRHEL returns true if the master specified a RHEL distro
func (m *MasterProfile) IsRHEL() bool {
return m.Distro == RHEL
}
// IsCustomVNET returns true if the customer brought their own VNET
func (a *AgentPoolProfile) IsCustomVNET() bool {
return len(a.VnetSubnetID) > 0
@ -446,6 +458,11 @@ func (a *AgentPoolProfile) IsLinux() bool {
return a.OSType == Linux
}
// IsRHEL returns true if the agent pool specified a RHEL distro
func (a *AgentPoolProfile) IsRHEL() bool {
return a.OSType == Linux && a.Distro == RHEL
}
// IsAvailabilitySets returns true if the customer specified disks
func (a *AgentPoolProfile) IsAvailabilitySets() bool {
return a.AvailabilityProfile == AvailabilitySet

6
pkg/api/vlabs/const.go
Просмотреть файл

@ -23,6 +23,12 @@ const (
Linux OSType = "Linux"
)
// the LinuxDistros supported by vlabs
const (
Ubuntu Distro = "ubuntu"
RHEL Distro = "rhel"
)
// validation values
const (
// MinAgentCount are the minimum number of agents per agent pool

18
pkg/api/vlabs/types.go
Просмотреть файл

@ -102,7 +102,8 @@ type LinuxProfile struct {
SSH struct {
PublicKeys []PublicKey `json:"publicKeys" validate:"required,len=1"`
} `json:"ssh" validate:"required"`
Secrets []KeyVaultSecrets `json:"secrets,omitempty"`
Secrets []KeyVaultSecrets `json:"secrets,omitempty"`
ScriptRootURL string `json:"scriptroot,omitempty"`
}
// PublicKey represents an SSH key for LinuxProfile
@ -223,6 +224,7 @@ type MasterProfile struct {
OAuthEnabled bool `json:"oauthEnabled"`
PreProvisionExtension *Extension `json:"preProvisionExtension"`
Extensions []Extension `json:"extensions"`
Distro Distro `json:"distro,omitempty"`
// subnet is internal
subnet string
@ -269,6 +271,7 @@ type AgentPoolProfile struct {
DiskSizesGB []int `json:"diskSizesGB,omitempty" validate:"max=4,dive,min=1,max=1023"`
VnetSubnetID string `json:"vnetSubnetID,omitempty"`
IPAddressCount int `json:"ipAddressCount,omitempty" validate:"min=0,max=256"`
Distro Distro `json:"distro,omitempty"`
// subnet is internal
subnet string
@ -317,6 +320,9 @@ type KeyVaultCertificate struct {
// OSType represents OS types of agents
type OSType string
// Distro represents Linux distro to use for Linux VMs
type Distro string
// HasWindows returns true if the cluster contains windows
func (p *Properties) HasWindows() bool {
for _, agentPoolProfile := range p.AgentPoolProfiles {
@ -352,6 +358,11 @@ func (m *MasterProfile) IsStorageAccount() bool {
return m.StorageProfile == StorageAccount
}
// IsRHEL returns true if the master specified a RHEL distro
func (m *MasterProfile) IsRHEL() bool {
return m.Distro == RHEL
}
// IsCustomVNET returns true if the customer brought their own VNET
func (a *AgentPoolProfile) IsCustomVNET() bool {
return len(a.VnetSubnetID) > 0
@ -367,6 +378,11 @@ func (a *AgentPoolProfile) IsLinux() bool {
return a.OSType == Linux
}
// IsRHEL returns true if the agent pool specified a RHEL distro
func (a *AgentPoolProfile) IsRHEL() bool {
return a.OSType == Linux && a.Distro == RHEL
}
// IsAvailabilitySets returns true if the customer specified disks
func (a *AgentPoolProfile) IsAvailabilitySets() bool {
return a.AvailabilityProfile == AvailabilitySet