Skip to content

fix: add project-ref annotation to toposerver, multiadmin[-web] #659

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

Merged
Verolop merged 2 commits into from
Sep 18, 2026
Merged

fix: add project-ref annotation to toposerver, multiadmin[-web] #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a250f41
fix: add project-ref annotation to toposerver, multiadmin, multiadmin…
soedirgo Sep 16, 2026
1d0c59e
Merge branch 'main' into annotate-toposerver-multiadmin-project-ref
niconosenzo Sep 17, 2026
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
37 changes: 32 additions & 5 deletions pkg/cluster-handler/controller/multigrescluster/builders_global.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,19 @@ func BuildGlobalTopoServer(

finalPolicy := multigresv1alpha1.MergePVCDeletionPolicy(etcdPolicy, mergedGlobal)

var annotations map[string]string
if projectRef := cluster.Annotations[metadata.AnnotationProjectRef]; projectRef != "" {
annotations = map[string]string{
metadata.AnnotationProjectRef: projectRef,
}
}

ts := &multigresv1alpha1.TopoServer{
ObjectMeta: metav1.ObjectMeta{
Name: cluster.Name + "-global-topo",
Namespace: cluster.Namespace,
Labels: labels,
Name: cluster.Name + "-global-topo",
Namespace: cluster.Namespace,
Labels: labels,
Annotations: annotations,
},
Spec: multigresv1alpha1.TopoServerSpec{
Etcd: &multigresv1alpha1.EtcdSpec{
Expand Down Expand Up @@ -107,6 +115,8 @@ func BuildMultiadminDeployment(
// Merge with user provided pod labels, but standard labels take precedence
podLabels := metadata.MergeLabels(standardLabels, spec.PodLabels)

podAnnotations := podAnnotationsWithProjectRef(spec.PodAnnotations, cluster)

// Defensive copy so the built Deployment doesn't alias the resolver's PodPlacementSpec.
var tolerations []corev1.Toleration
if placement != nil {
Expand All @@ -127,7 +137,7 @@ func BuildMultiadminDeployment(
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: podLabels,
Annotations: spec.PodAnnotations,
Annotations: podAnnotations,
},
Spec: corev1.PodSpec{
ImagePullSecrets: cluster.Spec.Images.ImagePullSecrets,
Expand Down Expand Up @@ -326,6 +336,8 @@ func BuildMultiadminWebDeployment(
// Merge with user provided pod labels, but standard labels take precedence
podLabels := metadata.MergeLabels(standardLabels, spec.PodLabels)

podAnnotations := podAnnotationsWithProjectRef(spec.PodAnnotations, cluster)

deploy := &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-multiadmin-web", cluster.Name),
Expand All @@ -340,7 +352,7 @@ func BuildMultiadminWebDeployment(
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: podLabels,
Annotations: spec.PodAnnotations,
Annotations: podAnnotations,
},
Spec: corev1.PodSpec{
ImagePullSecrets: cluster.Spec.Images.ImagePullSecrets,
Expand Down Expand Up @@ -661,3 +673,18 @@ func BuildAdminNetworkPolicies(

return policies, nil
}

func podAnnotationsWithProjectRef(
userAnnotations map[string]string,
cluster *multigresv1alpha1.MultigresCluster,
) map[string]string {
out := make(map[string]string, len(userAnnotations)+1)
for k, v := range userAnnotations {
out[k] = v
}
out[metadata.AnnotationProjectRef] = metadata.ResolveProjectRef(
cluster.Annotations,
cluster.Name,
)
return out
}
13 changes: 11 additions & 2 deletions pkg/cluster-handler/controller/multigrescluster/integration_lifecycle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,11 @@ func TestMultigresCluster_Lifecycle(t *testing.T) {
},
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: clusterLabels(t, "short-annot-bomb", "multiadmin", ""),
Annotations: map[string]string{"heavy-annotation": longAnnotation},
Labels: clusterLabels(t, "short-annot-bomb", "multiadmin", ""),
Annotations: map[string]string{
"heavy-annotation": longAnnotation,
"multigres.com/project-ref": "short-annot-bomb",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down Expand Up @@ -245,6 +248,9 @@ func TestMultigresCluster_Lifecycle(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: clusterLabels(t, "mut-test", "multiadmin", ""),
Annotations: map[string]string{
"multigres.com/project-ref": "mut-test",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{{
Expand Down Expand Up @@ -348,6 +354,9 @@ func TestMultigresCluster_Lifecycle(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: clusterLabels(t, "mut-test", "multiadmin", ""),
Annotations: map[string]string{
"multigres.com/project-ref": "mut-test",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{{
Expand Down
18 changes: 18 additions & 0 deletions pkg/cluster-handler/controller/multigrescluster/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@ func TestMultigresCluster_HappyPath(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: clusterLabels(t, clusterName, "multiadmin", ""),
Annotations: map[string]string{
"multigres.com/project-ref": clusterName,
},
},
Spec: corev1.PodSpec{
ImagePullSecrets: []corev1.LocalObjectReference{{Name: "pull-secret"}},
Expand Down Expand Up @@ -393,6 +396,9 @@ func TestMultigresCluster_HappyPath(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: clusterLabels(t, clusterName, "multiadmin-web", ""),
Annotations: map[string]string{
"multigres.com/project-ref": clusterName,
},
},
Spec: corev1.PodSpec{
ImagePullSecrets: []corev1.LocalObjectReference{{Name: "pull-secret"}},
Expand Down Expand Up @@ -666,6 +672,9 @@ func TestMultigresCluster_HappyPath(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: clusterLabels(t, "minimal-cluster", "multiadmin", ""),
Annotations: map[string]string{
"multigres.com/project-ref": "minimal-cluster",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down Expand Up @@ -758,6 +767,9 @@ func TestMultigresCluster_HappyPath(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: clusterLabels(t, "minimal-cluster", "multiadmin-web", ""),
Annotations: map[string]string{
"multigres.com/project-ref": "minimal-cluster",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down Expand Up @@ -1028,6 +1040,9 @@ func TestMultigresCluster_HappyPath(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: clusterLabels(t, "lazy-cluster", "multiadmin", ""),
Annotations: map[string]string{
"multigres.com/project-ref": "lazy-cluster",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down Expand Up @@ -1120,6 +1135,9 @@ func TestMultigresCluster_HappyPath(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: clusterLabels(t, "lazy-cluster", "multiadmin-web", ""),
Annotations: map[string]string{
"multigres.com/project-ref": "lazy-cluster",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down
6 changes: 6 additions & 0 deletions pkg/resource-handler/controller/toposerver/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ func TestTopoServerReconciliation(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: toposerverLabels(t, "test-cluster"),
Annotations: map[string]string{
"multigres.com/project-ref": "test-cluster",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down Expand Up @@ -281,6 +284,9 @@ func TestTopoServerReconciliation(t *testing.T) {
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: toposerverLabels(t, "test-cluster"),
Annotations: map[string]string{
"multigres.com/project-ref": "test-cluster",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down
6 changes: 6 additions & 0 deletions pkg/resource-handler/controller/toposerver/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ func BuildStatefulSet(
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: labels,
Annotations: map[string]string{
metadata.AnnotationProjectRef: metadata.ResolveProjectRef(
toposerver.Annotations,
clusterName,
),
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down
12 changes: 12 additions & 0 deletions pkg/resource-handler/controller/toposerver/statefulset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ func TestBuildStatefulSet(t *testing.T) {
"app.kubernetes.io/managed-by": "multigres-operator",
"multigres.com/cluster": "test-cluster",
},
Annotations: map[string]string{
"multigres.com/project-ref": "test-cluster",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down Expand Up @@ -235,6 +238,9 @@ func TestBuildStatefulSet(t *testing.T) {
"app.kubernetes.io/managed-by": "multigres-operator",
"multigres.com/cluster": "test-cluster",
},
Annotations: map[string]string{
"multigres.com/project-ref": "test-cluster",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down Expand Up @@ -385,6 +391,9 @@ func TestBuildStatefulSet(t *testing.T) {
"app.kubernetes.io/managed-by": "multigres-operator",
"multigres.com/cluster": "custom-cluster",
},
Annotations: map[string]string{
"multigres.com/project-ref": "custom-cluster",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down Expand Up @@ -529,6 +538,9 @@ func TestBuildStatefulSet(t *testing.T) {
"app.kubernetes.io/managed-by": "multigres-operator",
"multigres.com/cluster": "test-cluster",
},
Annotations: map[string]string{
"multigres.com/project-ref": "test-cluster",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand Down