Skip to content

Commit f53d6f9

Browse files
VeronicaWassonVeronicaWasson
authored
Merge pull request #142 from mspnp/dev
Drone Delivery update in basic version
2 parents 1d15118 + 9c5dbca commit f53d6f9

File tree

54 files changed

+888
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+888
-166
lines changed

‎azuredeploy.json

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -78,26 +78,6 @@
7878
},
7979
"type": "string"
8080
},
81-
"agentCount": {
82-
"type": "int",
83-
"defaultValue": 3,
84-
"metadata": {
85-
"description": "The number of agents for the cluster. This value can be from 1 to 100 (note, for Kubernetes clusters you will also get 1 or 2 public agents in addition to these seleted masters)"
86-
},
87-
"minValue": 1,
88-
"maxValue": 100
89-
},
90-
"agentVMSize": {
91-
"type": "string",
92-
"defaultValue": "Standard_D2_v2",
93-
"allowedValues": [
94-
"Standard_D2_v2",
95-
"Standard_F8s_v2"
96-
],
97-
"metadata": {
98-
"description": "The size of the Virtual Machine."
99-
}
100-
},
10181
"osType": {
10282
"type": "string",
10383
"defaultValue": "Linux",
@@ -185,7 +165,9 @@
185165
"droneSchedulerKeyVaultName": "[concat(parameters('environmentName'),'-ds-',uniqueString(resourceGroup().id))]",
186166
"droneSchedulerCosmosDbName": "[concat(parameters('environmentName'),'-ds-',uniqueString(resourceGroup().id))]",
187167
"workflowKeyVaultName": "[concat(parameters('environmentName'),'-wf-',uniqueString(resourceGroup().id))]",
188-
"workflowServiceAccessKey": "WorkflowServiceAccessKey"
168+
"workflowServiceAccessKey": "WorkflowServiceAccessKey",
169+
"agentCount": 1,
170+
"agentVMSize": "Standard_D2_v2"
189171
},
190172
"qa": {
191173
"aksClusterName": "[uniqueString(variables('clusterNamePrefix'), resourceGroup().id)]",
@@ -206,7 +188,9 @@
206188
"droneSchedulerKeyVaultName": "[concat(parameters('environmentName'),'-ds-',uniqueString(resourceGroup().id))]",
207189
"droneSchedulerCosmosDbName": "[concat(parameters('environmentName'),'-ds-',uniqueString(resourceGroup().id))]",
208190
"workflowKeyVaultName": "[concat(parameters('environmentName'),'-wf-',uniqueString(resourceGroup().id))]",
209-
"workflowServiceAccessKey": "WorkflowServiceAccessKey"
191+
"workflowServiceAccessKey": "WorkflowServiceAccessKey",
192+
"agentCount": 3,
193+
"agentVMSize": "Standard_D2_v2"
210194
},
211195
"staging": {
212196
"aksClusterName": "[uniqueString(variables('clusterNamePrefix'), resourceGroup().id)]",
@@ -227,7 +211,9 @@
227211
"droneSchedulerKeyVaultName": "[concat(parameters('environmentName'),'-ds-',uniqueString(resourceGroup().id))]",
228212
"droneSchedulerCosmosDbName": "[concat(parameters('environmentName'),'-ds-',uniqueString(resourceGroup().id))]",
229213
"workflowKeyVaultName": "[concat(parameters('environmentName'),'-wf-',uniqueString(resourceGroup().id))]",
230-
"workflowServiceAccessKey": "WorkflowServiceAccessKey"
214+
"workflowServiceAccessKey": "WorkflowServiceAccessKey",
215+
"agentCount": 3,
216+
"agentVMSize": "Standard_D2_v2"
231217
},
232218
"prod": {
233219
"aksClusterName": "[uniqueString(variables('clusterNamePrefix'), resourceGroup().id)]",
@@ -248,7 +234,9 @@
248234
"droneSchedulerKeyVaultName": "[concat(parameters('environmentName'),'-ds-',uniqueString(resourceGroup().id))]",
249235
"droneSchedulerCosmosDbName": "[concat(parameters('environmentName'),'-ds-',uniqueString(resourceGroup().id))]",
250236
"workflowKeyVaultName": "[concat(parameters('environmentName'),'-wf-',uniqueString(resourceGroup().id))]",
251-
"workflowServiceAccessKey": "WorkflowServiceAccessKey"
237+
"workflowServiceAccessKey": "WorkflowServiceAccessKey",
238+
"agentCount": 3,
239+
"agentVMSize": "Standard_D2_v2"
252240
}
253241
}
254242
},
@@ -329,8 +317,8 @@
329317
{
330318
"name": "agentpool",
331319
"osDiskSizeGB": "[parameters('osDiskSizeGB')]",
332-
"count": "[parameters('agentCount')]",
333-
"vmSize": "[parameters('agentVMSize')]",
320+
"count": "[variables('environmentSettings')[parameters('environmentName')].agentCount]",
321+
"vmSize": "[variables('environmentSettings')[parameters('environmentName')].agentVMSize]",
334322
"osType": "[parameters('osType')]",
335323
"storageProfile": "ManagedDisks"
336324
}

