зеркало из https://github.com/Azure/acs-engine.git
create cgroups needed by kubelet's --system-reserved and --kube-reserved flags (#3915)
This commit is contained in:
Родитель
144a58a982
Коммит
514dfda3a8
|
@ -15,6 +15,13 @@ write_files:
|
|||
content: !!binary |
|
||||
{{WrapAsVariable "sshdConfig"}}
|
||||
|
||||
- path: "/etc/systemd/system.conf"
|
||||
permissions: "0644"
|
||||
encoding: gzip
|
||||
owner: "root"
|
||||
content: !!binary |
|
||||
{{WrapAsVariable "systemConf"}}
|
||||
|
||||
- path: "/opt/azure/containers/provision_installs.sh"
|
||||
permissions: "0744"
|
||||
encoding: gzip
|
||||
|
|
|
@ -21,6 +21,13 @@ write_files:
|
|||
content: !!binary |
|
||||
{{WrapAsVariable "sshdConfig"}}
|
||||
|
||||
- path: "/etc/systemd/system.conf"
|
||||
permissions: "0644"
|
||||
encoding: gzip
|
||||
owner: "root"
|
||||
content: !!binary |
|
||||
{{WrapAsVariable "systemConf"}}
|
||||
|
||||
- path: "/opt/azure/containers/provision_installs.sh"
|
||||
permissions: "0744"
|
||||
encoding: gzip
|
||||
|
|
|
@ -21,6 +21,13 @@ write_files:
|
|||
content: !!binary |
|
||||
{{WrapAsVariable "sshdConfig"}}
|
||||
|
||||
- path: "/etc/systemd/system.conf"
|
||||
permissions: "0644"
|
||||
encoding: gzip
|
||||
owner: "root"
|
||||
content: !!binary |
|
||||
{{WrapAsVariable "systemConf"}}
|
||||
|
||||
- path: "/opt/azure/containers/provision_installs.sh"
|
||||
permissions: "0744"
|
||||
encoding: gzip
|
||||
|
|
|
@ -139,6 +139,7 @@
|
|||
"mountetcdScript": "{{GetKubernetesB64Mountetcd}}",
|
||||
"customSearchDomainsScript": "{{GetKubernetesB64CustomSearchDomainsScript}}",
|
||||
"sshdConfig": "{{GetB64sshdConfig}}",
|
||||
"systemConf": "{{GetB64systemConf}}",
|
||||
{{if not IsOpenShift}}
|
||||
"provisionScriptParametersCommon": "[concat('ADMINUSER=',parameters('linuxAdminUsername'),' ETCD_DOWNLOAD_URL=',parameters('etcdDownloadURLBase'),' ETCD_VERSION=',parameters('etcdVersion'),' DOCKER_ENGINE_VERSION=',parameters('dockerEngineVersion'),' DOCKER_REPO=',parameters('dockerEngineDownloadRepo'),' TENANT_ID=',variables('tenantID'),' KUBERNETES_VERSION={{.OrchestratorProfile.OrchestratorVersion}} HYPERKUBE_URL=',parameters('kubernetesHyperkubeSpec'),' APISERVER_PUBLIC_KEY=',parameters('apiserverCertificate'),' SUBSCRIPTION_ID=',variables('subscriptionId'),' RESOURCE_GROUP=',variables('resourceGroup'),' LOCATION=',variables('location'),' VM_TYPE=',variables('vmType'),' SUBNET=',variables('subnetName'),' NETWORK_SECURITY_GROUP=',variables('nsgName'),' VIRTUAL_NETWORK=',variables('virtualNetworkName'),' VIRTUAL_NETWORK_RESOURCE_GROUP=',variables('virtualNetworkResourceGroupName'),' ROUTE_TABLE=',variables('routeTableName'),' PRIMARY_AVAILABILITY_SET=',variables('primaryAvailabilitySetName'),' PRIMARY_SCALE_SET=',variables('primaryScaleSetName'),' SERVICE_PRINCIPAL_CLIENT_ID=',variables('servicePrincipalClientId'),' SERVICE_PRINCIPAL_CLIENT_SECRET=',variables('singleQuote'),variables('servicePrincipalClientSecret'),variables('singleQuote'),' KUBELET_PRIVATE_KEY=',parameters('clientPrivateKey'),' TARGET_ENVIRONMENT=',parameters('targetEnvironment'),' NETWORK_PLUGIN=',parameters('networkPlugin'),' VNET_CNI_PLUGINS_URL=',parameters('vnetCniLinuxPluginsURL'),' CNI_PLUGINS_URL=',parameters('cniPluginsURL'),' CLOUDPROVIDER_BACKOFF=',toLower(string(parameters('cloudproviderConfig').cloudProviderBackoff)),' CLOUDPROVIDER_BACKOFF_RETRIES=',parameters('cloudproviderConfig').cloudProviderBackoffRetries,' CLOUDPROVIDER_BACKOFF_EXPONENT=',parameters('cloudproviderConfig').cloudProviderBackoffExponent,' CLOUDPROVIDER_BACKOFF_DURATION=',parameters('cloudproviderConfig').cloudProviderBackoffDuration,' CLOUDPROVIDER_BACKOFF_JITTER=',parameters('cloudproviderConfig').cloudProviderBackoffJitter,' CLOUDPROVIDER_RATELIMIT=',toLower(string(parameters('cloudproviderConfig').cloudProviderRatelimit)),' CLOUDPROVIDER_RATELIMIT_QPS=',parameters('cloudproviderConfig').cloudProviderRatelimitQPS,' CLOUDPROVIDER_RATELIMIT_BUCKET=',parameters('cloudproviderConfig').cloudProviderRatelimitBucket,' USE_MANAGED_IDENTITY_EXTENSION=',variables('useManagedIdentityExtension'),' USER_ASSIGNED_IDENTITY_ID=',variables('userAssignedClientID'),' USE_INSTANCE_METADATA=',variables('useInstanceMetadata'),' LOAD_BALANCER_SKU=',variables('loadBalancerSku'),' EXCLUDE_MASTER_FROM_STANDARD_LB=',variables('excludeMasterFromStandardLB'),' CONTAINER_RUNTIME=',parameters('containerRuntime'),' CONTAINERD_DOWNLOAD_URL_BASE=',parameters('containerdDownloadURLBase'),' POD_INFRA_CONTAINER_SPEC=',parameters('kubernetesPodInfraContainerSpec'),' KMS_PROVIDER_VAULT_NAME=',variables('clusterKeyVaultName'))]",
|
||||
{{if not IsHostedMaster}}
|
||||
|
|
|
@ -0,0 +1,60 @@
|
|||
# This file is part of systemd.
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation; either version 2.1 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Entries in this file show the compile time defaults.
|
||||
# You can change settings by editing this file.
|
||||
# Defaults can be restored by simply deleting this file.
|
||||
#
|
||||
# See systemd-system.conf(5) for details.
|
||||
|
||||
[Manager]
|
||||
#LogLevel=info
|
||||
#LogTarget=journal-or-kmsg
|
||||
#LogColor=yes
|
||||
#LogLocation=no
|
||||
#DumpCore=yes
|
||||
#ShowStatus=yes
|
||||
#CrashChangeVT=no
|
||||
#CrashShell=no
|
||||
#CrashReboot=no
|
||||
#CPUAffinity=1 2
|
||||
JoinControllers=cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory
|
||||
#RuntimeWatchdogSec=0
|
||||
#ShutdownWatchdogSec=10min
|
||||
#CapabilityBoundingSet=
|
||||
#SystemCallArchitectures=
|
||||
#TimerSlackNSec=
|
||||
#DefaultTimerAccuracySec=1min
|
||||
#DefaultStandardOutput=journal
|
||||
#DefaultStandardError=inherit
|
||||
#DefaultTimeoutStartSec=90s
|
||||
#DefaultTimeoutStopSec=90s
|
||||
#DefaultRestartSec=100ms
|
||||
#DefaultStartLimitInterval=10s
|
||||
#DefaultStartLimitBurst=5
|
||||
#DefaultEnvironment=
|
||||
#DefaultCPUAccounting=no
|
||||
#DefaultBlockIOAccounting=no
|
||||
#DefaultMemoryAccounting=no
|
||||
#DefaultTasksAccounting=no
|
||||
#DefaultTasksMax=
|
||||
#DefaultLimitCPU=
|
||||
#DefaultLimitFSIZE=
|
||||
#DefaultLimitDATA=
|
||||
#DefaultLimitSTACK=
|
||||
#DefaultLimitCORE=
|
||||
#DefaultLimitRSS=
|
||||
#DefaultLimitNOFILE=
|
||||
#DefaultLimitAS=
|
||||
#DefaultLimitNPROC=
|
||||
#DefaultLimitMEMLOCK=
|
||||
#DefaultLimitLOCKS=
|
||||
#DefaultLimitSIGPENDING=
|
||||
#DefaultLimitMSGQUEUE=
|
||||
#DefaultLimitNICE=
|
||||
#DefaultLimitRTPRIO=
|
||||
#DefaultLimitRTTIME=
|
|
@ -230,6 +230,7 @@ const (
|
|||
openshift39NodeScript = "openshift/release-3.9/openshiftnodescript.sh"
|
||||
openshift39MasterScript = "openshift/release-3.9/openshiftmasterscript.sh"
|
||||
sshdConfig = "k8s/sshd_config"
|
||||
systemConf = "k8s/system.conf"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
@ -611,6 +611,9 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
|
|||
"GetB64sshdConfig": func() string {
|
||||
return getBase64CustomScript(sshdConfig)
|
||||
},
|
||||
"GetB64systemConf": func() string {
|
||||
return getBase64CustomScript(systemConf)
|
||||
},
|
||||
"GetKubernetesMasterPreprovisionYaml": func() string {
|
||||
str := ""
|
||||
if cs.Properties.MasterProfile.PreprovisionExtension != nil {
|
||||
|
|
Загрузка…
Ссылка в новой задаче