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

change signature of SetCertificateDuration and SetCertificateRenewBefore

Browse Source 
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
This commit is contained in:
Tim Ramlot 2024-02-17 12:21:13 +01:00
parent 4ae9c68dda
commit b77910d785
No known key found for this signature in database
GPG Key ID: 47428728E0C2878D
6 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/certificates/issuing/internal/secret_test.go
View File

@ -64,7 +64,7 @@ func Test_SecretsManager(t *testing.T) {
baseCert := gen.Certificate("test",
gen.SetCertificateIssuer(cmmeta.ObjectReference{Name: "ca-issuer", Kind: "Issuer", Group: "foo.io"}),
gen.SetCertificateSecretName("output"),
gen.SetCertificateRenewBefore(time.Hour*36),
gen.SetCertificateRenewBefore(&metav1.Duration{Duration: time.Hour * 36}),
gen.SetCertificateDNSNames("example.com"),
gen.SetCertificateUID(apitypes.UID("test-uid")),
)

2
pkg/controller/certificates/issuing/issuing_controller_test.go
View File

@ -67,7 +67,7 @@ func TestIssuingController(t *testing.T) {
gen.SetCertificateIssuer(cmmeta.ObjectReference{Name: "ca-issuer", Kind: "Issuer", Group: "foo.io"}),
gen.SetCertificateGeneration(3),
gen.SetCertificateSecretName("output"),
gen.SetCertificateRenewBefore(time.Hour*36),
gen.SetCertificateRenewBefore(&metav1.Duration{Duration: time.Hour * 36}),
gen.SetCertificateDNSNames("example.com"),
gen.SetCertificateRevision(1),
gen.SetCertificateNextPrivateKeySecretName(nextPrivateKeySecretName),

4
test/e2e/suite/issuers/acme/certificate/notafter.go
View File

@ -131,8 +131,8 @@ var _ = framework.CertManagerDescribe("ACME Certificate (HTTP01 + Not After)", f
By("Creating a Certificate")
cert := gen.Certificate(certificateName,
gen.SetCertificateDuration(time.Hour),
gen.SetCertificateRenewBefore(45*time.Minute),
gen.SetCertificateDuration(&metav1.Duration{Duration: time.Hour}),
gen.SetCertificateRenewBefore(&metav1.Duration{Duration: 45 * time.Minute}),
gen.SetCertificateSecretName(certificateSecretName),
gen.SetCertificateIssuer(cmmeta.ObjectReference{Name: issuerName}),
gen.SetCertificateDNSNames(acmeIngressDomain),

4
test/e2e/suite/issuers/ca/certificate.go
View File

@ -213,8 +213,8 @@ var _ = framework.CertManagerDescribe("CA Certificate", func() {
Name: issuerName,
Kind: v1.IssuerKind,
}),
gen.SetCertificateDuration(v.inputDuration.Duration),
gen.SetCertificateRenewBefore(v.inputRenewBefore.Duration),
gen.SetCertificateDuration(v.inputDuration),
gen.SetCertificateRenewBefore(v.inputRenewBefore),
gen.SetCertificateCommonName("test.domain.com"),
gen.SetCertificateOrganization("test-org"),
)

4
test/e2e/suite/issuers/selfsigned/certificate.go
View File

@ -125,8 +125,8 @@ var _ = framework.CertManagerDescribe("Self Signed Certificate", func() {
Name: issuerDurationName,
Kind: v1.IssuerKind,
}),
gen.SetCertificateDuration(v.inputDuration.Duration),
gen.SetCertificateRenewBefore(v.inputRenewBefore.Duration),
gen.SetCertificateDuration(v.inputDuration),
gen.SetCertificateRenewBefore(v.inputRenewBefore),
gen.SetCertificateCommonName("test.domain.com"),
gen.SetCertificateOrganization("test-org"),
)

10
test/unit/gen/certificate.go
View File

@ -17,8 +17,6 @@ limitations under the License.
package gen
import (
"time"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
@ -126,15 +124,15 @@ func SetCertificateSecretTemplate(annotations, labels map[string]string) Certifi
}
}
func SetCertificateDuration(duration time.Duration) CertificateModifier {
func SetCertificateDuration(duration *metav1.Duration) CertificateModifier {
return func(crt *v1.Certificate) {
crt.Spec.Duration = &metav1.Duration{Duration: duration}
crt.Spec.Duration = duration
}
}
func SetCertificateRenewBefore(renewBefore time.Duration) CertificateModifier {
func SetCertificateRenewBefore(renewBefore *metav1.Duration) CertificateModifier {
return func(crt *v1.Certificate) {
crt.Spec.RenewBefore = &metav1.Duration{Duration: renewBefore}
crt.Spec.RenewBefore = renewBefore
}
}