‎charts/delivery/envs/delivery-dev/values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,12 @@ exports:
99
level: "Information"
1010
reason: "new dev deploy"
1111
current: true
12+
ingress:
13+
class: "nginx-dev"
14+
resources:
15+
requests:
16+
cpu: 91m
17+
memory: 350Mi
18+
limits:
19+
cpu: 130m
20+
memory: 500Mi

‎charts/delivery/envs/delivery-prod/values.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,18 @@
22
nameOverride: delivery
33
exports:
44
data:
5-
replicaCount: 3
5+
replicaCount: 1
66
image:
77
pullPolicy: IfNotPresent
88
telemetry:
99
level: "Error"
1010
reason: "new prod deploy"
11+
ingress:
12+
class: "nginx-prod"
13+
resources:
14+
requests:
15+
cpu: 100m
16+
memory: 350Mi
17+
limits:
18+
cpu: 200m
19+
memory: 500Mi

‎charts/delivery/envs/delivery-qa/values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,12 @@ exports:
99
level: "Information"
1010
reason: "new qa deploy"
1111
current: true
12+
ingress:
13+
class: "nginx-qa"
14+
resources:
15+
requests:
16+
cpu: 100m
17+
memory: 350Mi
18+
limits:
19+
cpu: 150m
20+
memory: 500Mi

‎charts/delivery/envs/delivery-staging/values.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,19 @@
22
nameOverride: delivery
33
exports:
44
data:
5-
replicaCount: 3
5+
replicaCount: 1
66
image:
77
pullPolicy: Always
88
telemetry:
99
level: "Information"
1010
reason: "new staging deploy"
1111
current: true
12+
ingress:
13+
class: "nginx-staging"
14+
resources:
15+
requests:
16+
cpu: 100m
17+
memory: 350Mi
18+
limits:
19+
cpu: 200m
20+
memory: 500Mi

‎charts/delivery/requirements.lock

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
dependencies:
2+
- name: delivery-dev
3+
repository: file://envs/delivery-dev
4+
version: v0.1.0
5+
- name: delivery-prod
6+
repository: file://envs/delivery-prod
7+
version: v0.1.0
8+
- name: delivery-qa
9+
repository: file://envs/delivery-qa
10+
version: v0.1.0
11+
- name: delivery-staging
12+
repository: file://envs/delivery-staging
13+
version: v0.1.0
14+
digest: sha256:8f25310facbaa5f8791424964158ceddd0f5da6994d316422eab26dd02e1e3ec
15+
generated: "2019-10-22T07:45:01.368035081-06:00"

