Use vendored nginx-ingress chart and mcr image (#300)

microsoft · Jun 7, 2024 · 68f7822 · 68f7822
1 parent ffbbb3f
commit 68f7822
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/deployment/bin/deploy b/deployment/bin/deploy
@@ -283,18 +283,22 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
     echo "== nginx-ingress =="
     echo "==================="
 
-    helm upgrade --install nginx-ingress ingress-nginx/ingress-nginx \
+    helm upgrade --install nginx-ingress helm/ingress-nginx-4.8.3.tgz \
         -n pc \
         --create-namespace \
         --set controller.replicaCount=1 \
         --set controller.service.externalTrafficPolicy="Local" \
         --set controller.service.loadBalancerIP="${INTERNAL_INGRESS_IP}" \
         --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-internal"=true \
+        --set controller.image.registry="mcr.microsoft.com" \
+        --set controller.image.image="oss/kubernetes/ingress/nginx-ingress-controller" \
+        --set controller.image.tag="v1.9.6-patched" \
+        --set controller.image.digest="sha256:2383717ea3edd1652b97e5b82adf15a3e7f091d0d5d0eceb8dce4410e3a6a292" \
+        --version "4.8.3"\
         --wait \
         --timeout 2m0s \
         -f bin/nginx-values.yaml
 
-
     ######################
     # Gather environment #
     ######################

diff --git a/deployment/helm/ingress-nginx-4.8.3.tgz b/deployment/helm/ingress-nginx-4.8.3.tgz
diff --git a/deployment/terraform/resources/aks.tf b/deployment/terraform/resources/aks.tf
@@ -21,7 +21,8 @@ resource "azurerm_kubernetes_cluster" "pctasks" {
   # https://learn.microsoft.com/en-us/azure/aks/auto-upgrade-node-os-image
   node_os_channel_upgrade = "NodeImage"
 
-  image_cleaner_enabled = true
+  image_cleaner_enabled        = true
+  image_cleaner_interval_hours = 24
 
   default_node_pool {
     name           = "agentpool"