From 0bfb26d9328bf3806181c77cb2bbca29d9b24aee Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Tue, 11 Sep 2018 09:05:28 +0100 Subject: [PATCH] Update webhook to listen on port 6443 Signed-off-by: James Munnelly --- contrib/charts/cert-manager/Chart.yaml | 4 +- contrib/charts/cert-manager/requirements.lock | 6 +-- contrib/charts/cert-manager/requirements.yaml | 2 +- .../charts/cert-manager/webhook/Chart.yaml | 4 +- .../webhook/templates/deployment.yaml | 1 + .../webhook/templates/service.yaml | 2 +- .../cert-manager/with-rbac-webhook.yaml | 39 ++++++++++--------- contrib/manifests/cert-manager/with-rbac.yaml | 14 +++---- .../cert-manager/without-rbac-webhook.yaml | 39 ++++++++++--------- .../manifests/cert-manager/without-rbac.yaml | 8 ++-- 10 files changed, 61 insertions(+), 58 deletions(-) diff --git a/contrib/charts/cert-manager/Chart.yaml b/contrib/charts/cert-manager/Chart.yaml index 993663b8a..ece783c73 100644 --- a/contrib/charts/cert-manager/Chart.yaml +++ b/contrib/charts/cert-manager/Chart.yaml @@ -1,6 +1,6 @@ name: cert-manager -version: v0.5.0 -appVersion: v0.5.0 +version: v0.6.0-dev.0 +appVersion: v0.6.0-dev.0 description: A Helm chart for cert-manager home: https://github.com/jetstack/cert-manager keywords: diff --git a/contrib/charts/cert-manager/requirements.lock b/contrib/charts/cert-manager/requirements.lock index 0c0d02838..773f052e4 100644 --- a/contrib/charts/cert-manager/requirements.lock +++ b/contrib/charts/cert-manager/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: webhook repository: file://webhook - version: v0.5.0 -digest: sha256:1a599fad18dc75842074c7ab10a66cebce521f27fa94ab6642d744479694200e -generated: 2018-09-10T15:39:26.405370694+01:00 + version: v0.6.0-dev.0 +digest: sha256:4f62fe2a5ebf3fcc106fb9cf436fb5d0fa9a127d415ac53cf6650dbb9b8f227a +generated: 2018-09-11T09:26:35.014090394+01:00 diff --git a/contrib/charts/cert-manager/requirements.yaml b/contrib/charts/cert-manager/requirements.yaml index 96b602bee..6f984348d 100644 --- a/contrib/charts/cert-manager/requirements.yaml +++ b/contrib/charts/cert-manager/requirements.yaml @@ -1,6 +1,6 @@ # requirements.yaml dependencies: - name: webhook - version: "v0.5.0" + version: "v0.6.0-dev.0" repository: "file://webhook" condition: webhook.enabled diff --git a/contrib/charts/cert-manager/webhook/Chart.yaml b/contrib/charts/cert-manager/webhook/Chart.yaml index 1a0bcda86..8814df434 100644 --- a/contrib/charts/cert-manager/webhook/Chart.yaml +++ b/contrib/charts/cert-manager/webhook/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "v0.5.0" +appVersion: "v0.6.0-dev.0" description: A Helm chart for deploying the cert-manager webhook component name: webhook -version: "v0.5.0" +version: "v0.6.0-dev.0" diff --git a/contrib/charts/cert-manager/webhook/templates/deployment.yaml b/contrib/charts/cert-manager/webhook/templates/deployment.yaml index e81ed606b..71c44eb8d 100644 --- a/contrib/charts/cert-manager/webhook/templates/deployment.yaml +++ b/contrib/charts/cert-manager/webhook/templates/deployment.yaml @@ -31,6 +31,7 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} args: - --v=12 + - --secure-port=6443 - --tls-cert-file=/certs/tls.crt - --tls-private-key-file=/certs/tls.key - --disable-admission-plugins=NamespaceLifecycle,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,Initializers diff --git a/contrib/charts/cert-manager/webhook/templates/service.yaml b/contrib/charts/cert-manager/webhook/templates/service.yaml index 88c487cc1..bd4cec06a 100644 --- a/contrib/charts/cert-manager/webhook/templates/service.yaml +++ b/contrib/charts/cert-manager/webhook/templates/service.yaml @@ -13,7 +13,7 @@ spec: ports: - name: https port: 443 - targetPort: 443 + targetPort: 6443 selector: app: {{ include "webhook.name" . }} release: {{ .Release.Name }} diff --git a/contrib/manifests/cert-manager/with-rbac-webhook.yaml b/contrib/manifests/cert-manager/with-rbac-webhook.yaml index 19ca015f1..28feb934c 100644 --- a/contrib/manifests/cert-manager/with-rbac-webhook.yaml +++ b/contrib/manifests/cert-manager/with-rbac-webhook.yaml @@ -7,7 +7,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller @@ -23,7 +23,7 @@ metadata: name: webhook:auth-delegator labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller roleRef: @@ -48,7 +48,7 @@ metadata: namespace: kube-system labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller roleRef: @@ -69,7 +69,7 @@ metadata: name: webhook:webhook-requester labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller rules: @@ -91,7 +91,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -99,7 +99,7 @@ spec: ports: - name: https port: 443 - targetPort: 443 + targetPort: 6443 selector: app: webhook release: webhook @@ -113,7 +113,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -136,6 +136,7 @@ spec: imagePullPolicy: IfNotPresent args: - --v=12 + - --secure-port=6443 - --tls-cert-file=/certs/tls.crt - --tls-private-key-file=/certs/tls.key - --disable-admission-plugins=NamespaceLifecycle,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,Initializers @@ -170,7 +171,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -212,7 +213,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -251,7 +252,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller data: @@ -284,7 +285,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller --- @@ -294,7 +295,7 @@ metadata: name: webhook-ca-sync labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller rules: @@ -320,7 +321,7 @@ metadata: name: webhook-ca-sync labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller roleRef: @@ -340,7 +341,7 @@ metadata: name: v1beta1.admission.certmanager.k8s.io labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -364,7 +365,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -380,7 +381,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -400,7 +401,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -417,7 +418,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -437,7 +438,7 @@ metadata: name: webhook labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller webhooks: diff --git a/contrib/manifests/cert-manager/with-rbac.yaml b/contrib/manifests/cert-manager/with-rbac.yaml index 8c434d2b2..fe371d2ff 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.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller --- @@ -31,7 +31,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller spec: @@ -55,7 +55,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller spec: @@ -75,7 +75,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller spec: @@ -93,7 +93,7 @@ metadata: name: cert-manager labels: app: cert-manager - chart: cert-manager-v0.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller rules: @@ -113,7 +113,7 @@ metadata: name: cert-manager labels: app: cert-manager - chart: cert-manager-v0.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller roleRef: @@ -133,7 +133,7 @@ metadata: namespace: "cert-manager" labels: app: cert-manager - chart: cert-manager-v0.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller spec: diff --git a/contrib/manifests/cert-manager/without-rbac-webhook.yaml b/contrib/manifests/cert-manager/without-rbac-webhook.yaml index 19ca015f1..28feb934c 100644 --- a/contrib/manifests/cert-manager/without-rbac-webhook.yaml +++ b/contrib/manifests/cert-manager/without-rbac-webhook.yaml @@ -7,7 +7,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller @@ -23,7 +23,7 @@ metadata: name: webhook:auth-delegator labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller roleRef: @@ -48,7 +48,7 @@ metadata: namespace: kube-system labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller roleRef: @@ -69,7 +69,7 @@ metadata: name: webhook:webhook-requester labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller rules: @@ -91,7 +91,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -99,7 +99,7 @@ spec: ports: - name: https port: 443 - targetPort: 443 + targetPort: 6443 selector: app: webhook release: webhook @@ -113,7 +113,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -136,6 +136,7 @@ spec: imagePullPolicy: IfNotPresent args: - --v=12 + - --secure-port=6443 - --tls-cert-file=/certs/tls.crt - --tls-private-key-file=/certs/tls.key - --disable-admission-plugins=NamespaceLifecycle,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,Initializers @@ -170,7 +171,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -212,7 +213,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -251,7 +252,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller data: @@ -284,7 +285,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller --- @@ -294,7 +295,7 @@ metadata: name: webhook-ca-sync labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller rules: @@ -320,7 +321,7 @@ metadata: name: webhook-ca-sync labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller roleRef: @@ -340,7 +341,7 @@ metadata: name: v1beta1.admission.certmanager.k8s.io labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -364,7 +365,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -380,7 +381,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -400,7 +401,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -417,7 +418,7 @@ metadata: namespace: "cert-manager" labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller spec: @@ -437,7 +438,7 @@ metadata: name: webhook labels: app: webhook - chart: webhook-v0.5.0 + chart: webhook-v0.6.0-dev.0 release: webhook heritage: Tiller webhooks: diff --git a/contrib/manifests/cert-manager/without-rbac.yaml b/contrib/manifests/cert-manager/without-rbac.yaml index d9249ba5b..8dad7b541 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.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller spec: @@ -43,7 +43,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller spec: @@ -63,7 +63,7 @@ metadata: "helm.sh/hook": crd-install labels: app: cert-manager - chart: cert-manager-v0.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller spec: @@ -82,7 +82,7 @@ metadata: namespace: "cert-manager" labels: app: cert-manager - chart: cert-manager-v0.5.0 + chart: cert-manager-v0.6.0-dev.0 release: cert-manager heritage: Tiller spec: