Skip to content

feat: add children labels and annotations#964

Merged
olevski merged 12 commits into
mainfrom
feat-add-option-to-template-labels-and-annotations
Feb 9, 2026
Merged

feat: add children labels and annotations#964
olevski merged 12 commits into
mainfrom
feat-add-option-to-template-labels-and-annotations

Conversation

@olevski

@olevski olevski commented Jul 3, 2025

Copy link
Copy Markdown
Member

closes #779

In the case of conflicts with selector labels or anything that is set on the children internally for amalthea then the value set from amalthea internally will have precendece.

/deploy

@olevski olevski requested review from a team as code owners July 3, 2025 16:04
@olevski olevski force-pushed the feat-add-option-to-template-labels-and-annotations branch from 89092ab to 85e55ce Compare July 4, 2025 07:32
Comment thread api/v1alpha1/amaltheasession_children.go Outdated
Comment thread api/v1alpha1/amaltheasession_children.go
Comment thread api/v1alpha1/amaltheasession_children.go Outdated
Comment thread api/v1alpha1/amaltheasession_types.go Outdated
@olevski olevski force-pushed the feat-add-option-to-template-labels-and-annotations branch 2 times, most recently from 49d9f2b to 7ef9f3b Compare November 11, 2025 10:48

@leafty leafty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to re-generate the CRD, it doesn't look up to date.

Comment thread api/v1alpha1/amaltheasession_types.go
@olevski

olevski commented Nov 11, 2025

Copy link
Copy Markdown
Member Author

I think you need to re-generate the CRD, it doesn't look up to date.

Yes I reran the codegen and pushed the changes.

@olevski olevski requested a review from leafty November 11, 2025 16:20
Comment thread api/v1alpha1/amaltheasession_types.go
@RenkuBot

Copy link
Copy Markdown
Contributor

You can access the deployment of this PR at https://renku-ci-am-964.dev.renku.ch

@leafty leafty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, but I would merge only after we have a corresponding PR in renku-data-services which show that the template field works as intended.

@olevski olevski force-pushed the feat-add-option-to-template-labels-and-annotations branch from d9cce15 to b924fa7 Compare February 6, 2026 09:40
@olevski olevski force-pushed the feat-add-option-to-template-labels-and-annotations branch from 1140522 to 13fd97a Compare February 6, 2026 10:59
@olevski

olevski commented Feb 6, 2026

Copy link
Copy Markdown
Member Author

Looks good to me, but I would merge only after we have a corresponding PR in renku-data-services which show that the template field works as intended.

So I deployed the CRD and tested manually in the CI deployment.

What I did:

  • created a project
  • launched a session
  • changed the reconcile strategy to always
  • added annotations to the template of the AmaltheaSession, they appeared in all the child resources
  • added a label in the template that conflict with the selector labels, this was ignored and it was not added anywhere, the logs showed a message about the conflicting label
  • added a non-conflicting label and it showed up everywhere
  • removed a label from the template and it was removed in all children
  • removed an annotation from the template and it was removed in all children

@olevski

olevski commented Feb 6, 2026

Copy link
Copy Markdown
Member Author

I also added tests for the label and annotation propagation in the go code.

@olevski olevski requested a review from leafty February 6, 2026 16:38
@olevski olevski merged commit 555eed1 into main Feb 9, 2026
29 of 30 checks passed
@olevski olevski deleted the feat-add-option-to-template-labels-and-annotations branch February 9, 2026 09:36
@RenkuBot

RenkuBot commented Feb 9, 2026

Copy link
Copy Markdown
Contributor

Tearing down the temporary RenkuLab deplyoment for this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

enhancement: propagate the annotations and labels from the CR to all child resources

4 participants