Merge b85931184da1c5f2f8a96163f74e899b2a0a2275 into cccdabf0b09676690bede757dafcc7611925e278

This commit is contained in:
Parfenov Ivan 2025-08-14 23:36:09 +00:00 committed by GitHub
commit 68b7d80c70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -230,6 +230,16 @@ func (openVPNPKI *OpenVPNPKI) indexTxtUpdate() (err error) {
log.Trace(cert.Subject.CommonName) log.Trace(cert.Subject.CommonName)
// Fix for old secrets, added label name if not exists
labelName := secret.Labels["name"]
if labelName == "" {
secret.Labels["name"] = cert.Subject.CommonName
_, err = openVPNPKI.KubeClient.CoreV1().Secrets(namespace).Update(context.TODO(), &secret, metav1.UpdateOptions{})
if err != nil {
return nil
}
}
if secret.Annotations["revokedAt"] == "" { if secret.Annotations["revokedAt"] == "" {
indexTxt += fmt.Sprintf("%s\t%s\t\t%s\t%s\t%s\n", "V", cert.NotAfter.Format(indexTxtDateFormat), fmt.Sprintf("%d", cert.SerialNumber), "unknown", "/CN="+secret.Labels["name"]) indexTxt += fmt.Sprintf("%s\t%s\t\t%s\t%s\t%s\n", "V", cert.NotAfter.Format(indexTxtDateFormat), fmt.Sprintf("%d", cert.SerialNumber), "unknown", "/CN="+secret.Labels["name"])
} else if cert.NotAfter.Before(time.Now()) { } else if cert.NotAfter.Before(time.Now()) {