Skip to content

Commit

Permalink
Merge pull request cert-manager#1315 from munnerz/automated-cherry-pi…
Browse files Browse the repository at this point in the history
…ck-of-#1314-release-0.6

Automated cherry pick of cert-manager#1314
  • Loading branch information
jetstack-bot committed Feb 5, 2019
2 parents ea28e7c + 83afdc8 commit 45fbfcd
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 47 deletions.
4 changes: 2 additions & 2 deletions deploy/charts/cert-manager/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: cert-manager
version: v0.6.4
appVersion: v0.6.0
version: v0.6.5
appVersion: v0.6.1
description: A Helm chart for cert-manager
home: https://github.com/jetstack/cert-manager
keywords:
Expand Down
4 changes: 2 additions & 2 deletions deploy/charts/cert-manager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ The following table lists the configurable parameters of the cert-manager chart
| --------- | ----------- | ------- |
| `global.imagePullSecrets` | Reference to one or more secrets to be used when pulling images | `[]` |
| `image.repository` | Image repository | `quay.io/jetstack/cert-manager-controller` |
| `image.tag` | Image tag | `v0.6.0` |
| `image.tag` | Image tag | `v0.6.1` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `replicaCount` | Number of cert-manager replicas | `1` |
| `clusterResourceNamespace` | Override the namespace used to store DNS provider credentials etc. for ClusterIssuer resources | Same namespace as cert-manager pod
Expand Down Expand Up @@ -107,7 +107,7 @@ The following table lists the configurable parameters of the cert-manager chart
| `webhook.extraArgs` | Optional flags for cert-manager webhook component | `[]` |
| `webhook.resources` | CPU/memory resource requests/limits for the webhook pods | |
| `webhook.image.repository` | Webhook image repository | `quay.io/jetstack/cert-manager-webhook` |
| `webhook.image.tag` | Webhook image tag | `v0.6.0` |
| `webhook.image.tag` | Webhook image tag | `v0.6.1` |
| `webhook.image.pullPolicy` | Webhook image pull policy | `IfNotPresent` |
| `webhook.caSyncImage.repository` | CA sync image repository | `quay.io/munnerz/apiextensions-ca-helper` |
| `webhook.caSyncImage.tag` | CA sync image tag | `v0.1.0` |
Expand Down
6 changes: 3 additions & 3 deletions deploy/charts/cert-manager/requirements.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: webhook
repository: file://webhook
version: v0.6.2
digest: sha256:e87128b03546761a8a2273f3d72c78f6133ecae66b9ec08dc1969628aac57f90
generated: 2019-01-31T21:00:29.754276649Z
version: v0.6.3
digest: sha256:77dcd917e3112dfc7ddb3f1cca72bb337f067706b1020dec0fda4a2d41a945bf
generated: 2019-02-05T13:43:12.838251554Z
2 changes: 1 addition & 1 deletion deploy/charts/cert-manager/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# requirements.yaml
dependencies:
- name: webhook
version: "v0.6.2"
version: "v0.6.3"
repository: "file://webhook"
condition: webhook.enabled
2 changes: 1 addition & 1 deletion deploy/charts/cert-manager/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ strategy: {}

image:
repository: quay.io/jetstack/cert-manager-controller
tag: v0.6.0
tag: v0.6.1
pullPolicy: IfNotPresent

# Override the namespace used to store DNS provider credentials etc. for ClusterIssuer
Expand Down
4 changes: 2 additions & 2 deletions deploy/charts/cert-manager/webhook/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: webhook
apiVersion: v1
version: "v0.6.2"
appVersion: "v0.6.0"
version: "v0.6.3"
appVersion: "v0.6.1"
description: A Helm chart for deploying the cert-manager webhook component
home: https://github.com/jetstack/cert-manager
sources:
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/cert-manager/webhook/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ resources: {}

image:
repository: quay.io/jetstack/cert-manager-webhook
tag: v0.6.0
tag: v0.6.1
pullPolicy: IfNotPresent

caSyncImage:
Expand Down
14 changes: 7 additions & 7 deletions deploy/manifests/cert-manager-no-webhook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ metadata:
namespace: "cert-manager"
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
---
Expand All @@ -166,7 +166,7 @@ metadata:
name: cert-manager
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
rules:
Expand All @@ -186,7 +186,7 @@ metadata:
name: cert-manager
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
roleRef:
Expand All @@ -204,7 +204,7 @@ metadata:
name: cert-manager-view
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
rbac.authorization.k8s.io/aggregate-to-view: "true"
Expand All @@ -221,7 +221,7 @@ metadata:
name: cert-manager-edit
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
rbac.authorization.k8s.io/aggregate-to-edit: "true"
Expand All @@ -239,7 +239,7 @@ metadata:
namespace: "cert-manager"
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
spec:
Expand All @@ -258,7 +258,7 @@ spec:
serviceAccountName: cert-manager
containers:
- name: cert-manager
image: "quay.io/jetstack/cert-manager-controller:v0.6.0"
image: "quay.io/jetstack/cert-manager-controller:v0.6.1"
imagePullPolicy: IfNotPresent
args:
- --cluster-resource-namespace=$(POD_NAMESPACE)
Expand Down
52 changes: 26 additions & 26 deletions deploy/manifests/cert-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller

