Skip to content

remove origin in cloud converters#29770

Merged
GavinFrazar merged 1 commit intomasterfrom
gavinfrazar/remove-origin-in-converters
Aug 4, 2023
Merged

remove origin in cloud converters#29770
GavinFrazar merged 1 commit intomasterfrom
gavinfrazar/remove-origin-in-converters

Conversation

@GavinFrazar
Copy link
Copy Markdown
Contributor

This PR removes the teleport.dev/origin: cloud label in db and kube cluster conversion funcs

Originally this was done in #24977 but in #28917 I changed it back unaware of that awsoidc PR

@GavinFrazar GavinFrazar changed the title Gavinfrazar/remove origin in converters remove origin in cloud converters Jul 30, 2023
@GavinFrazar GavinFrazar marked this pull request as ready for review July 30, 2023 02:57
@github-actions github-actions Bot requested review from mdwn and ravicious July 30, 2023 02:57
@@ -148,6 +148,7 @@ func (w *Watcher) fetchAndSend() {

// Set the origin to Cloud indicating that the resource was imported from a cloud provider.
staticLabels[types.OriginLabel] = types.OriginCloud
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

discovery services will apply the label here btw

@GavinFrazar GavinFrazar force-pushed the gavinfrazar/remove-origin-in-converters branch from 56aa08f to a6eef00 Compare August 4, 2023 23:03
@GavinFrazar GavinFrazar enabled auto-merge August 4, 2023 23:11
* use cmp.Diff for readable test failures
* expect the teleport.dev/cloud label in tests
* remove teleport.dev/origin in aws label conversion func
@GavinFrazar GavinFrazar force-pushed the gavinfrazar/remove-origin-in-converters branch from a6eef00 to 272d049 Compare August 4, 2023 23:19
@GavinFrazar GavinFrazar added this pull request to the merge queue Aug 4, 2023
Merged via the queue into master with commit c08c8ef Aug 4, 2023
@GavinFrazar GavinFrazar deleted the gavinfrazar/remove-origin-in-converters branch August 4, 2023 23:53
@public-teleport-github-review-bot
Copy link
Copy Markdown

@GavinFrazar See the table below for backport results.

Branch Result
branch/v12 Failed
branch/v13 Failed

GavinFrazar added a commit that referenced this pull request Sep 18, 2023
backports #29770 to branch/v13

* use cmp.Diff for readable test failures
* expect the teleport.dev/cloud label in tests
* remove teleport.dev/origin in aws label conversion func
GavinFrazar added a commit that referenced this pull request Sep 18, 2023
backports #29770 to branch/v12.

* fix awsoidc tests
* use cmp.Diff for readable test failures
* expect the teleport.dev/cloud label in tests
* remove teleport.dev/origin in aws label conversion func
github-merge-queue Bot pushed a commit that referenced this pull request Sep 18, 2023
backports #29770 to branch/v13

* use cmp.Diff for readable test failures
* expect the teleport.dev/cloud label in tests
* remove teleport.dev/origin in aws label conversion func
github-merge-queue Bot pushed a commit that referenced this pull request Sep 18, 2023
backports #29770 to branch/v12.

* fix awsoidc tests
* use cmp.Diff for readable test failures
* expect the teleport.dev/cloud label in tests
* remove teleport.dev/origin in aws label conversion func
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.

4 participants