Added back in missing txt file.

.gitignore

@@ -352,7 +352,8 @@ ASALocalRun/
 *.out
 
 # Plain Text Files
-*.txt
+missing.txt
+terraform.txt
 
 # App Specific
 **/keyvaultsettings.json

app/Classifier.Worker/assets/labels.txt

@@ -0,0 +1,4 @@
+apple
+banana
+grapes
+orange

app/charts/imageclassifier/templates/NOTES.txt

@@ -0,0 +1,21 @@
+1. Get the application URL by running these commands:
+{{- if .Values.web.ingress.enabled }}
+{{- range $host := .Values.web.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.web.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.web.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "imageclassifierweb.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.web.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "imageclassifierweb.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "imageclassifierweb.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.web.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "imageclassifierweb.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}

app/charts/imageclassifier/templates/worker-deployment.yaml

@@ -25,7 +25,7 @@ spec:
           imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
           env:
             - name: API_BASE_URL
-              value: http://imageclassifierweb
+              value: {{ .Values.worker.image.apibaseurl }}
           volumeMounts:
             - mountPath: /app/assets/images
               name: fruitshare

app/charts/imageclassifier/values.yaml

@@ -42,7 +42,8 @@ worker:
   image:
     repository: kevingbb/imageclassifierworker:v1
     pullPolicy: Always
+    apibaseurl: http://imageclassifierweb
   nameOverride: "imageclassifierworker"
   fullnameOverride: "imageclassifierworker"
   azurestorageaccountkey: ""
-  azurestorageaccountname: ""
+  azurestorageaccountname: ""

deploy-app/README.md

@@ -345,7 +345,7 @@ az role assignment create \
 az role assignment create \
     --role "Managed Identity Operator" \
     --assignee $APPID \
-    --scope /subscriptions/$SUBID/resourcegroups/contosofin-rg/providers/Microsoft.ManagedIdentity/UserAssignedIdentities/$AAD_IDENTITY
+    --scope /subscriptions/$SUBID/resourcegroups/$RG/providers/Microsoft.ManagedIdentity/UserAssignedIdentities/$AAD_IDENTITY
 ```
 
 * Now that we have the Azure AD Identity setup, the next step is to setup the access policy (RBAC) in AKV to allow or deny certain permissions to the data.
@@ -353,7 +353,7 @@ az role assignment create \
 ```bash
 # Setup Access Policy (Permissions) in AKV
 az keyvault set-policy \
-    --name contosofinakv \
+    --name ${PREFIX}akv \
     --secret-permissions list get \
     --object-id $AAD_IDENTITY_PRINCIPALID
 ```
@@ -370,9 +370,11 @@ kind: AzureIdentity
 metadata:
   name: akv-identity
   namespace: dev
+  annotations:
+    aadpodidentity.k8s.io/Behavior: namespaced
 spec:
   type: 0
-  ResourceID: /subscriptions/$SUBID/resourcegroups/contosofin-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$AAD_IDENTITY
+  ResourceID: /subscriptions/$SUBID/resourcegroups/$RG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$AAD_IDENTITY
   ClientID: $AAD_IDENTITY_CLIENTID
 EOF
 # Create AAD Identity Binding