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

operator: fix oidc connector max age #48316

Merged
merged 1 commit into from
Nov 4, 2024
Merged

Conversation

hugoShaka
Copy link
Contributor

@hugoShaka hugoShaka commented Nov 1, 2024

Fixe #48165

This PR deals with the inconsistencies between the CRD and the go types by defining custom marhsaller/unmarshaller on the CR go types.

Tests have also been modified to set the max_age. Without the fix, tests are failing, now they should pass.

Changelog: fix a Teleport Kubernetes Operator bug that happened for OIDCConnector resources with non-nil max_age.

Comment on lines +142 to +145
.PHONY: echo-kubebuilder-assets
echo-kubebuilder-assets:
@echo KUBEBUILDER_ASSETS=$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Don't mind this, it's just a helper to get the current kubebuilder assets dir so we can configure the env var properly in the IDE.

Copy link

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

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

@hugoShaka hugoShaka changed the title operator: fix oidc conenctor max age operator: fix oidc connector max age Nov 1, 2024
@public-teleport-github-review-bot public-teleport-github-review-bot bot removed the request for review from bernardjkim November 4, 2024 09:52
@hugoShaka hugoShaka enabled auto-merge November 4, 2024 14:18
@hugoShaka hugoShaka added this pull request to the merge queue Nov 4, 2024
Merged via the queue into master with commit 3e74e6d Nov 4, 2024
43 of 47 checks passed
@hugoShaka hugoShaka deleted the hugo/fix-operator-max-age branch November 4, 2024 18:31
@public-teleport-github-review-bot

@hugoShaka See the table below for backport results.

Branch Result
branch/v14 Create PR
branch/v15 Create PR
branch/v16 Create PR
branch/v17 Create PR

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