fix: remove patchesStrategicMerge

This commit is contained in:
auricom
2024-05-21 21:01:39 +02:00
parent b662432fa5
commit 2922b078fe
2 changed files with 5 additions and 29 deletions

View File

@@ -150,6 +150,8 @@ spec:
tandoor: tandoor:
app: app:
- path: /opt/recipes/cookbook/static/django_js_reverse - path: /opt/recipes/cookbook/static/django_js_reverse
migrations:
- path: /opt/recipes/cookbook/static/django_js_reverse
static: static:
type: emptyDir type: emptyDir
advancedMounts: advancedMounts:
@@ -158,27 +160,11 @@ spec:
- path: /opt/recipes/staticfiles - path: /opt/recipes/staticfiles
nginx: nginx:
- path: /static - path: /static
migrations:
- path: /opt/recipes/staticfiles
cache: cache:
type: emptyDir type: emptyDir
advancedMounts: advancedMounts:
tandoor: tandoor:
nginx: nginx:
- path: /var/cache/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

View File

@@ -109,19 +109,9 @@ spec:
l7proxy: true l7proxy: true
routingMode: native routingMode: native
ingressController: ingressController:
enabled: true enabled: false
defaultSecretNamespace: networking defaultSecretNamespace: networking
defaultSecretName: ${SECRET_CLUSTER_DOMAIN//./-}-tls defaultSecretName: ${SECRET_CLUSTER_DOMAIN//./-}-tls
loadbalancerMode: shared loadbalancerMode: shared
service: service:
loadBalancerIP: 192.168.169.115 loadBalancerIP: 192.168.169.115
postRenderers:
- kustomize:
patchesStrategicMerge:
- kind: Service
apiVersion: v1
metadata:
name: cilium-ingress
namespace: *ns
spec:
externalTrafficPolicy: Local