From 2922b078fe93f18fcc654f7254ecd3fd17cb8f90 Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Tue, 21 May 2024 21:01:39 +0200 Subject: [PATCH] fix: remove patchesStrategicMerge --- .../apps/default/tandoor/app/helmrelease.yaml | 22 ++++--------------- .../kube-system/cilium/app/helmrelease.yaml | 12 +--------- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/kubernetes/apps/default/tandoor/app/helmrelease.yaml b/kubernetes/apps/default/tandoor/app/helmrelease.yaml index 2c49b23ce..87e12529e 100644 --- a/kubernetes/apps/default/tandoor/app/helmrelease.yaml +++ b/kubernetes/apps/default/tandoor/app/helmrelease.yaml @@ -150,6 +150,8 @@ spec: tandoor: app: - path: /opt/recipes/cookbook/static/django_js_reverse + migrations: + - path: /opt/recipes/cookbook/static/django_js_reverse static: type: emptyDir advancedMounts: @@ -158,27 +160,11 @@ spec: - path: /opt/recipes/staticfiles nginx: - path: /static + migrations: + - path: /opt/recipes/staticfiles cache: type: emptyDir advancedMounts: tandoor: nginx: - path: /var/cache/nginx - postRenderers: - - kustomize: - patchesStrategicMerge: - - kind: Deployment - apiVersion: apps/v1 - metadata: - name: tandoor - namespace: *ns - spec: - template: - spec: - initContainers: - - name: migrations - volumeMounts: - - name: django-js-reverse - mountPath: /opt/recipes/cookbook/static/django_js_reverse - - name: static - mountPath: /opt/recipes/staticfiles diff --git a/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml b/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml index 8ec11e711..752c2c223 100644 --- a/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml +++ b/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml @@ -109,19 +109,9 @@ spec: l7proxy: true routingMode: native ingressController: - enabled: true + enabled: false defaultSecretNamespace: networking defaultSecretName: ${SECRET_CLUSTER_DOMAIN//./-}-tls loadbalancerMode: shared service: loadBalancerIP: 192.168.169.115 - postRenderers: - - kustomize: - patchesStrategicMerge: - - kind: Service - apiVersion: v1 - metadata: - name: cilium-ingress - namespace: *ns - spec: - externalTrafficPolicy: Local