mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-04 19:17:20 +09:00
Wire the controller side of ApplicationGroupDefinitions: - A new ApplicationGroupDefinitionReconciler materializes an aggregation-layer APIService (v1alpha1.<group>) per registration, cloning the service reference and cert-manager CA-injection annotation from the helm-managed v1alpha1.apps.cozystack.io reference so custom groups always target the same cozystack-api backend. The APIService is owned by its registration, so deleting the ApplicationGroupDefinition garbage-collects it. APIServices are managed as unstructured objects to avoid a kube-aggregator dependency; only reconciler-owned fields are enforced on update, so the cert-manager-injected caBundle survives. - The debounced cozystack-api restart now hashes ApplicationGroupDefinitions next to ApplicationDefinitions and watches both, so registering or deleting a group rolls the apiserver the same way definition changes always have. - The HelmRelease reconciler selects by the definition's effective group instead of a hardcoded apps.cozystack.io, matching the labels the REST storage now stamps. Assisted-By: Claude <noreply@anthropic.com> Signed-off-by: Timofei Larkin <lllamnyp@gmail.com>
211 lines
5.6 KiB
Go
211 lines
5.6 KiB
Go
package controller
|
|
|
|
import (
|
|
"context"
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
"encoding/json"
|
|
"slices"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
|
|
|
|
appsv1 "k8s.io/api/apps/v1"
|
|
corev1 "k8s.io/api/core/v1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/apimachinery/pkg/types"
|
|
|
|
ctrl "sigs.k8s.io/controller-runtime"
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
"sigs.k8s.io/controller-runtime/pkg/handler"
|
|
"sigs.k8s.io/controller-runtime/pkg/log"
|
|
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
|
)
|
|
|
|
type ApplicationDefinitionReconciler struct {
|
|
client.Client
|
|
Scheme *runtime.Scheme
|
|
|
|
Debounce time.Duration
|
|
|
|
mu sync.Mutex
|
|
lastEvent time.Time
|
|
lastHandled time.Time
|
|
}
|
|
|
|
func (r *ApplicationDefinitionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
|
|
// Only handle debounced restart logic
|
|
// HelmRelease reconciliation is handled by ApplicationDefinitionHelmReconciler
|
|
return r.debouncedRestart(ctx)
|
|
}
|
|
|
|
func (r *ApplicationDefinitionReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
|
if r.Debounce == 0 {
|
|
r.Debounce = 5 * time.Second
|
|
}
|
|
|
|
// Both ApplicationDefinitions and ApplicationGroupDefinitions feed the
|
|
// cozystack-api startup config (which kinds are served, and in which API
|
|
// groups), so a change to either must roll the deployment.
|
|
markEvent := handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []reconcile.Request {
|
|
r.mu.Lock()
|
|
r.lastEvent = time.Now()
|
|
r.mu.Unlock()
|
|
return []reconcile.Request{{
|
|
NamespacedName: types.NamespacedName{
|
|
Namespace: "cozy-system",
|
|
Name: "cozystack-api",
|
|
},
|
|
}}
|
|
})
|
|
|
|
return ctrl.NewControllerManagedBy(mgr).
|
|
Named("applicationdefinition-controller").
|
|
Watches(&cozyv1alpha1.ApplicationDefinition{}, markEvent).
|
|
Watches(&cozyv1alpha1.ApplicationGroupDefinition{}, markEvent).
|
|
Complete(r)
|
|
}
|
|
|
|
type appDefHashView struct {
|
|
Name string `json:"name"`
|
|
Spec cozyv1alpha1.ApplicationDefinitionSpec `json:"spec"`
|
|
}
|
|
|
|
type appGroupDefHashView struct {
|
|
Name string `json:"name"`
|
|
Spec cozyv1alpha1.ApplicationGroupDefinitionSpec `json:"spec"`
|
|
}
|
|
|
|
// configHashView is the full input the cozystack-api startup config is
|
|
// derived from: ApplicationDefinitions plus the ApplicationGroupDefinitions
|
|
// that decide which API groups those definitions may be served in.
|
|
type configHashView struct {
|
|
AppDefs []appDefHashView `json:"appDefs"`
|
|
GroupDefs []appGroupDefHashView `json:"groupDefs"`
|
|
}
|
|
|
|
func (r *ApplicationDefinitionReconciler) computeConfigHash(ctx context.Context) (string, error) {
|
|
list := &cozyv1alpha1.ApplicationDefinitionList{}
|
|
if err := r.List(ctx, list); err != nil {
|
|
return "", err
|
|
}
|
|
groupList := &cozyv1alpha1.ApplicationGroupDefinitionList{}
|
|
if err := r.List(ctx, groupList); err != nil {
|
|
return "", err
|
|
}
|
|
|
|
slices.SortFunc(list.Items, sortAppDefs)
|
|
slices.SortFunc(groupList.Items, func(a, b cozyv1alpha1.ApplicationGroupDefinition) int {
|
|
return strings.Compare(a.Name, b.Name)
|
|
})
|
|
|
|
view := configHashView{
|
|
AppDefs: make([]appDefHashView, 0, len(list.Items)),
|
|
GroupDefs: make([]appGroupDefHashView, 0, len(groupList.Items)),
|
|
}
|
|
for i := range list.Items {
|
|
view.AppDefs = append(view.AppDefs, appDefHashView{
|
|
Name: list.Items[i].Name,
|
|
Spec: list.Items[i].Spec,
|
|
})
|
|
}
|
|
for i := range groupList.Items {
|
|
view.GroupDefs = append(view.GroupDefs, appGroupDefHashView{
|
|
Name: groupList.Items[i].Name,
|
|
Spec: groupList.Items[i].Spec,
|
|
})
|
|
}
|
|
b, err := json.Marshal(view)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
sum := sha256.Sum256(b)
|
|
return hex.EncodeToString(sum[:]), nil
|
|
}
|
|
|
|
func (r *ApplicationDefinitionReconciler) debouncedRestart(ctx context.Context) (ctrl.Result, error) {
|
|
logger := log.FromContext(ctx)
|
|
|
|
r.mu.Lock()
|
|
le := r.lastEvent
|
|
lh := r.lastHandled
|
|
debounce := r.Debounce
|
|
r.mu.Unlock()
|
|
|
|
if debounce <= 0 {
|
|
debounce = 5 * time.Second
|
|
}
|
|
if le.IsZero() {
|
|
return ctrl.Result{}, nil
|
|
}
|
|
if d := time.Since(le); d < debounce {
|
|
return ctrl.Result{RequeueAfter: debounce - d}, nil
|
|
}
|
|
if !lh.Before(le) {
|
|
return ctrl.Result{}, nil
|
|
}
|
|
|
|
newHash, err := r.computeConfigHash(ctx)
|
|
if err != nil {
|
|
return ctrl.Result{}, err
|
|
}
|
|
|
|
tpl, obj, patch, err := r.getWorkload(ctx, types.NamespacedName{Namespace: "cozy-system", Name: "cozystack-api"})
|
|
if err != nil {
|
|
return ctrl.Result{}, client.IgnoreNotFound(err)
|
|
}
|
|
|
|
oldHash := tpl.Annotations["cozystack.io/config-hash"]
|
|
|
|
if oldHash == newHash && oldHash != "" {
|
|
r.mu.Lock()
|
|
r.lastHandled = le
|
|
r.mu.Unlock()
|
|
logger.Info("No changes in ApplicationDefinition config; skipping restart", "hash", newHash)
|
|
return ctrl.Result{}, nil
|
|
}
|
|
|
|
tpl.Annotations["cozystack.io/config-hash"] = newHash
|
|
|
|
if err := r.Patch(ctx, obj, patch); err != nil {
|
|
return ctrl.Result{}, err
|
|
}
|
|
|
|
r.mu.Lock()
|
|
r.lastHandled = le
|
|
r.mu.Unlock()
|
|
|
|
logger.Info("Updated cozystack-api podTemplate config-hash; rollout triggered",
|
|
"old", oldHash, "new", newHash)
|
|
return ctrl.Result{}, nil
|
|
}
|
|
|
|
func (r *ApplicationDefinitionReconciler) getWorkload(
|
|
ctx context.Context,
|
|
key types.NamespacedName,
|
|
) (tpl *corev1.PodTemplateSpec, obj client.Object, patch client.Patch, err error) {
|
|
dep := &appsv1.Deployment{}
|
|
if err := r.Get(ctx, key, dep); err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
obj = dep
|
|
tpl = &dep.Spec.Template
|
|
patch = client.MergeFrom(dep.DeepCopy())
|
|
if tpl.Annotations == nil {
|
|
tpl.Annotations = make(map[string]string)
|
|
}
|
|
return tpl, obj, patch, nil
|
|
}
|
|
|
|
func sortAppDefs(a, b cozyv1alpha1.ApplicationDefinition) int {
|
|
if a.Name == b.Name {
|
|
return 0
|
|
}
|
|
if a.Name < b.Name {
|
|
return -1
|
|
}
|
|
return 1
|
|
}
|