weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Requested Changes

Browse Source 
- changing the name of the command line option to --auto-certificate-annotations
- making the option an array to allow for multiple annotations settings

Signed-off-by: Rohith Jayawardene <gambol99@gmail.com>
This commit is contained in:
Rohith 2018-07-31 21:51:28 +01:00
parent 712a7a85ee
commit e2f13f5f9c
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/controller/app/controller.go
View File

@ -181,7 +181,7 @@ func buildControllerContext(opts *options.ControllerOptions) (*controller.Contex
IngressShimOptions: controller.IngressShimOptions{
DefaultIssuerName: opts.DefaultIssuerName,
DefaultIssuerKind: opts.DefaultIssuerKind,
DefaultACMEAnnotation: opts.DefaultACMEAnnotation,
DefaultAutoCertificateAnnotations: opts.DefaultAutoCertificateAnnotations,
DefaultACMEIssuerChallengeType: opts.DefaultACMEIssuerChallengeType,
DefaultACMEIssuerDNS01ProviderName: opts.DefaultACMEIssuerDNS01ProviderName,
},

13
cmd/controller/app/options/options.go
View File

@ -56,9 +56,9 @@ type ControllerOptions struct {
RenewBeforeExpiryDuration time.Duration
// Default issuer/certificates details consumed by ingress-shim
DefaultACMEAnnotation string
DefaultIssuerName string
DefaultIssuerName string
DefaultIssuerKind string
DefaultAutoCertificateAnnotations []string
DefaultACMEIssuerChallengeType string
DefaultACMEIssuerDNS01ProviderName string
@ -80,9 +80,8 @@ const (
defaultIssuerAmbientCredentials = false
defaultRenewBeforeExpiryDuration = time.Hour * 24 * 30
defaultTLSACMEIssuerName = ""
defaultTLSACMEIssuerName = ""
defaultTLSACMEIssuerKind = "Issuer"
defaultACMEAnnotation = "kubernetes.io/tls-acme"
defaultACMEIssuerChallengeType = "http01"
defaultACMEIssuerDNS01ProviderName = ""
)
@ -94,6 +93,8 @@ var (
defaultACMEHTTP01SolverResourceLimitsCPU = "10m"
defaultACMEHTTP01SolverResourceLimitsMemory = "64Mi"
defaultAutoCertificateAnnotations = []string{"kubernetes.io/tls-acme"}
defaultEnabledControllers = []string{
issuerscontroller.ControllerName,
clusterissuerscontroller.ControllerName,
@ -117,9 +118,9 @@ func NewControllerOptions() *ControllerOptions {
ClusterIssuerAmbientCredentials: defaultClusterIssuerAmbientCredentials,
IssuerAmbientCredentials: defaultIssuerAmbientCredentials,
RenewBeforeExpiryDuration: defaultRenewBeforeExpiryDuration,
DefaultACMEAnnotation: defaultACMEAnnotation,
DefaultIssuerName: defaultTLSACMEIssuerName,
DefaultIssuerKind: defaultTLSACMEIssuerKind,
DefaultAutoCertificateAnnotations: defaultAutoCertificateAnnotations,
DefaultACMEIssuerChallengeType: defaultACMEIssuerChallengeType,
DefaultACMEIssuerDNS01ProviderName: defaultACMEIssuerDNS01ProviderName,
DNS01Nameservers: []string{},
@ -183,7 +184,7 @@ func (s *ControllerOptions) AddFlags(fs *pflag.FlagSet) {
"The default 'renew before expiry' time for Certificates. "+
"Once a certificate is within this duration until expiry, a new Certificate "+
"will be attempted to be issued.")
fs.StringVar(&s.DefaultACMEAnnotation, "default-acme-annotation", defaultACMEAnnotation, ""+
fs.StringSliceVar(&s.DefaultAutoCertificateAnnotations, "auto-certificate-annotations", defaultAutoCertificateAnnotations, ""+
"The annotation consumed by the ingress-shim controller to indicate a ingress is requesting a certificate")
fs.StringVar(&s.DefaultIssuerName, "default-issuer-name", defaultTLSACMEIssuerName, ""+

4
pkg/controller/context.go
View File

@ -100,9 +100,9 @@ type ACMEOptions struct {
type IngressShimOptions struct {
// Default issuer/certificates details consumed by ingress-shim
DefaultACMEAnnotation string
DefaultIssuerName string
DefaultIssuerKind string
DefaultIssuerName string
DefaultACMEIssuerChallengeType string
DefaultACMEIssuerDNS01ProviderName string
DefaultAutoCertificateAnnotations []string
}

4
pkg/controller/ingress-shim/controller.go
View File

@ -46,7 +46,7 @@ const (
)
type defaults struct {
acmeTLSAnnotation string
autoCertificateAnnotations []string
issuerName, issuerKind string
acmeIssuerChallengeType string
acmeIssuerDNS01ProviderName string
@ -218,7 +218,7 @@ func init() {
ctx.Client,
ctx.CMClient,
ctx.Recorder,
defaults{ctx.DefaultACMEAnnotation, ctx.DefaultIssuerName, ctx.DefaultIssuerKind, ctx.DefaultACMEIssuerChallengeType, ctx.DefaultACMEIssuerDNS01ProviderName},
defaults{ctx.DefaultAutoCertificateAnnotations, ctx.DefaultIssuerName, ctx.DefaultIssuerKind, ctx.DefaultACMEIssuerChallengeType, ctx.DefaultACMEIssuerDNS01ProviderName},
).Run
})
}

12
pkg/controller/ingress-shim/sync.go
View File

@ -59,7 +59,7 @@ const (
var ingressGVK = extv1beta1.SchemeGroupVersion.WithKind("Ingress")
func (c *Controller) Sync(ctx context.Context, ing *extv1beta1.Ingress) error {
if !shouldSync(ing, c.defaults.acmeTLSAnnotation) {
if !shouldSync(ing, c.defaults.autoCertificateAnnotations) {
glog.Infof("Not syncing ingress %s/%s as it does not contain necessary annotations", ing.Namespace, ing.Name)
return nil
}
@ -256,7 +256,7 @@ func (c *Controller) setIssuerSpecificConfig(crt *v1alpha1.Certificate, issuer v
// shouldSync returns true if this ingress should have a Certificate resource
// created for it
func shouldSync(ing *extv1beta1.Ingress, tlsACMEAnnotation string) bool {
func shouldSync(ing *extv1beta1.Ingress, autoCertificateAnnotations []string) bool {
annotations := ing.Annotations
if annotations == nil {
annotations = map[string]string{}
@ -267,9 +267,11 @@ func shouldSync(ing *extv1beta1.Ingress, tlsACMEAnnotation string) bool {
if _, ok := annotations[clusterIssuerNameAnnotation]; ok {
return true
}
if s, ok := annotations[tlsACMEAnnotation]; ok {
if b, _ := strconv.ParseBool(s); b {
return true
for _, x := range autoCertificateAnnotations {
if s, ok := annotations[x]; ok {
if b, _ := strconv.ParseBool(s); b {
return true
}
}
}
if _, ok := annotations[acmeIssuerChallengeTypeAnnotation]; ok {

2
pkg/controller/ingress-shim/sync_test.go
View File

@ -73,7 +73,7 @@ func TestShouldSync(t *testing.T) {
},
}
for _, test := range tests {
shouldSync := shouldSync(buildIngress("", "", test.Annotations), "kubernetes.io/tls-acme")
shouldSync := shouldSync(buildIngress("", "", test.Annotations), []string{"kubernetes.io/tls-acme"})
if shouldSync != test.ShouldSync {
t.Errorf("Expected shouldSync=%v for annotations %#v", test.ShouldSync, test.Annotations)
}