Skip to content

[Do not merge] Merge all ACI commits from yangl900/acs-engine #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juhacket wants to merge 12 commits into
base: master-azure-latest
Choose a base branch
from
Open

[Do not merge] Merge all ACI commits from yangl900/acs-engine #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
91de664
Merge all ACI commits from yangl900/acs-engine
Mar 22, 2019
06f0d57
Update walinuxagent hold calls
Mar 25, 2019
72f1847
Update walinuxagent hold calls
Mar 26, 2019
d6a5d48
Update walinuxagent hold calls
Mar 26, 2019
cfb471d
Fix ACI merge for refactored files
Apr 7, 2019
fcbf87d
Remove managed property
Apr 11, 2019
674e382
Fix EnableSecureKubelet on Windows agent profiles
Apr 15, 2019
ce36969
Fix walinuxagent hold and skip HNS commands on RS1
Apr 17, 2019
84e74e9
Initial cns add
karajas Aug 28, 2019
8daa01e
more
karajas Sep 6, 2019
d702b45
Merge
moelzein Sep 11, 2019
b648723
Merge pull request #5 from juhacket/rs5vnet
mostafaez Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/k8s-upgrade/v1.7.9-hybrid.json.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ACSE_POSTDEPLOY=examples/k8s-upgrade/k8s-upgrade.sh
EXPECTED_ORCHESTRATOR_VERSION=1.8.9
EXPECTED_ORCHESTRATOR_VERSION=1.8.9
90 changes: 90 additions & 0 deletions examples/kubernetes-aci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"apiVersion": "vlabs",
"plan": {},
"properties": {
"provisioningState": "",
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorVersion": "1.8.2",
"kubernetesConfig": {
"networkPolicy": "none",
"kubeletConfig": {
"--cloud-provider": "",
"--cloud-config": "",
"--azure-container-registry-config": ""
},
"addons": [
{
"name": "tiller",
"enabled" : false
},
{
"name": "kubernetes-dashboard",
"enabled" : false
}
]
}
},
"masterProfile": {
"count": 1,
"dnsPrefix": "caas-test-eastus-linux-03",
"vmSize": "Standard_D2_v2",
"firstConsecutiveStaticIP": "10.240.255.5"
},
"agentPoolProfiles": [
{
"name": "system",
"count": 2,
"vmSize": "Standard_F1",
"availabilityProfile": "AvailabilitySet",
"storageProfile": "StorageAccount",
"osType": "Linux"
},
{
"name": "agentpool1",
"count": 2,
"vmSize": "Standard_F2",
"availabilityProfile": "AvailabilitySet",
"storageProfile": "StorageAccount",
"osType": "Linux"
},
{
"name": "agentpool2",
"count": 3,
"vmSize": "Standard_F1",
"availabilityProfile": "AvailabilitySet",
"storageProfile": "StorageAccount",
"osType": "Linux",
"osDiskSizeGB": 50
},
{
"name": "agentpool3",
"count": 3,
"vmSize": "Standard_F1",
"availabilityProfile": "AvailabilitySet",
"storageProfile": "StorageAccount",
"osType": "Linux",
"osDiskSizeGB": 50
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"windowsProfile": {
"adminUsername": "",
"adminPassword": ""
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
},
"certificateProfile": {}
}
}
6 changes: 3 additions & 3 deletions parts/agentoutputs.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
{{if and .IsAvailabilitySets .IsStorageAccount}}
"{{.Name}}StorageAccountOffset": {
"type": "int",
"value": "[variables('{{.Name}}StorageAccountOffset')]"
"value": "[variables('{{.Name}}Variables').StorageAccountOffset]"
},
"{{.Name}}StorageAccountCount": {
"type": "int",
"value": "[variables('{{.Name}}StorageAccountsCount')]"
"value": "[variables('{{.Name}}Variables').StorageAccountsCount]"
},
"{{.Name}}SubnetName": {
"type": "string",
"value": "[variables('{{.Name}}SubnetName')]"
"value": "[variables('{{.Name}}Variables').SubnetName]"
},
{{end}}
8 changes: 7 additions & 1 deletion parts/k8s/addons/kubernetesmasteraddons-kube-dns-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ spec:
selector:
matchLabels:
k8s-app: kube-dns
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
Expand Down Expand Up @@ -210,4 +215,5 @@ spec:
dnsPolicy: Default
serviceAccountName: kube-dns
nodeSelector:
beta.kubernetes.io/os: linux
beta.kubernetes.io/os: linux
agentpool: system
3 changes: 0 additions & 3 deletions parts/k8s/addons/kubernetesmasteraddons-kube-proxy-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ spec:
image: <img>
imagePullPolicy: IfNotPresent
name: kube-proxy
resources:
requests:
cpu: 100m
securityContext:
privileged: true
volumeMounts:
Expand Down
11 changes: 9 additions & 2 deletions parts/k8s/kubernetesagentcustomdata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,14 @@ write_files:
RemainAfterExit=yes
ExecStart=/usr/local/bin/health-monitor.sh container-runtime

- path: /etc/apt/preferences
permissions: "0644"
owner: root
content: |
Package: walinuxagent
Pin: version 2.2.32.2
Pin-Priority: 550

{{if .KubernetesConfig.RequiresDocker}}
{{if not .IsCoreOS}}
- path: /etc/systemd/system/docker.service.d/clear_mount_propagation_flags.conf
Expand Down Expand Up @@ -268,6 +276,5 @@ coreos:
runcmd:
- set -x
- . /opt/azure/containers/provision_source.sh
- timeout 10 apt-mark hold walinuxagent{{GetKubernetesAgentPreprovisionYaml .}}
- timeout 10 apt-mark unhold walinuxagent
- aptmarkWALinuxAgent hold{{GetKubernetesAgentPreprovisionYaml .}}
{{end}}
Loading