Skip to content
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

Remove deprecated quicSecretTimestampKey #294

Merged
merged 1 commit into from
Feb 2, 2024
Merged

Remove deprecated quicSecretTimestampKey #294

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
31 changes: 3 additions & 28 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ const (

// nghttpxQUICKeyingMaterialsSecretKey is a field name of QUIC keying materials in Secret.
nghttpxQUICKeyingMaterialsSecretKey = "nghttpx-quic-keying-materials"
// quicSecretTimestampKey is an annotation key which is associated to the value that contains the timestamp when QUIC secret is last
// updated. Deprecated. Use quicKeyingMaterialsUpdateTimestampKey instead.
quicSecretTimestampKey = "ingress.zlab.co.jp/update-timestamp"
// quicKeyingMaterialsUpdateTimestampKey is an annotation key which is associated to the value that contains the timestamp when QUIC
// secret is last updated.
quicKeyingMaterialsUpdateTimestampKey = "ingress.zlab.co.jp/quic-keying-materials-update-timestamp"
Expand Down Expand Up @@ -2838,19 +2835,10 @@ func (lc *LeaderController) syncQUICKeyingMaterials(ctx context.Context, now tim
return nil
}

var (
km []byte
quicKeyingMaterialsAnnotationKey string
)

if _, ok := secret.Annotations[quicKeyingMaterialsUpdateTimestampKey]; ok {
quicKeyingMaterialsAnnotationKey = quicKeyingMaterialsUpdateTimestampKey
} else if _, ok := secret.Annotations[quicSecretTimestampKey]; ok {
quicKeyingMaterialsAnnotationKey = quicSecretTimestampKey
}
var km []byte

if quicKeyingMaterialsAnnotationKey != "" {
if t, err := time.Parse(time.RFC3339, secret.Annotations[quicKeyingMaterialsAnnotationKey]); err == nil {
if ts, ok := secret.Annotations[quicKeyingMaterialsUpdateTimestampKey]; ok {
if t, err := time.Parse(time.RFC3339, ts); err == nil {
km = secret.Data[nghttpxQUICKeyingMaterialsSecretKey]

if err := nghttpx.VerifyQUICKeyingMaterials(km); err != nil {
Expand All @@ -2863,16 +2851,6 @@ func (lc *LeaderController) syncQUICKeyingMaterials(ctx context.Context, now tim
// If quicSecretKey has been added to the queue and is waiting, this effectively overrides it.
lc.quicSecretQueue.AddAfter(quicSecretKey, d)

if quicKeyingMaterialsAnnotationKey == quicSecretTimestampKey {
updatedSecret := secret.DeepCopy()
updatedSecret.Annotations[quicKeyingMaterialsUpdateTimestampKey] = secret.Annotations[quicSecretTimestampKey]

if _, err := lc.lbc.clientset.CoreV1().Secrets(updatedSecret.Namespace).Update(ctx, updatedSecret, metav1.UpdateOptions{}); err != nil {
log.Error(err, "Unable to update Secret")
return err
}
}

return nil
}
}
Expand All @@ -2885,9 +2863,6 @@ func (lc *LeaderController) syncQUICKeyingMaterials(ctx context.Context, now tim
}

updatedSecret.Annotations[quicKeyingMaterialsUpdateTimestampKey] = now.Format(time.RFC3339)
if _, ok := updatedSecret.Annotations[quicSecretTimestampKey]; ok {
updatedSecret.Annotations[quicSecretTimestampKey] = updatedSecret.Annotations[quicKeyingMaterialsUpdateTimestampKey]
}

if updatedSecret.Data == nil {
updatedSecret.Data = make(map[string][]byte)
Expand Down
Loading