K8SPXC-1230 add labels to k8s objects created by operator #1565

nmarukovich · 2023-12-21T09:38:04Z

CHANGE DESCRIPTION

Problem:
Short explanation of the problem.

Cause:
Short explanation of the root cause of the issue if applicable.

Solution:
Short explanation of the solution we are providing with this PR.

CHECKLIST

Jira

Is the Jira ticket created and referenced properly?
Does the Jira ticket have the proper statuses for documentation (Needs Doc) and QA (Needs QA)?
Does the Jira ticket link to the proper milestone (Fix Version field)?

Tests

Is an E2E test/test case added for the new feature/change?
Are unit tests added where appropriate?
Are OpenShift compare files changed for E2E tests (compare/*-oc.yml)?

Config/Logging/Testability

Are all needed new/changed options added to default YAML files?
Are the manifests (crd/bundle) regenerated if needed?
Did we add proper logging messages for operator actions?
Did we ensure compatibility with the previous version or cluster upgrade process?
Does the change support oldest and newest supported PXC version?
Does the change support oldest and newest supported Kubernetes version?

pkg/pxc/backup/volume.go

…ator into K8SPXC-1230_add_labels

pkg/controller/pxc/backup.go

pkg/controller/pxc/secrets.go

pkg/controller/pxc/tls.go

pkg/controller/pxcrestore/controller.go

pkg/pxc/app/config/configmap.go

pkg/pxc/app/deployment/binlog-collector.go

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

pkg/controller/pxc/users.go

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

inelpandzic · 2023-12-22T09:39:15Z

pkg/pxc/backup/volume.go

@@ -8,7 +8,17 @@ import (
 )

 // NewPVC returns the list of PersistentVolumeClaims for the backups
-func NewPVC(cr *api.PerconaXtraDBClusterBackup) *corev1.PersistentVolumeClaim {
+func NewPVC(cr *api.PerconaXtraDBClusterBackup, cluster *api.PerconaXtraDBCluster) *corev1.PersistentVolumeClaim {
+	// Copy from the original labels to the backup labels


Instead of coping these, there is this function k8s.io/apimachinery/pkg/labels.Merge() that will merge two sets of labels, maybe you can use it.

inelpandzic · 2023-12-22T09:39:21Z

pkg/controller/pxc/backup.go

@@ -293,6 +293,12 @@ func (r *ReconcilePerconaXtraDBCluster) deletePITR(cr *api.PerconaXtraDBCluster)
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      deployment.GetBinlogCollectorDeploymentName(cr),
 			Namespace: cr.Namespace,
+			Labels: map[string]string{
+				"app.kubernetes.io/name":      "percona-xtradb-cluster",


Wdyt that we use this opportunity and refactor this a bit so we don't repeat these strings dozens of times across the repo? To have some constants and reuse them, maybe a helper func in some labels.go file that will add these common labels.

I checked the code. I don't know. Does it really make sense to create separate utils file to store their only one label?
As I can see the code will become more implicit, more lines of the code and we don't really win something.
What do you think? I'm ok to add it in terms of coding practice, but I really do not see much motivations for it.

What I meant was that instead of having for example "app.kubernetes.io/name": "percona-xtradb-cluster", all over the place, it will be set only in one file and then just invoke a function that will set the labels.

So the idea is that we have these common labels defined in a single place and then just reuse them where they are needed.

JNKPercona · 2023-12-22T13:47:34Z

Test name	Status
affinity-8-0	passed
auto-tuning-8-0	passed
cross-site-8-0	passed
demand-backup-cloud-8-0	passed
demand-backup-encrypted-with-tls-8-0	passed
demand-backup-8-0	passed
haproxy-5-7	passed
haproxy-8-0	passed
init-deploy-5-7	failure
init-deploy-8-0	failure
limits-8-0	passed
monitoring-2-0-8-0	passed
one-pod-5-7	passed
one-pod-8-0	passed
pitr-8-0	passed
pitr-gap-errors-8-0	passed
proxy-protocol-8-0	passed
proxysql-sidecar-res-limits-8-0	passed
recreate-8-0	passed
restore-to-encrypted-cluster-8-0	passed
scaling-proxysql-8-0	passed
scaling-8-0	passed
scheduled-backup-5-7	passed
scheduled-backup-8-0	passed
security-context-8-0	passed
smart-update1-8-0	failure
smart-update2-8-0	passed
storage-8-0	passed
tls-issue-cert-manager-ref-8-0	failure
tls-issue-cert-manager-8-0	failure
tls-issue-self-8-0	passed
upgrade-consistency-8-0	passed
upgrade-haproxy-8-0	passed
upgrade-proxysql-8-0	passed
users-5-7	passed
users-8-0	failure
validation-hook-8-0	passed
We run 37 out of 37

commit: 5c0e1da
image: perconalab/percona-xtradb-cluster-operator:PR-1565-5c0e1da0

egegunes · 2024-11-20T18:12:34Z

@nmarukovich what should we do with this PR?

add labels to backup pvc

8041107

pull-request-size bot added the size/S 10-29 lines label Dec 21, 2023

github-actions bot reviewed Dec 21, 2023

View reviewed changes

pkg/pxc/backup/volume.go Outdated Show resolved Hide resolved

pkg/pxc/backup/volume.go Outdated Show resolved Hide resolved

pkg/pxc/backup/volume.go Outdated Show resolved Hide resolved

nmarukovich added 2 commits December 21, 2023 16:58

Merge branch 'main' of github.com:percona/percona-xtradb-cluster-oper…

9f14437

…ator into K8SPXC-1230_add_labels

add labels

4be3aec

pull-request-size bot added size/M 30-99 lines and removed size/S 10-29 lines labels Dec 21, 2023

github-actions bot reviewed Dec 21, 2023

View reviewed changes

nmarukovich and others added 3 commits December 21, 2023 19:16

Apply suggestions from code review

a4572b0

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update pkg/pxc/backup/volume.go

79c656b

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

add labels for internal secret

d6a8fc9

github-actions bot reviewed Dec 22, 2023

View reviewed changes

pkg/controller/pxc/users.go Outdated Show resolved Hide resolved

Update pkg/controller/pxc/users.go

5c0e1da

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

nmarukovich marked this pull request as ready for review December 22, 2023 09:26

nmarukovich requested review from hors, egegunes, inelpandzic and pooknull as code owners December 22, 2023 09:26

inelpandzic reviewed Dec 22, 2023

View reviewed changes

nmarukovich changed the title ~~K8SPXC-1230 add labels to backup pvc~~ K8SPXC-1230 add labels to k8s objects created by operator Dec 22, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

K8SPXC-1230 add labels to k8s objects created by operator #1565

K8SPXC-1230 add labels to k8s objects created by operator #1565

nmarukovich commented Dec 21, 2023 •

edited by jira bot

Loading

inelpandzic Dec 22, 2023

inelpandzic Dec 22, 2023

nmarukovich Dec 24, 2023

inelpandzic Dec 27, 2023

JNKPercona commented Dec 22, 2023

egegunes commented Nov 20, 2024

K8SPXC-1230 add labels to k8s objects created by operator #1565

Are you sure you want to change the base?

K8SPXC-1230 add labels to k8s objects created by operator #1565

Conversation

nmarukovich commented Dec 21, 2023 • edited by jira bot Loading

CHANGE DESCRIPTION

CHECKLIST

inelpandzic Dec 22, 2023

Choose a reason for hiding this comment

inelpandzic Dec 22, 2023

Choose a reason for hiding this comment

nmarukovich Dec 24, 2023

Choose a reason for hiding this comment

inelpandzic Dec 27, 2023

Choose a reason for hiding this comment

JNKPercona commented Dec 22, 2023

egegunes commented Nov 20, 2024

nmarukovich commented Dec 21, 2023 •

edited by jira bot

Loading