Skip to content
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.

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

Inherit and customize ScyllaCluster labels and annotations #1664

Merged
merged 2 commits into from
Jan 31, 2024

Conversation

tnozicka
Copy link
Contributor

@tnozicka tnozicka commented Dec 28, 2023

Description of your changes:
This PR allows users to set metadata for several managed objects as described in SOEP-1665

Which issue is resolved by this Pull Request:
Resolves #1592 #1668

@tnozicka tnozicka added kind/feature Categorizes issue or PR as related to a new feature. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Dec 28, 2023
@scylla-operator-bot scylla-operator-bot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 28, 2023
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tnozicka

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@scylla-operator-bot scylla-operator-bot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 28, 2023
@tnozicka tnozicka force-pushed the metadata branch 2 times, most recently from 611f8e3 to 0283573 Compare December 28, 2023 15:35
@tnozicka
Copy link
Contributor Author

/test all

@scylladb scylladb deleted a comment from scylla-operator-bot bot Jan 23, 2024
@scylladb scylladb deleted a comment from scylla-operator-bot bot Jan 23, 2024
@tnozicka tnozicka changed the title [WIP] Inherit and customize ScyllaCluster labels and annotations Inherit and customize ScyllaCluster labels and annotations Jan 23, 2024
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 23, 2024
@tnozicka tnozicka requested review from zimnx and rzetelskik and removed request for zimnx January 23, 2024 11:39
@tnozicka
Copy link
Contributor Author

#1698
/retest

@tnozicka tnozicka changed the title Inherit and customize ScyllaCluster labels and annotations [WIP] Inherit and customize ScyllaCluster labels and annotations Jan 24, 2024
@scylla-operator-bot scylla-operator-bot bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 24, 2024
@tnozicka tnozicka force-pushed the metadata branch 4 times, most recently from 88cfb1d to d50a5e6 Compare January 25, 2024 15:21
@tnozicka tnozicka changed the title [WIP] Inherit and customize ScyllaCluster labels and annotations Inherit and customize ScyllaCluster labels and annotations Jan 25, 2024
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 25, 2024
@zimnx
Copy link
Collaborator

zimnx commented Jan 29, 2024

Also, please add support for these fields in Helm chart template

@zimnx
Copy link
Collaborator

zimnx commented Jan 31, 2024

Thanks for updates.
/lgtm

@scylla-operator-bot scylla-operator-bot bot added the lgtm Indicates that a PR is ready to be merged. label Jan 31, 2024
@scylla-operator-bot scylla-operator-bot bot merged commit 1a9016c into scylladb:master Jan 31, 2024
13 checks passed
@tnozicka tnozicka deleted the metadata branch January 31, 2024 12:26
zimnx added a commit to zimnx/scylla-operator that referenced this pull request Feb 5, 2024
Since scylladb#1664 metadata for data PVC template in rack StatefulSet was taken
from ScyllaCluster metadata in case Statefulset was missing.
If ScyllaCluster had any metadata set, Operator on next reconcilation,
changed immutable PVC template because metadata were no longer rewritten
from ScyllaCluster.
To fix this case, Operator rewrites PVC template metadata from existing StatefulSet.
zimnx added a commit to zimnx/scylla-operator that referenced this pull request Feb 6, 2024
Since scylladb#1664 metadata for data PVC template in rack StatefulSet was taken
from ScyllaCluster metadata in case Statefulset was missing.
If ScyllaCluster had any metadata set, Operator on next reconcilation,
changed immutable PVC template because metadata were no longer rewritten
from ScyllaCluster.
To fix this case, Operator rewrites PVC template metadata from existing StatefulSet.
zimnx added a commit to zimnx/scylla-operator that referenced this pull request Feb 6, 2024
Since scylladb#1664 metadata for data PVC template in rack StatefulSet was taken
from ScyllaCluster metadata in case Statefulset was missing.
If ScyllaCluster had any metadata set, Operator on next reconcilation,
changed immutable PVC template because metadata were no longer rewritten
from ScyllaCluster.
To fix this case, Operator rewrites PVC template metadata from existing StatefulSet.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Extend API with customizable labels+annotations
2 participants