From 91ebf2810ce36ed171d3723792aa35cc01f651d0 Mon Sep 17 00:00:00 2001 From: Robbie Zhang Date: Mon, 12 Mar 2018 15:32:26 -0700 Subject: [PATCH] Fix the examples (#117) --- examples/iis-pod.yaml | 25 +++++++++++++++++++++++++ examples/nanoserver.yaml | 19 ++++++------------- 2 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 examples/iis-pod.yaml diff --git a/examples/iis-pod.yaml b/examples/iis-pod.yaml new file mode 100644 index 000000000..c5d55a253 --- /dev/null +++ b/examples/iis-pod.yaml @@ -0,0 +1,25 @@ +apiVersion: v1 +kind: Pod +metadata: + name: iis +spec: + containers: + - image: microsoft/iis:nanoserver + imagePullPolicy: Always + name: iis + resources: + requests: + memory: 3.5G + cpu: 2 + ports: + - containerPort: 80 + name: http + protocol: TCP + - containerPort: 443 + name: https + dnsPolicy: Default + nodeName: virtual-kubelet-myaciconnector-win + automountServiceAccountToken: false + tolerations: + - key: azure.com/aci + effect: NoSchedule diff --git a/examples/nanoserver.yaml b/examples/nanoserver.yaml index 867d3351d..2b71a93d8 100644 --- a/examples/nanoserver.yaml +++ b/examples/nanoserver.yaml @@ -4,24 +4,17 @@ metadata: name: nano spec: containers: - - image: microsoft/nanoserver + - image: microsoft/nanoserver:latest imagePullPolicy: Always + command: ["powershell.exe", "-Command", "while ($true) { Sleep 5; Write-Host 'helloworld' }"] name: nanoserver resources: requests: - memory: 4G - cpu: 2 - ports: - - containerPort: 80 - name: http - protocol: TCP - - containerPort: 443 - name: https + memory: 1.5G + cpu: 1 dnsPolicy: Default -<<<<<<< HEAD:examples/iis-pod.yaml -======= - nodeName: virtual-kubelet-connector-win ->>>>>>> azureReadMe:examples/nanoserver.yaml + restartPolicy: OnFailure + nodeName: virtual-kubelet-myaciconnector-win automountServiceAccountToken: false tolerations: - key: azure.com/aci