Skip to content

Commit 19537e2

Browse files
nfmoorenfmoore
authored
Minor updates to workflows and infrastructure (#10)
* Update databricks runtime in documentation * Update aks version in infrastructure template * Update nodejs 12 github actions to nodejs 16 * Update nodejs 12 github actions to nodejs 16 * Update nodejs 12 github actions to nodejs 16 * Update nodejs 12 github actions to nodejs 16
1 parent 14e31d1 commit 19537e2

File tree

4 files changed

+48
-39
lines changed

4 files changed

+48
-39
lines changed

‎.github/docs/implementation-guide.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Next, you will need to create a cluster and install libraries that are not part
4545

4646
- `Cluster Name`: enter a name for your cluster.
4747
- `Cluster Mode`: select the `Single Node` option to reduce costs when executing this proof-of-concept.
48-
- `Databricks Runtime Version`: select `Runtime: 10.1 ML` from the dropdown.
48+
- `Databricks Runtime Version`: select `Runtime: 10.4 ML` from the dropdown.
4949
- `Advanced Options - Environment Variables`: add environment variables to the cluster that specify details for your Kaggle account (more information below).
5050

5151
![1-6](.github/../images/implementation/1-6.png)

‎.github/workflows/main.yaml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repo
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020

2121
- name: Azure login
2222
uses: azure/login@v1
2323
with:
2424
creds: ${{ secrets.AZURE_CREDENTIALS }}
2525

26-
- uses: actions/setup-python@v2
26+
- uses: actions/setup-python@v4
2727
with:
2828
python-version: 3.8
2929
cache: pip
@@ -73,7 +73,7 @@ jobs:
7373
envsubst < manifests/api.yaml > artifacts/manifest.yaml
7474
7575
- name: Upload model package artifact
76-
uses: actions/upload-artifact@v2
76+
uses: actions/upload-artifact@v3
7777
with:
7878
name: build-artifacts
7979
path: artifacts
@@ -87,7 +87,7 @@ jobs:
8787

8888
steps:
8989
- name: Download build artifacts
90-
uses: actions/download-artifact@v2
90+
uses: actions/download-artifact@v3
9191
with:
9292
name: build-artifacts
9393

@@ -97,24 +97,23 @@ jobs:
9797
creds: ${{ secrets.AZURE_CREDENTIALS }}
9898

9999
- name: Set target Kubernetes cluster
100-
uses: azure/aks-set-context@v1
100+
uses: azure/aks-set-context@v3
101101
with:
102-
creds: "${{ secrets.AZURE_CREDENTIALS }}"
103102
cluster-name: ${{ secrets.KUBERNETES_NAME }}
104103
resource-group: ${{ secrets.KUBERNETES_RESOURCE_GROUP }}
105104

106105
- name: Create image pull secret for ACR
107-
uses: azure/k8s-create-secret@v1
106+
uses: azure/k8s-create-secret@v4
108107
with:
109108
container-registry-url: ${{ secrets.CONTAINER_REGISTRY_NAME }}.azurecr.io
110109
container-registry-username: ${{ secrets.CONTAINER_REGISTRY_NAME }}
111110
container-registry-password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
112111
secret-name: ${{ secrets.CONTAINER_REGISTRY_IMAGE_PULL_SECRET }}
113112
namespace: default
114-
arguments: --force true
113+
id: create-secret
115114

116115
- name: Deploy to AKS
117-
uses: azure/k8s-deploy@v1
116+
uses: azure/k8s-deploy@v4
118117
with:
119118
manifests: |
120119
manifest.yaml
@@ -142,7 +141,7 @@ jobs:
142141

143142
steps:
144143
- name: Download build artifacts
145-
uses: actions/download-artifact@v2
144+
uses: actions/download-artifact@v3
146145
with:
147146
name: build-artifacts
148147

@@ -152,24 +151,23 @@ jobs:
152151
creds: ${{ secrets.AZURE_CREDENTIALS }}
153152

154153
- name: Set target Kubernetes cluster
155-
uses: azure/aks-set-context@v1
154+
uses: azure/aks-set-context@v3
156155
with:
157-
creds: ${{ secrets.AZURE_CREDENTIALS }}
158156
cluster-name: ${{ secrets.KUBERNETES_NAME }}
159157
resource-group: ${{ secrets.KUBERNETES_RESOURCE_GROUP }}
160158

161159
- name: Create image pull secret for ACR
162-
uses: azure/k8s-create-secret@v1
160+
uses: azure/k8s-create-secret@v4
163161
with:
164162
container-registry-url: ${{ secrets.CONTAINER_REGISTRY_NAME }}.azurecr.io
165163
container-registry-username: ${{ secrets.CONTAINER_REGISTRY_NAME }}
166164
container-registry-password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
167165
secret-name: ${{ secrets.CONTAINER_REGISTRY_IMAGE_PULL_SECRET }}
168166
namespace: default
169-
arguments: --force true
167+
id: create-secret
170168

171169
- name: Deploy to AKS
172-
uses: azure/k8s-deploy@v1
170+
uses: azure/k8s-deploy@v4
173171
with:
174172
manifests: |
175173
manifest.yaml

‎infrastructure/main.json‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"metadata": {
55
"_generator": {
66
"name": "bicep",
7-
"version": "0.7.4.23292",
8-
"templateHash": "11249594560110901485"
7+
"version": "0.13.1.58284",
8+
"templateHash": "18065729359224622542"
99
}
1010
},
1111
"parameters": {
@@ -18,7 +18,9 @@
1818
},
1919
"vNetIPAddressPrefixesForFirstDeployment": {
2020
"type": "array",
21-
"defaultValue": ["192.168.0.0/16"],
21+
"defaultValue": [
22+
"192.168.0.0/16"
23+
],
2224
"metadata": {
2325
"description": "Virtual Network IP Address Prefixes"
2426
}
@@ -39,7 +41,9 @@
3941
},
4042
"vNetIPAddressPrefixesForSecondDeployment": {
4143
"type": "array",
42-
"defaultValue": ["192.167.0.0/16"],
44+
"defaultValue": [
45+
"192.167.0.0/16"
46+
],
4347
"metadata": {
4448
"description": "Virtual Network IP Address Prefixes"
4549
}
@@ -83,8 +87,8 @@
8387
"metadata": {
8488
"_generator": {
8589
"name": "bicep",
86-
"version": "0.7.4.23292",
87-
"templateHash": "4946712618916781199"
90+
"version": "0.13.1.58284",
91+
"templateHash": "6605471823497372116"
8892
}
8993
},
9094
"parameters": {
@@ -126,7 +130,10 @@
126130
"pricingTier": {
127131
"type": "string",
128132
"defaultValue": "standard",
129-
"allowedValues": ["standard", "premium"],
133+
"allowedValues": [
134+
"standard",
135+
"premium"
136+
],
130137
"metadata": {
131138
"description": "The pricing tier of workspace."
132139
}
@@ -294,8 +301,8 @@
294301
"metadata": {
295302
"_generator": {
296303
"name": "bicep",
297-
"version": "0.7.4.23292",
298-
"templateHash": "16635969449397563854"
304+
"version": "0.13.1.58284",
305+
"templateHash": "4754783924999976762"
299306
}
300307
},
301308
"parameters": {
@@ -378,7 +385,9 @@
378385
},
379386
"vNetIPAddressPrefixes": {
380387
"type": "array",
381-
"defaultValue": ["192.168.0.0/16"],
388+
"defaultValue": [
389+
"192.168.0.0/16"
390+
],
382391
"metadata": {
383392
"description": "Virtual Network IP Address Prefixes"
384393
}
@@ -526,7 +535,7 @@
526535
"type": "SystemAssigned"
527536
},
528537
"properties": {
529-
"kubernetesVersion": "1.22.6",
538+
"kubernetesVersion": "1.23.12",
530539
"dnsPrefix": "[parameters('dnsPrefix')]",
531540
"agentPoolProfiles": [
532541
{
@@ -808,7 +817,7 @@
808817
"name": "[guid(parameters('kubernetesServiceClusterName'), 'agic', 'contributor')]",
809818
"properties": {
810819
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('azureRbacContributorRoleId'))]",
811-
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', parameters('kubernetesServiceClusterName'))).addonProfiles.ingressApplicationGateway.identity.objectId]",
820+
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', parameters('kubernetesServiceClusterName')), '2022-04-02-preview').addonProfiles.ingressApplicationGateway.identity.objectId]",
812821
"principalType": "ServicePrincipal"
813822
},
814823
"dependsOn": [
@@ -819,7 +828,7 @@
819828
"outputs": {
820829
"controlPlaneFQDN": {
821830
"type": "string",
822-
"value": "[reference(resourceId('Microsoft.ContainerService/managedClusters', parameters('kubernetesServiceClusterName'))).fqdn]"
831+
"value": "[reference(resourceId('Microsoft.ContainerService/managedClusters', parameters('kubernetesServiceClusterName')), '2022-04-02-preview').fqdn]"
823832
},
824833
"containerRegistryName": {
825834
"type": "string",
@@ -865,10 +874,10 @@
865874
"value": true
866875
},
867876
"containerRegistryName": {
868-
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'm_microservices_01')).outputs.containerRegistryName.value]"
877+
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'm_microservices_01'), '2020-10-01').outputs.containerRegistryName.value]"
869878
},
870879
"logAnalyticsWorkspaceName": {
871-
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'm_microservices_01')).outputs.logAnalyticsWorkspaceName.value]"
880+
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'm_microservices_01'), '2020-10-01').outputs.logAnalyticsWorkspaceName.value]"
872881
}
873882
},
874883
"template": {
@@ -877,8 +886,8 @@
877886
"metadata": {
878887
"_generator": {
879888
"name": "bicep",
880-
"version": "0.7.4.23292",
881-
"templateHash": "16635969449397563854"
889+
"version": "0.13.1.58284",
890+
"templateHash": "4754783924999976762"
882891
}
883892
},
884893
"parameters": {
@@ -961,7 +970,9 @@
961970
},
962971
"vNetIPAddressPrefixes": {
963972
"type": "array",
964-
"defaultValue": ["192.168.0.0/16"],
973+
"defaultValue": [
974+
"192.168.0.0/16"
975+
],
965976
"metadata": {
966977
"description": "Virtual Network IP Address Prefixes"
967978
}
@@ -1109,7 +1120,7 @@
11091120
"type": "SystemAssigned"
11101121
},
11111122
"properties": {
1112-
"kubernetesVersion": "1.22.6",
1123+
"kubernetesVersion": "1.23.12",
11131124
"dnsPrefix": "[parameters('dnsPrefix')]",
11141125
"agentPoolProfiles": [
11151126
{
@@ -1391,7 +1402,7 @@
13911402
"name": "[guid(parameters('kubernetesServiceClusterName'), 'agic', 'contributor')]",
13921403
"properties": {
13931404
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('azureRbacContributorRoleId'))]",
1394-
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', parameters('kubernetesServiceClusterName'))).addonProfiles.ingressApplicationGateway.identity.objectId]",
1405+
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', parameters('kubernetesServiceClusterName')), '2022-04-02-preview').addonProfiles.ingressApplicationGateway.identity.objectId]",
13951406
"principalType": "ServicePrincipal"
13961407
},
13971408
"dependsOn": [
@@ -1402,7 +1413,7 @@
14021413
"outputs": {
14031414
"controlPlaneFQDN": {
14041415
"type": "string",
1405-
"value": "[reference(resourceId('Microsoft.ContainerService/managedClusters', parameters('kubernetesServiceClusterName'))).fqdn]"
1416+
"value": "[reference(resourceId('Microsoft.ContainerService/managedClusters', parameters('kubernetesServiceClusterName')), '2022-04-02-preview').fqdn]"
14061417
},
14071418
"containerRegistryName": {
14081419
"type": "string",
@@ -1420,4 +1431,4 @@
14201431
]
14211432
}
14221433
]
1423-
}
1434+
}

‎infrastructure/modules/microservices.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ resource r_aks 'Microsoft.ContainerService/managedClusters@2022-04-02-preview' =
178178
type: 'SystemAssigned'
179179
}
180180
properties: {
181-
kubernetesVersion: '1.22.6'
181+
kubernetesVersion: '1.23.12'
182182
dnsPrefix: dnsPrefix
183183
agentPoolProfiles: [
184184
{

0 commit comments

Comments
 (0)