From 6a6268c8d7b6e2a9dcce1edab8ba2dd84f3eaa12 Mon Sep 17 00:00:00 2001 From: Gintautas Sulskus Date: Wed, 5 Sep 2018 16:30:43 +0100 Subject: [PATCH 1/2] added affinity and tolerations Signed-off-by: Gintautas Sulskus --- .../cert-manager/templates/deployment.yaml | 8 +++++++ contrib/charts/cert-manager/values.yaml | 22 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/contrib/charts/cert-manager/templates/deployment.yaml b/contrib/charts/cert-manager/templates/deployment.yaml index 5a48c7942..83f801241 100644 --- a/contrib/charts/cert-manager/templates/deployment.yaml +++ b/contrib/charts/cert-manager/templates/deployment.yaml @@ -59,6 +59,14 @@ spec: {{- if .defaultACMEDNS01ChallengeProvider }} - --default-acme-issuer-dns01-provider-name={{ .defaultACMEDNS01ChallengeProvider }} {{- end }} + {{- end }} + {{- if .Values.affinity }} + affinity: +{{ toYaml .Values.affinity | indent 10 }} + {{- end }} + {{- if .Values.tolerations }} + tolerations: +{{ toYaml .Values.tolerations | indent 10 }} {{- end }} env: - name: POD_NAMESPACE diff --git a/contrib/charts/cert-manager/values.yaml b/contrib/charts/cert-manager/values.yaml index 3ebec3b09..78d488742 100644 --- a/contrib/charts/cert-manager/values.yaml +++ b/contrib/charts/cert-manager/values.yaml @@ -81,3 +81,25 @@ createNamespaceResource: false # http_proxy: "http://proxy:8080" # http_proxy: "http://proxy:8080" # no_proxy: 127.0.0.1,localhost + +# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#affinity-v1-core +# for example: +# affinity: +# nodeAffinity: +# requiredDuringSchedulingIgnoredDuringExecution: +# nodeSelectorTerms: +# - matchExpressions: +# - key: foo.bar.com/role +# operator: In +# values: +# - master +affinity: {} + +# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#toleration-v1-core +# for example: +# tolerations: +# - key: foo.bar.com/role +# operator: Equal +# value: master +# effect: NoSchedule +tolerations: [] From 7a39753e0af3be08207ea4b543df6708f4b3ee0d Mon Sep 17 00:00:00 2001 From: Gintautas Sulskus Date: Wed, 5 Sep 2018 16:38:16 +0100 Subject: [PATCH 2/2] generated static deployemnt manifests Signed-off-by: Gintautas Sulskus --- contrib/charts/cert-manager/Chart.yaml | 2 +- contrib/manifests/cert-manager/with-rbac.yaml | 14 +++++++------- contrib/manifests/cert-manager/without-rbac.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/charts/cert-manager/Chart.yaml b/contrib/charts/cert-manager/Chart.yaml index 0d24cbc53..5b319f6fc 100644 --- a/contrib/charts/cert-manager/Chart.yaml +++ b/contrib/charts/cert-manager/Chart.yaml @@ -1,5 +1,5 @@ name: cert-manager -version: v0.4.0-dev.5 +version: v0.4.0-dev.6 appVersion: v0.4.0-dev.0 description: A Helm chart for cert-manager home: https://github.com/jetstack/cert-manager diff --git a/contrib/manifests/cert-manager/with-rbac.yaml b/contrib/manifests/cert-manager/with-rbac.yaml index b17e7f99f..5025be7ab 100644 --- a/contrib/manifests/cert-manager/with-rbac.yaml +++ b/contrib/manifests/cert-manager/with-rbac.yaml @@ -18,7 +18,7 @@ metadata: namespace: "cert-manager" labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller --- @@ -31,7 +31,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller spec: @@ -55,7 +55,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller spec: @@ -75,7 +75,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller spec: @@ -93,7 +93,7 @@ metadata: name: cert-manager labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller rules: @@ -113,7 +113,7 @@ metadata: name: cert-manager labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller roleRef: @@ -133,7 +133,7 @@ metadata: namespace: "cert-manager" labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller spec: diff --git a/contrib/manifests/cert-manager/without-rbac.yaml b/contrib/manifests/cert-manager/without-rbac.yaml index 0b74dbe10..3834967be 100644 --- a/contrib/manifests/cert-manager/without-rbac.yaml +++ b/contrib/manifests/cert-manager/without-rbac.yaml @@ -19,7 +19,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller spec: @@ -43,7 +43,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller spec: @@ -63,7 +63,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller spec: @@ -82,7 +82,7 @@ metadata: namespace: "cert-manager" labels: app: cert-manager - chart: cert-manager-v0.4.0-dev.5 + chart: cert-manager-v0.4.0-dev.6 release: cert-manager heritage: Tiller spec: