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

Fix TeleportOktaImportRule #48197

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Conversation

smallinsky
Copy link
Contributor

What

rm TeleportOktaImportRule from oss that was causing duplicaiton error:

Okta Service was moved from oss to teleprot e and the reconcilers test makes only sense with enterprise version
see:

reconcilers = append(reconcilers, reconcilerFactory{"TeleportAccessList", NewAccessListReconciler})

	// AccessLists, OktaImports are enterprise-only but there is no specific feature-flag for them.
	if features.GetAdvancedAccessWorkflows() {
		reconcilers = append(reconcilers, reconcilerFactory{"TeleportAccessList", NewAccessListReconciler})
		reconcilers = append(reconcilers, reconcilerFactory{"TeleportOktaImportRule", NewOktaImportRuleReconciler})
	} else {
		log.Info("The cluster license does not contain advanced workflows. TeleportAccessList, TeleportOktaImportRule resources won't be reconciled")
	}

adding in oss
{"TeleportOktaImportRule", NewOktaImportRuleReconciler}, and


for `e` 

```go
if features.GetAdvancedAccessWorkflows() {
   	reconcilers = append(reconcilers, reconcilerFactory{"TeleportOktaImportRule", NewOktaImportRuleReconciler})

}

was causing duplication error where the TeleportOktaImportRule make sonly only for enterprice build where identify feature is aviable.

@smallinsky smallinsky requested review from bernardjkim and removed request for marcoandredinis, tigrato and hugoShaka October 31, 2024 09:16
@smallinsky smallinsky added the no-changelog Indicates that a PR does not require a changelog entry label Oct 31, 2024
Copy link

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-48197.d3pp5qlev8mo18.amplifyapp.com

e Show resolved Hide resolved
@public-teleport-github-review-bot public-teleport-github-review-bot bot removed the request for review from bernardjkim October 31, 2024 09:49
@smallinsky smallinsky added this pull request to the merge queue Oct 31, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 31, 2024
@smallinsky smallinsky added this pull request to the merge queue Oct 31, 2024
Merged via the queue into master with commit a9adc59 Oct 31, 2024
42 checks passed
@smallinsky smallinsky deleted the smallinsky/fix-k8-operator-okta-reconsier branch October 31, 2024 10:42
@public-teleport-github-review-bot

@smallinsky See the table below for backport results.

Branch Result
branch/v17 Failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/branch/v17 no-changelog Indicates that a PR does not require a changelog entry size/sm
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants