Update deployment with latest versions

bootstrap.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
-terraform=$(garden tools terraform.terraform-1-0-5 --get-path)
+#terraform=$(garden tools terraform.terraform-1-0-5 --get-path)
+terraform=$(which terraform) 
 terraform_bucket_target="google_storage_bucket.project_bucket"
 bucket_name="$1-state"
 google_project_id="$1"

cert-manager/garden.yml

@@ -3,7 +3,7 @@ type: helm
 name: cert-manager
 repo: https://charts.jetstack.io
 chart: cert-manager
-version: v1.11.1
+version: v1.13.3
 namespace: cert-manager
 values:
   installCRDs: true

ingress-nginx/garden.yml

@@ -3,12 +3,13 @@ type: helm
 name: ingress-nginx
 repo: https://kubernetes.github.io/ingress-nginx
 chart: ingress-nginx
-version: 4.6.1
+version: 4.9.0
 namespace: ingress-nginx
 dependencies:
   - netbox-app-infra
 values:
   controller:
+    allowSnippetAnnotations: true
     watchIngressWithoutClass: true
     service:
       loadBalancerIP: ${runtime.services.netbox-app-infra.outputs.external_ip}

netbox/garden.yml

@@ -2,9 +2,7 @@
 kind: Module
 type: helm
 name: netbox
-repo: https://charts.boo.tc
-chart: netbox
-version: 4.1.1
+repositoryUrl: https://github.com/scheuk/netbox-chart#develop
 timeout: 1200
 dependencies:
   - netbox-app-infra
@@ -78,18 +76,34 @@ values:
   worker:
     autoscaling:
       enabled: true
+    extraContainers:
+    - name: cloud-sql-proxy
+      image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.8.1
+      env:
+        - name: CSQL_PROXY_INSTANCE_CONNECTION_NAME
+          valueFrom:
+            secretKeyRef:
+              name: cloudsql-instance
+              key: connection_name
+      args:
+        - "--structured-logs"
+      securityContext:
+        runAsNonRoot: true
+      resources:
+        requests:
+          memory: "256Mi"
+          cpu:    "200m"
   extraContainers:
   - name: cloud-sql-proxy
-    image: gcr.io/cloudsql-docker/gce-proxy:1.28.0
+    image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.8.1
     env:
-      - name: CONNECTION_NAME
+      - name: CSQL_PROXY_INSTANCE_CONNECTION_NAME
         valueFrom:
           secretKeyRef:
             name: cloudsql-instance
             key: connection_name
-    command:
-      - "/cloud_sql_proxy"
-      - "-instances=$(CONNECTION_NAME)=tcp:5432"
+    args:
+      - "--structured-logs"
     securityContext:
       runAsNonRoot: true
     resources:
@@ -99,26 +113,18 @@ values:
   releaseCheck:
     url: https://api.github.com/repos/netbox-community/netbox/releases
   housekeeping:
-    enabled: false
-    resources:
-      limits:
-        cpu: 500m
-        memory: 512Mi
-      requests:
-        cpu: 500m
-        memory: 512Mi
+    enabled: true
     extraContainers:
     - name: cloud-sql-proxy
-      image: gcr.io/cloudsql-docker/gce-proxy:1.28.0
+      image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.8.1
       env:
-        - name: CONNECTION_NAME
+        - name: CSQL_PROXY_INSTANCE_CONNECTION_NAME
           valueFrom:
             secretKeyRef:
               name: cloudsql-instance
               key: connection_name
-      command:
-        - "/cloud_sql_proxy"
-        - "-instances=$(CONNECTION_NAME)=tcp:5432"
+      args:
+        - "--structured-logs"
       securityContext:
         runAsNonRoot: true
       resources:
@@ -133,14 +139,3 @@ values:
   cachingRedis:
     host: ${runtime.services.netbox-app-infra.outputs.redis_host}
     port: 6379
----
-kind: Module
-type: kubernetes
-name: netbox-housekeeping
-# helm install above fails when housekeeping is on with: admission webhook "workload-defaulter.common-webhooks.networking.gke.io" denied the request: no kind "CronJob" is registered for version "batch/v1" in scheme "pkg/runtime/scheme.go:100"
-description: Netbox Housekeeping cronjob deployment - hack
-dependencies:
-  - netbox
-files:
-  - rbac.yaml
-  - netbox-housekeeping-cronjob.yaml