Expand All @@ -168,7 +168,7 @@ metadata:
namespace: "cert-manager"
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
---
Expand All @@ -179,7 +179,7 @@ metadata:
name: cert-manager
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
rules:
Expand All @@ -199,7 +199,7 @@ metadata:
name: cert-manager
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
roleRef:
Expand All @@ -217,7 +217,7 @@ metadata:
name: cert-manager-view
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
rbac.authorization.k8s.io/aggregate-to-view: "true"
Expand All @@ -234,7 +234,7 @@ metadata:
name: cert-manager-edit
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
rbac.authorization.k8s.io/aggregate-to-edit: "true"
Expand All @@ -255,7 +255,7 @@ metadata:
name: cert-manager-webhook:auth-delegator
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
roleRef:
Expand All @@ -280,7 +280,7 @@ metadata:
namespace: kube-system
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
roleRef:
Expand All @@ -301,7 +301,7 @@ metadata:
name: cert-manager-webhook:webhook-requester
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
rules:
Expand All @@ -323,7 +323,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
spec:
Expand All @@ -345,7 +345,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
spec:
Expand All @@ -364,7 +364,7 @@ spec:
serviceAccountName: cert-manager-webhook
containers:
- name: webhook
image: "quay.io/jetstack/cert-manager-webhook:v0.6.0"
image: "quay.io/jetstack/cert-manager-webhook:v0.6.1"
imagePullPolicy: IfNotPresent
args:
- --v=12
Expand Down Expand Up @@ -397,7 +397,7 @@ metadata:
namespace: "cert-manager"
labels:
app: cert-manager
chart: cert-manager-v0.6.4
chart: cert-manager-v0.6.5
release: cert-manager
heritage: Tiller
spec:
Expand All @@ -416,7 +416,7 @@ spec:
serviceAccountName: cert-manager
containers:
- name: cert-manager
image: "quay.io/jetstack/cert-manager-controller:v0.6.0"
image: "quay.io/jetstack/cert-manager-controller:v0.6.1"
imagePullPolicy: IfNotPresent
args:
- --cluster-resource-namespace=$(POD_NAMESPACE)
Expand Down Expand Up @@ -445,7 +445,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
spec:
Expand Down Expand Up @@ -488,7 +488,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
spec:
Expand Down Expand Up @@ -528,7 +528,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
data:
Expand Down Expand Up @@ -561,7 +561,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
---
Expand All @@ -571,7 +571,7 @@ metadata:
name: cert-manager-webhook-ca-sync
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
rules:
Expand All @@ -597,7 +597,7 @@ metadata:
name: cert-manager-webhook-ca-sync
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
roleRef:
Expand All @@ -617,7 +617,7 @@ metadata:
name: v1beta1.admission.certmanager.k8s.io
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
spec:
Expand All @@ -641,7 +641,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
spec:
Expand All @@ -657,7 +657,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
spec:
Expand All @@ -678,7 +678,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
spec:
Expand All @@ -695,7 +695,7 @@ metadata:
namespace: "cert-manager"
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
spec:
Expand All @@ -716,7 +716,7 @@ metadata:
name: cert-manager-webhook
labels:
app: webhook
chart: webhook-v0.6.2
chart: webhook-v0.6.3
release: cert-manager
heritage: Tiller
webhooks:
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ In order to install the Helm chart, you must run:
helm install \
--name cert-manager \
--namespace cert-manager \
--version v0.6.0 \
--version v0.6.1 \
stable/cert-manager
The default cert-manager configuration is good for the majority of users, but a
Expand Down
2 changes: 1 addition & 1 deletion docs/tasks/upgrading/upgrading-0.5-0.6.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Before upgrading you will need to:
$ helm install \
--name cert-manager \
--namespace cert-manager \
--version v0.6.0 \
--version v0.6.1 \
stable/cert-manager
4. Follow the steps in the :doc:`restore guide <../backup-restore-crds>` to
Expand Down

0 comments on commit 45fbfcd

Please sign in to comment.