‎charts/delivery/templates/delivery-deploy.yaml

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,45 @@ spec:
4646
- name: fabrikam-delivery
4747
image: {{ .Values.dockerregistry }}{{ .Values.dockerregistrynamespace }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
4848
imagePullPolicy: {{ .Values.image.pullPolicy }}
49+
readinessProbe:
50+
httpGet:
51+
path: {{ required "readinessProbe.httpGet.path is required" .Values.readinessProbe.httpGet.path }}
52+
port: {{ required "readinessProbe.httpGet.port is required" .Values.readinessProbe.httpGet.port }}
53+
{{- if .Values.readinessProbe.initialDelaySeconds }}
54+
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
55+
{{- end }}
56+
{{- if .Values.readinessProbe.periodSeconds }}
57+
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
58+
{{- end }}
59+
{{- if .Values.readinessProbe.timeoutSeconds }}
60+
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
61+
{{- end }}
62+
{{- if .Values.readinessProbe.failureThreshold }}
63+
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
64+
{{- end }}
65+
livenessProbe:
66+
httpGet:
67+
path: {{ required "livenessProbe.httpGet.path is required" .Values.livenessProbe.httpGet.path }}
68+
port: {{ required "livenessProbe.httpGet.port is required" .Values.livenessProbe.httpGet.port }}
69+
{{- if .Values.livenessProbe.initialDelaySeconds }}
70+
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
71+
{{- end }}
72+
{{- if .Values.livenessProbe.periodSeconds }}
73+
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
74+
{{- end }}
75+
{{- if .Values.livenessProbe.timeoutSeconds }}
76+
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
77+
{{- end }}
78+
{{- if .Values.livenessProbe.failureThreshold }}
79+
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
80+
{{- end }}
81+
resources:
82+
requests:
83+
cpu: {{ required "A valid .Values.resources.requests.cpu entry required!" .Values.resources.requests.cpu }}
84+
memory: {{ required "A valid .Values.resources.requests.memory entry required!" .Values.resources.requests.memory }}
85+
limits:
86+
cpu: {{ required "A valid .Values.resources.limits.cpu entry required!" .Values.resources.limits.cpu }}
87+
memory: {{ required "A valid .Values.resources.limits.memory entry required!" .Values.resources.limits.memory }}
4988
env:
5089
- name: DOCDB_DATABASEID
5190
value: {{ .Values.cosmosdb.id }}
@@ -60,10 +99,3 @@ spec:
6099
ports:
61100
- name: service
62101
containerPort: 8080
63-
resources:
64-
requests:
65-
cpu: {{ required "A valid .Values.resources.requests.cpu entry required!" .Values.resources.requests.cpu }}
66-
memory: {{ required "A valid .Values.resources.requests.memory entry required!" .Values.resources.requests.memory }}
67-
limits:
68-
cpu: {{ required "A valid .Values.resources.limits.cpu entry required!" .Values.resources.limits.cpu }}
69-
memory: {{ required "A valid .Values.resources.limits.memory entry required!" .Values.resources.limits.memory }}

‎charts/delivery/templates/delivery-ingress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ kind: Ingress
1515
metadata:
1616
name: {{ $relname }}-ingress
1717
annotations:
18+
kubernetes.io/ingress.class: {{ required "ingress.class is required" .Values.ingress.class | quote }}
1819
nginx.ingress.kubernetes.io/rewrite-target: /api/deliveries/public$1
1920
spec:
2021
{{- if .Values.ingress.tls }}

‎charts/delivery/templates/delivery-internal-ingress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ kind: Ingress
1515
metadata:
1616
name: {{ $relname }}-internal-ingress
1717
annotations:
18+
kubernetes.io/ingress.class: {{ required "ingress.class is required" .Values.ingress.class | quote }}
1819
nginx.ingress.kubernetes.io/rewrite-target: /api/deliveries$1
1920
nginx.ingress.kubernetes.io/configuration-snippet: |
2021
internal;

‎charts/delivery/values.yaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Default values for dronedelivery.
1+
# Default values for delivery.
22
nameOverride: delivery
33
replicaCount: 1
44
identity:
@@ -15,16 +15,23 @@ cosmosdb:
1515
collectionid:
1616
keyvault:
1717
uri:
18+
readinessProbe:
19+
httpGet:
20+
path: /healthz
21+
port: 8080
22+
initialDelaySeconds: 40
23+
periodSeconds: 15
24+
timeoutSeconds: 2
25+
failureThreshold: 5
26+
livenessProbe:
27+
httpGet:
28+
path: /healthz
29+
port: 8080
30+
initialDelaySeconds: 50
31+
periodSeconds: 15
1832
telemetry:
1933
level: "Error"
2034
reason: unknown
21-
resources:
22-
requests:
23-
cpu: 350m
24-
memory: 350Mi
25-
limits:
26-
cpu: 500m
27-
memory: 500Mi
2835
tags:
2936
dev: false
3037
prod: false

0 commit comments

Comments
 (0)