Add enrollmentPatternName and enrollmentPatternId

Author: irby

api/v1alpha1/issuer_types.go

@@ -1,5 +1,5 @@
 /*
-Copyright © 2024 Keyfactor
+Copyright © 2025 Keyfactor
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -46,7 +46,23 @@ type IssuerSpec struct {
 	// +kubebuilder:default:=KeyfactorAPI
 	APIPath string `json:"apiPath,omitempty"`
 
-	// CertificateTemplate is the name of the certificate template to use.
+	// EnrollmentPatternId is the ID of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
+	// If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+	// If EnrollmentPatternId and EnrollmentPatternName are both specified, EnrollmentPatternId will take precedence.
+	// Enrollment will fail if the specified template is not compatible with the enrollment pattern.
+	// Refer to the Keyfactor Command documentation for more information.
+	EnrollmentPatternId int32 `json:"enrollmentPatternId,omitempty"`
+
+	// EnrollmentPatternName is the name of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
+	// If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+	// If EnrollmentPatternId and EnrollmentPatternName are both specified, EnrollmentPatternId will take precedence.
+	// Enrollment will fail if the specified template is not compatible with the enrollment pattern.
+	// Refer to the Keyfactor Command documentation for more information.
+	EnrollmentPatternName string `json:"enrollmentPatternName,omitempty"`
+
+	// Deprecated. CertificateTemplate is the name of the certificate template to use. If using Keyfactor Command 25.1 or later, use EnrollmentPatternName or EnrollmentPatternId instead.
+	// If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+	// Enrollment will fail if the specified template is not compatible with the enrollment pattern.
 	// Refer to the Keyfactor Command documentation for more information.
 	CertificateTemplate string `json:"certificateTemplate,omitempty"`
 

config/crd/bases/command-issuer.keyfactor.com_clusterissuers.yaml

@@ -68,9 +68,28 @@ spec:
                   CertificateAuthorityLogicalName is the logical name of the certificate authority to use
                   E.g. "Keyfactor Root CA" or "Intermediate CA"
                 type: string
+              enrollmentPatternId:
+                description: |-
+                  EnrollmentPatternId is the ID of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
+                  Refer to the Keyfactor Command documentation for more information.
+                type: integer
+                format: int32
+              enrollmentPatternName:
+                description: |-
+                  EnrollmentPatternName is the name of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
+                  Refer to the Keyfactor Command documentation for more information.
+                type: string
               certificateTemplate:
                 description: |-
-                  CertificateTemplate is the name of the certificate template to use.
+                  CertificateTemplate is the name of the certificate template to use. Deprecated in favor of EnrollmentPattern as of Keyfactor Command 25.1.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
                   Refer to the Keyfactor Command documentation for more information.
                 type: string
               commandSecretName:

config/crd/bases/command-issuer.keyfactor.com_issuers.yaml

@@ -68,9 +68,28 @@ spec:
                   CertificateAuthorityLogicalName is the logical name of the certificate authority to use
                   E.g. "Keyfactor Root CA" or "Intermediate CA"
                 type: string
+              enrollmentPatternId:
+                description: |-
+                  EnrollmentPatternId is the ID of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
+                  Refer to the Keyfactor Command documentation for more information.
+                type: integer
+                format: int32
+              enrollmentPatternName:
+                description: |-
+                  EnrollmentPatternName is the name of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
+                  Refer to the Keyfactor Command documentation for more information.
+                type: string
               certificateTemplate:
                 description: |-
-                  CertificateTemplate is the name of the certificate template to use.
+                  CertificateTemplate is the name of the certificate template to use. Deprecated in favor of EnrollmentPattern as of Keyfactor Command 25.1.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
                   Refer to the Keyfactor Command documentation for more information.
                 type: string
               commandSecretName:

deploy/charts/command-cert-manager-issuer/templates/crds/clusterissuers.yaml

@@ -62,9 +62,28 @@ spec:
                   CertificateAuthorityLogicalName is the logical name of the certificate authority to use
                   E.g. "Keyfactor Root CA" or "Intermediate CA"
                 type: string
+              enrollmentPatternId:
+                description: |-
+                  EnrollmentPatternId is the ID of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
+                  Refer to the Keyfactor Command documentation for more information.
+                type: integer
+                format: int32
+              enrollmentPatternName:
+                description: |-
+                  EnrollmentPatternName is the name of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
+                  Refer to the Keyfactor Command documentation for more information.
+                type: string
               certificateTemplate:
                 description: |-
-                  CertificateTemplate is the name of the certificate template to use.
+                  CertificateTemplate is the name of the certificate template to use. Deprecated in favor of EnrollmentPattern as of Keyfactor Command 25.1.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
                   Refer to the Keyfactor Command documentation for more information.
                 type: string
               commandSecretName:

deploy/charts/command-cert-manager-issuer/templates/crds/issuers.yaml

@@ -62,9 +62,28 @@ spec:
                   CertificateAuthorityLogicalName is the logical name of the certificate authority to use
                   E.g. "Keyfactor Root CA" or "Intermediate CA"
                 type: string
+              enrollmentPatternId:
+                description: |-
+                  EnrollmentPatternId is the ID of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
+                  Refer to the Keyfactor Command documentation for more information.
+                type: integer
+                format: int32
+              enrollmentPatternName:
+                description: |-
+                  EnrollmentPatternName is the name of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
+                  Refer to the Keyfactor Command documentation for more information.
+                type: string
               certificateTemplate:
                 description: |-
-                  CertificateTemplate is the name of the certificate template to use.
+                  CertificateTemplate is the name of the certificate template to use. Deprecated in favor of EnrollmentPattern as of Keyfactor Command 25.1.
+                  If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
+                  Enrollment will fail if the specified template is not compatible with the enrollment pattern.
                   Refer to the Keyfactor Command documentation for more information.
                 type: string
               commandSecretName: