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

ROX-12344: Add org-id label and org-name annotation #684

Merged
merged 2 commits into from
Jan 19, 2023

Conversation

stehessel
Copy link
Contributor

@stehessel stehessel commented Dec 16, 2022

Description

Add organisation meta data to the central tenant. The org name is set as an annotation, because it does not comply with Kubernetes validation rules.

We will scrape the label and annotations via Prometheus and pass them via metric labels to Grafana dashboards. This will be added as a follow up.

relabel_configs:
  - action: labelmap
    regex: __meta_kubernetes_pod_label_(.+)
  - action: labelmap
    regex: __meta_kubernetes_pod_annotation_(.+)

Checklist (Definition of Done)

  • Unit and integration tests added
  • Added test description under Test manual
  • Evaluated and added CHANGELOG.md entry if required
  • Documentation added if necessary (i.e. changes to dev setup, test execution, ...)
  • CI and all relevant tests are passing
  • Add the ticket number to the PR title if available, i.e. ROX-12345: ...
  • Discussed security and business related topics privately. Will move any security and business related topics that arise to private communication channel.

Test manual

Tested with local fleet-manager and dev data-plane cluster.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 16, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@stehessel
Copy link
Contributor Author

stehessel commented Dec 16, 2022

@stehessel stehessel force-pushed the ROX-12344/org-labels branch from 15762f3 to d020373 Compare December 16, 2022 01:36
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 394c0b7 to 156569a Compare December 16, 2022 01:36
@stehessel
Copy link
Contributor Author

/test all

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 16, 2022

@stehessel: No presubmit jobs available for stackrox/acs-fleet-manager@ROX-12344/org-labels

In response to this:

/test all

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 156569a to 225cc56 Compare December 16, 2022 01:43
@stehessel stehessel force-pushed the ROX-12344/org-labels branch from d020373 to 0f31385 Compare December 16, 2022 01:49
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 225cc56 to 042e263 Compare December 16, 2022 01:49
@stehessel
Copy link
Contributor Author

/ok-to-test

@stehessel
Copy link
Contributor Author

/test all

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 16, 2022

@stehessel: No presubmit jobs available for stackrox/acs-fleet-manager@ROX-12344/org-labels

In response to this:

/test all

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@stehessel stehessel force-pushed the ROX-12344/org-labels branch from 0f31385 to 8aa6009 Compare December 16, 2022 02:41
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 042e263 to 5b7a29b Compare December 16, 2022 02:41
@stehessel stehessel force-pushed the ROX-12344/org-labels branch from 8aa6009 to 228dc55 Compare December 16, 2022 02:46
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 5b7a29b to d2257b7 Compare December 16, 2022 02:46
@stehessel stehessel force-pushed the ROX-12344/org-labels branch 4 times, most recently from f7664d0 to 48737f5 Compare December 17, 2022 02:23
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from d2257b7 to 6add689 Compare December 17, 2022 02:24
@stehessel stehessel force-pushed the ROX-12344/org-labels branch from 48737f5 to f27847c Compare December 17, 2022 02:27
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 6add689 to 2b8955c Compare December 17, 2022 02:27
@stehessel stehessel force-pushed the ROX-12344/org-labels branch from f27847c to 57ff9f3 Compare December 17, 2022 02:33
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 2b8955c to 2b4bb48 Compare December 17, 2022 02:33
@stehessel stehessel requested a review from a team December 17, 2022 02:41
@stehessel stehessel marked this pull request as ready for review December 17, 2022 02:41
@stehessel stehessel force-pushed the ROX-12344/org-labels branch from 57ff9f3 to d49b755 Compare December 19, 2022 22:00
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 2b4bb48 to 80e60ed Compare December 19, 2022 22:00
@stehessel stehessel force-pushed the ROX-12344/org-labels branch from d49b755 to 09658d9 Compare December 20, 2022 13:44
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 80e60ed to 5478456 Compare December 20, 2022 13:44
Copy link
Contributor

@mtodor mtodor left a comment

Choose a reason for hiding this comment

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

Looks nice!

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 21, 2022

New changes are detected. LGTM label has been removed.

@stehessel stehessel force-pushed the ROX-12344/org-labels branch from 0abc562 to 27db7d2 Compare January 11, 2023 15:11
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 6a4a31d to 4cc406e Compare January 11, 2023 15:11
@stehessel stehessel temporarily deployed to development January 11, 2023 15:11 — with GitHub Actions Inactive
@stehessel stehessel temporarily deployed to development January 11, 2023 15:12 — with GitHub Actions Inactive
Base automatically changed from ROX-12344/org-labels to main January 17, 2023 14:19
@stehessel stehessel force-pushed the ROX-12344/org-in-reconciler branch from 4cc406e to a963444 Compare January 19, 2023 16:25
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mtodor, stehessel

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

@stehessel stehessel temporarily deployed to development January 19, 2023 16:25 — with GitHub Actions Inactive
@stehessel stehessel merged commit 111f133 into main Jan 19, 2023
@stehessel stehessel deleted the ROX-12344/org-in-reconciler branch January 19, 2023 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants