Skip to content

🐛 Fix webhook service rotation to renew within 24h of expiry #1997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2025
Merged

🐛 Fix webhook service rotation to renew within 24h of expiry #1997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions internal/operator-controller/rukpak/render/certproviders/certmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
const (
certManagerInjectCAAnnotation = "cert-manager.io/inject-ca-from"
olmv0RotationPeriod = 730 * 24 * time.Hour // 2 year rotation
olmv0RenewBefore = 24 * time.Hour // renew certificate within 24h of expiry
)

var _ render.CertificateProvider = (*CertManagerCertificateProvider)(nil)
Expand Down Expand Up @@ -55,6 +56,7 @@ func (p CertManagerCertificateProvider) AdditionalObjects(cfg render.Certificate
// OLMv0 parity:
// - self-signed issuer
// - 2 year rotation period
// - renew 24h before expiry
// - CN: argocd-operator-controller-manager-service.argocd (<deploymentName>-service.<namespace>)
// - CA: false
// - DNS:argocd-operator-controller-manager-service.argocd, DNS:argocd-operator-controller-manager-service.argocd.svc, DNS:argocd-operator-controller-manager-service.argocd.svc.cluster.local
Expand Down Expand Up @@ -165,6 +167,9 @@ func (p CertManagerCertificateProvider) AdditionalObjects(cfg render.Certificate
Duration: &metav1.Duration{
Duration: olmv0RotationPeriod,
},
RenewBefore: &metav1.Duration{
Duration: olmv0RenewBefore,
},
},
}
certObj, err := util.ToUnstructured(certificate)
Expand Down
4 changes: 4 additions & 0 deletions internal/operator-controller/rukpak/render/certproviders/certmanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ func Test_CertManagerProvider_AdditionalObjects(t *testing.T) {
// OLMv0 has a 2 year certificate rotation period
Duration: 730 * 24 * time.Hour,
},
RenewBefore: &metav1.Duration{
// OLMv0 reviews 24h before expiry
Duration: 24 * time.Hour,
},
},
}),
}, objs)
Expand Down
Loading