Skip to content

Commit

Permalink
Merge pull request #177 from adrianludwin/cm-v1.0
Browse files Browse the repository at this point in the history
Fix cert-manager build error (cherry-pick)
  • Loading branch information
k8s-ci-robot committed Mar 31, 2022
2 parents 8203482 + c9229ce commit e3b4dc1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
4 changes: 2 additions & 2 deletions config/certmanager/certificate.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# The following manifests contain a self-signed issuer CR and a certificate CR.
# More document can be found at https://docs.cert-manager.io
apiVersion: cert-manager.io/v1alpha2
apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
name: selfsigned-issuer
namespace: system
spec:
selfSigned: {}
---
apiVersion: cert-manager.io/v1alpha2
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: serving-cert # this name should match the one appeared in kustomizeconfig.yaml
Expand Down
8 changes: 0 additions & 8 deletions config/crd/patches/cainjection_in_hierarchies.yaml

This file was deleted.

12 changes: 12 additions & 0 deletions config/variants/default-cm/README
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,15 @@ building the manifests ("made manifests" in the root directory).

As of March 2022, I ([email protected]) have not actually tested this to see if
it works.

If/when we next need to use CRD conversion webhooks, add the following patches
to this directory:

# The following patch adds a directive for certmanager to inject CA into the CRD
# CRD conversion requires k8s 1.13 or later.
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
name: hierarchies.hnc.x-k8s.io

0 comments on commit e3b4dc1

Please sign in to comment.