mirror of
https://github.com/clastix/kamaji.git
synced 2026-02-14 10:00:02 +00:00
b40428825d
* feat: add ObservedGeneration to all status types Add ObservedGeneration field to DataStoreStatus, KubeconfigGeneratorStatus, and TenantControlPlaneStatus to track which generation the controller has processed. This enables clients and tools like kstatus to determine if the controller has reconciled the latest spec changes. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: follow Cluster API pattern for ObservedGeneration Move ObservedGeneration setting for TenantControlPlane from intermediate status updates to the final successful reconciliation completion. This follows Cluster API conventions where ObservedGeneration indicates the controller has fully processed the given generation. Previously, ObservedGeneration was set on every status update during resource processing, which could mislead clients into thinking the spec was fully reconciled when the controller was still mid-reconciliation or had hit a transient error. Now: - DataStore: Sets ObservedGeneration before single status update (simple controller) - KubeconfigGenerator: Sets ObservedGeneration before single status update (simple controller) - TenantControlPlane: Sets ObservedGeneration only after ALL resources processed successfully Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * test: verify ObservedGeneration equals Generation after reconciliation Add assertion to e2e test to verify that status.observedGeneration equals metadata.generation after a TenantControlPlane is successfully reconciled. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * chore: regenerate CRDs with ObservedGeneration field Run make crds to regenerate CRDs with the new ObservedGeneration field in status types. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Run make manifests * Run make apidoc * Remove rbac role * Remove webhook manifest --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
76 lines
2.2 KiB
Go
76 lines
2.2 KiB
Go
// Copyright 2022 Clastix Labs
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package e2e
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
. "github.com/onsi/ginkgo/v2"
|
|
. "github.com/onsi/gomega"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/types"
|
|
pointer "k8s.io/utils/ptr"
|
|
|
|
kamajiv1alpha1 "github.com/clastix/kamaji/api/v1alpha1"
|
|
)
|
|
|
|
var _ = Describe("Deploy a TenantControlPlane resource", func() {
|
|
// Fill TenantControlPlane object
|
|
tcp := &kamajiv1alpha1.TenantControlPlane{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "tcp-clusterip",
|
|
Namespace: "default",
|
|
},
|
|
Spec: kamajiv1alpha1.TenantControlPlaneSpec{
|
|
ControlPlane: kamajiv1alpha1.ControlPlane{
|
|
Deployment: kamajiv1alpha1.DeploymentSpec{
|
|
Replicas: pointer.To(int32(1)),
|
|
},
|
|
Service: kamajiv1alpha1.ServiceSpec{
|
|
ServiceType: "ClusterIP",
|
|
},
|
|
},
|
|
NetworkProfile: kamajiv1alpha1.NetworkProfileSpec{
|
|
Address: "172.18.0.2",
|
|
},
|
|
Kubernetes: kamajiv1alpha1.KubernetesSpec{
|
|
Version: "v1.23.6",
|
|
Kubelet: kamajiv1alpha1.KubeletSpec{
|
|
CGroupFS: "cgroupfs",
|
|
},
|
|
AdmissionControllers: kamajiv1alpha1.AdmissionControllers{
|
|
"LimitRanger",
|
|
"ResourceQuota",
|
|
},
|
|
},
|
|
Addons: kamajiv1alpha1.AddonsSpec{},
|
|
},
|
|
}
|
|
|
|
// Create a TenantControlPlane resource into the cluster
|
|
JustBeforeEach(func() {
|
|
Expect(k8sClient.Create(context.Background(), tcp)).NotTo(HaveOccurred())
|
|
})
|
|
|
|
// Delete the TenantControlPlane resource after test is finished
|
|
JustAfterEach(func() {
|
|
Expect(k8sClient.Delete(context.Background(), tcp)).Should(Succeed())
|
|
})
|
|
// Check if TenantControlPlane resource has been created
|
|
It("Should be Ready", func() {
|
|
StatusMustEqualTo(tcp, kamajiv1alpha1.VersionReady)
|
|
// ObservedGeneration is set at the end of successful reconciliation,
|
|
// after status becomes Ready, so we need to wait for it.
|
|
Eventually(func() int64 {
|
|
if err := k8sClient.Get(context.Background(), types.NamespacedName{Name: tcp.GetName(), Namespace: tcp.GetNamespace()}, tcp); err != nil {
|
|
return -1
|
|
}
|
|
|
|
return tcp.Status.ObservedGeneration
|
|
}, 30*time.Second, time.Second).Should(Equal(tcp.Generation),
|
|
"ObservedGeneration should equal Generation after successful reconciliation")
|
|
})
|
|
})
|