Skip to content

Commit

Permalink
Remove CRDs from Helm chart and introduce 00-crds.yaml file
Browse files Browse the repository at this point in the history
Signed-off-by: James Munnelly <james@munnelly.eu>
  • Loading branch information
munnerz committed Dec 4, 2018
1 parent 4283138 commit cdd513c
Show file tree
Hide file tree
Showing 13 changed files with 624 additions and 754 deletions.
4 changes: 1 addition & 3 deletions deploy/chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,8 @@ The following table lists the configurable parameters of the cert-manager chart
| `image.tag` | Image tag | `canary` |
| `image.pullPolicy` | Image pull policy | `Always` |
| `replicaCount` | Number of cert-manager replicas | `1` |
| `createCustomResource` | Create CRD/TPR with this release | `true` |
| `clusterResourceNamespace` | Override the namespace used to store DNS provider credentials etc. for ClusterIssuer resources | Same namespace as cert-manager pod
| `leaderElection.Namespace` | Override the namespace used to store the ConfigMap for leader election | Same namespace as cert-manager pod
| `certificateResourceShortNames` | Custom aliases for Certificate CRD | `["cert", "certs"]` |
| `extraArgs` | Optional flags for cert-manager | `[]` |
| `extraEnv` | Optional environment variables for cert-manager | `[]` |
| `rbac.create` | If `true`, create and use RBAC resources | `true` |
Expand All @@ -81,7 +79,7 @@ The following table lists the configurable parameters of the cert-manager chart
| `http_proxy` | Value of the `HTTP_PROXY` environment variable in the cert-manager pod | |
| `https_proxy` | Value of the `HTTPS_PROXY` environment variable in the cert-manager pod | |
| `no_proxy` | Value of the `NO_PROXY` environment variable in the cert-manager pod | |
| `webhook.enabled` | Toggles whether the validating webhook component should be installed | `false` |
| `webhook.enabled` | Toggles whether the validating webhook component should be installed | `true` |
| `webhook.replicaCount` | Number of cert-manager webhook replicas | `1` |
| `webhook.podAnnotations` | Annotations to add to the webhook pods | `{}` |
| `webhook.extraArgs` | Optional flags for cert-manager webhook component | `[]` |
Expand Down
26 changes: 0 additions & 26 deletions deploy/chart/templates/certificate-crd.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions deploy/chart/templates/challenge-crd.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions deploy/chart/templates/clusterissuer-crd.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions deploy/chart/templates/issuer-crd.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions deploy/chart/templates/order-crd.yaml

This file was deleted.

6 changes: 1 addition & 5 deletions deploy/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ image:
tag: canary
pullPolicy: Always

createCustomResource: true

# Override the namespace used to store DNS provider credentials etc. for ClusterIssuer
# resources. By default, the same namespace as cert-manager is deployed within is
# used. This namespace will not be automatically created by the Helm chart.
Expand All @@ -25,8 +23,6 @@ leaderElection:
# Override the namespace used to store the ConfigMap for leader election
namespace: ""

certificateResourceShortNames: ["cert", "certs"]

rbac:
# Specifies whether RBAC resources should be created
create: true
Expand Down Expand Up @@ -76,7 +72,7 @@ ingressShim: {}
# defaultACMEDNS01ChallengeProvider: ""

webhook:
enabled: false
enabled: true

# This is used by the static manifest generator in order to create a static
# namespace manifest for the namespace that cert-manager is being installed
Expand Down
91 changes: 91 additions & 0 deletions deploy/manifests/00-crds.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
## THIS FILE IS MANUALLY WRITTEN AND NOT AUTOMATICALLY GENERATED
##
## You should install this file with "kubectl apply -f" before installing the
## cert-manager Helm chart or applying the "deploy/manifests/cert-manager.yaml"
## file.
##

---

apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: certificates.certmanager.k8s.io
labels:
app: cert-manager
spec:
group: certmanager.k8s.io
version: v1alpha1
scope: Namespaced
names:
kind: Certificate
plural: certificates
shortNames:
- cert
- certs

---

apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: issuers.certmanager.k8s.io
labels:
app: cert-manager
spec:
group: certmanager.k8s.io
version: v1alpha1
names:
kind: Issuer
plural: issuers
scope: Namespaced

---

apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: clusterissuers.certmanager.k8s.io
labels:
app: cert-manager
spec:
group: certmanager.k8s.io
version: v1alpha1
names:
kind: ClusterIssuer
plural: clusterissuers
scope: Cluster

---

apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: orders.certmanager.k8s.io
labels:
app: cert-manager
spec:
group: certmanager.k8s.io
version: v1alpha1
names:
kind: Order
plural: orders
scope: Namespaced

---

apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: challenges.certmanager.k8s.io
labels:
app: cert-manager
spec:
group: certmanager.k8s.io
version: v1alpha1
names:
kind: Challenge
plural: challenges
scope: Namespaced

---
12 changes: 5 additions & 7 deletions deploy/manifests/README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
# Deployment files

This directory contains example deployment manifests for cert-manager that can
be used in place of the official Helm chart.
This directory contains the Kubernetes manifests needed to deploy cert-manager.

This is useful if you are deploying cert-manager into an environment without
Helm, or want to inspect a 'bare minimum' deployment.
For full information on deploying cert-manager, see the [getting started guide](TODO).

## Where do these come from?

The manifests in this are generated from the Helm chart automatically.
The `values.yaml` files used to configure cert-manager can be found in
[`hack/deploy`](../../hack/deploy/).
The [helm-values.yaml](./helm-values.yaml) file in this directory is used to
generate the [cert-manager.yaml](./cert-manager.yaml) manifest.

They are automatically generated by running `./hack/update-deploy-gen.sh`.
They are automatically generated using `bazel run //hack:update-deploy-gen`.
Loading

0 comments on commit cdd513c

Please sign in to comment.