From 3215e69e8c15307f8fba42ae7d464eeb8bac095d Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Tue, 25 Aug 2020 22:16:51 -0400 Subject: [PATCH] Sync helm chart affinity examples --- charts/ingress-nginx/Chart.yaml | 2 +- charts/ingress-nginx/values.yaml | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/charts/ingress-nginx/Chart.yaml b/charts/ingress-nginx/Chart.yaml index 7e2b01683..c2939fbe1 100644 --- a/charts/ingress-nginx/Chart.yaml +++ b/charts/ingress-nginx/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: ingress-nginx -version: 2.12.0 +version: 2.12.1 appVersion: 0.34.1 home: https://github.com/kubernetes/ingress-nginx description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml index afa41219b..7955dac0e 100644 --- a/charts/ingress-nginx/values.yaml +++ b/charts/ingress-nginx/values.yaml @@ -168,10 +168,18 @@ controller: # podAffinityTerm: # labelSelector: # matchExpressions: - # - key: app + # - key: app.kubernetes.io/name # operator: In # values: # - ingress-nginx + # - key: app.kubernetes.io/instance + # operator: In + # values: + # - ingress-nginx + # - key: app.kubernetes.io/component + # operator: In + # values: + # - controller # topologyKey: kubernetes.io/hostname # # An example of required pod anti-affinity @@ -179,10 +187,18 @@ controller: # requiredDuringSchedulingIgnoredDuringExecution: # - labelSelector: # matchExpressions: - # - key: app + # - key: app.kubernetes.io/name # operator: In # values: # - ingress-nginx + # - key: app.kubernetes.io/instance + # operator: In + # values: + # - ingress-nginx + # - key: app.kubernetes.io/component + # operator: In + # values: + # - controller # topologyKey: "kubernetes.io/hostname" ## terminationGracePeriodSeconds