Skip to content

Commit a11b890

Browse files
authored
chore(pkg/controllers): remove unused secret and no-op comparisons (#168)
Fixes: #167
1 parent 1d1bef4 commit a11b890

File tree

1 file changed

+2
-40
lines changed

1 file changed

+2
-40
lines changed

pkg/controllers/wireguard_controller.go

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,6 @@ func (r *WireguardReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
460460
return ctrl.Result{}, err
461461
}
462462

463-
bytes.Equal(b, secret.Data["state.json"])
464-
465463
if !bytes.Equal(b, secret.Data["state.json"]) {
466464
log.Info("Updating secret with new config")
467465
publicKey := string(secret.Data["publicKey"])
@@ -519,33 +517,14 @@ func (r *WireguardReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
519517
return ctrl.Result{}, err
520518
}
521519

522-
bytes.Equal(b, secret.Data["state"])
523-
524520
secret := r.secretForWireguard(wireguard, b, privateKey, publicKey)
525521

526522
log.Info("Creating a new secret", "secret.Namespace", secret.Namespace, "secret.Name", secret.Name)
527-
err = r.Create(ctx, secret)
528-
if err != nil {
529-
log.Error(err, "Failed to create new secret", "secret.Namespace", secret.Namespace, "secret.Name", secret.Name)
530-
return ctrl.Result{}, err
531-
}
532523

533-
clientKey, err := wgtypes.GeneratePrivateKey()
534-
535-
if err != nil {
536-
log.Error(err, "Failed to generate private key")
537-
return ctrl.Result{}, err
538-
}
539-
540-
clientSecret := r.secretForClient(wireguard, clientKey.String(), clientKey.PublicKey().String())
541-
542-
log.Info("Creating a new secret", "secret.Namespace", clientSecret.Namespace, "secret.Name", clientSecret.Name)
543-
err = r.Create(ctx, clientSecret)
544-
if err != nil {
545-
log.Error(err, "Failed to create new secret", "secret.Namespace", clientSecret.Namespace, "secret.Name", clientSecret.Name)
524+
if err := r.Create(ctx, secret); err != nil {
525+
log.Error(err, "Failed to create new secret", "secret.Namespace", secret.Namespace, "secret.Name", secret.Name)
546526
return ctrl.Result{}, err
547527
}
548-
549528
return ctrl.Result{}, err
550529
} else if err != nil {
551530
log.Error(err, "Failed to get secret")
@@ -697,23 +676,6 @@ func (r *WireguardReconciler) secretForWireguard(m *v1alpha1.Wireguard, state []
697676

698677
}
699678

700-
func (r *WireguardReconciler) secretForClient(m *v1alpha1.Wireguard, privateKey string, publicKey string) *corev1.Secret {
701-
ls := labelsForWireguard(m.Name)
702-
dep := &corev1.Secret{
703-
ObjectMeta: metav1.ObjectMeta{
704-
Name: m.Name + "-client",
705-
Namespace: m.Namespace,
706-
Labels: ls,
707-
},
708-
Data: map[string][]byte{"privateKey": []byte(privateKey), "publicKey": []byte(publicKey)},
709-
}
710-
711-
ctrl.SetControllerReference(m, dep, r.Scheme)
712-
713-
return dep
714-
715-
}
716-
717679
func (r *WireguardReconciler) deploymentForWireguard(m *v1alpha1.Wireguard) *appsv1.Deployment {
718680
ls := labelsForWireguard(m.Name)
719681
replicas := int32(1)

0 commit comments

Comments
 (0)