From 8be7748895f5adb4d94e1fa3d6de38d7c57ea777 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Wed, 15 May 2024 00:43:43 +0200 Subject: [PATCH] patchesStrategicMerge -> patches as recommended by kubectl apply --- platform/ingress-nginx/kustomization.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/platform/ingress-nginx/kustomization.yaml b/platform/ingress-nginx/kustomization.yaml index ee879ed..280a5bd 100644 --- a/platform/ingress-nginx/kustomization.yaml +++ b/platform/ingress-nginx/kustomization.yaml @@ -1,22 +1,18 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.10.1/deploy/static/provider/do/deploy.yaml -patchesStrategicMerge: - - |- +- https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.10.1/deploy/static/provider/do/deploy.yaml +patches: +- patch: |- apiVersion: v1 kind: Service metadata: annotations: - # set by upstream - # service.beta.kubernetes.io/do-loadbalancer-enable-proxy-protocol: "true" - # documented in https://github.com/digitalocean/digitalocean-cloud-controller-manager/blob/master/docs/controllers/services/annotations.md#servicebetakubernetesiodo-loadbalancer-name service.beta.kubernetes.io/do-loadbalancer-name: "do-k8s-ingress-lb" service.beta.kubernetes.io/do-loadbalancer-tls-passthrough: "true" name: ingress-nginx-controller namespace: ingress-nginx - - |- +- patch: |- apiVersion: apps/v1 kind: Deployment metadata: