Added ingress, shell script predeploy, aks readme, adjusted nginx conf for frontend

Author: dminkovski

app/backend/manifests/ingress.yml

@@ -11,10 +11,17 @@ spec:
   rules:
     - http:
         paths:
+          - path: /api
+            pathType: Prefix
+            backend:
+              service:
+                name: backend-service
+                port:
+                  number: 80
           - path: /
             pathType: Prefix
             backend:
               service:
                 name: frontend-service
                 port:
-                  number: 80
+                  number: 80

app/frontend/Dockerfile

@@ -14,9 +14,9 @@ FROM nginx:alpine
 
 WORKDIR /usr/share/nginx/html
 COPY --from=build /app/build .
-COPY --from=build /app/nginx/nginx.conf.template /etc/nginx/conf.d
+COPY --from=build /app/nginx/default.conf /etc/nginx/conf.d
 
 EXPOSE 80
 
-CMD ["/bin/sh", "-c", "envsubst < /etc/nginx/conf.d/nginx.conf.template > /etc/nginx/conf.d/default.conf && nginx -g \"daemon off;\""]
-#CMD ["/bin/sh", "-c", "nginx -g \"daemon off;\""]
+#CMD ["/bin/sh", "-c", "envsubst < /etc/nginx/conf.d/nginx.conf.template > /etc/nginx/conf.d/default.conf && nginx -g \"daemon off;\""]
+CMD ["/bin/sh", "-c", "nginx -g \"daemon off;\""]

app/frontend/manifests/frontend-deployment.tmpl.yml

@@ -24,6 +24,3 @@ spec:
                   envFrom:
                       - configMapRef:
                             name: azd-env-configmap
-                  env:
-                      - name: REACT_APP_API_BASE_URL
-                        value: "http://backend-service"

app/frontend/nginx/nginx.conf.template renamed to app/frontend/nginx/default.conf

@@ -8,10 +8,4 @@ server {
     root   /usr/share/nginx/html;
     index  index.html index.htm;
   }
-  
-  location /api {
-    proxy_ssl_server_name on;
-    proxy_http_version 1.1;
-    proxy_pass $REACT_APP_API_BASE_URL;
-  }
 }

deploy/aks/scripts/predeploy.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Displaying the initial message
+echo "Loading azd .env file from current environment"
+
+# Retrieve environment variables from the `.env` file using `azd env get-values`
+envData=$(azd env get-values)
+
+# Create a temporary file to store environment variables
+tempEnvFile="temp_env_file"
+echo "$envData" > "$tempEnvFile"
+
+# Get the current date in the required format
+date=$(date +"%Y-%m-%d %H:%M:%S")
+
+# Start building the ConfigMap YAML content
+configMapContent="# Updated $date
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: azd-env-configmap
+data:
+"
+
+# Read each line from the temp file and process it
+while IFS= read -r line; do
+    if [[ $line =~ ^([^=]+)=(.*)$ ]]; then
+        key="${BASH_REMATCH[1]}"
+        value="${BASH_REMATCH[2]}"
+        # Trim quotes from value
+        trimmedValue="${value%\"}"
+        trimmedValue="${trimmedValue#\"}"
+        # Append to the ConfigMap content
+        configMapContent+="  ${key}: \"${trimmedValue}\""$'\n'
+    fi
+done < "$tempEnvFile"
+
+# Specify the output file path for the ConfigMap
+outputFilePath="../../../app/backend/manifests/azd-env-configmap.yml"
+
+# Check if the output file exists and remove it before creating a new one
+if [ -f "$outputFilePath" ]; then
+    rm -f "$outputFilePath"
+fi
+
+# Write the ConfigMap content to the file
+echo -e "$configMapContent" > "$outputFilePath"
+
+# Cleaning up temporary files
+rm -f "$tempEnvFile"
+
+echo "ConfigMap generated at $outputFilePath"