Skip to content

Conversation

@stlaz
Copy link
Contributor

@stlaz stlaz commented Jan 16, 2019

Grabs identity providers' configmaps and secrets from the
top-level config and stores their mapping to volumes/volumeMounts
so that these can later be added to the deployment running OSIN

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 16, 2019
@stlaz
Copy link
Contributor Author

stlaz commented Jan 16, 2019

Note to self: get rid of idpSyncData, it does not seem to be bringing any value, only overhead

edit: or at least only fill it once, don't create an array of those

Copy link
Contributor

@ericavonb ericavonb left a comment

Choose a reason for hiding this comment

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

A few small comments. There’s more consolidation that could be done but this is a good step forward without that


default:
panic("TODO")
return nil // TODO: some erroring
Copy link
Contributor

Choose a reason for hiding this comment

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

return fmt.Errorf(“unknown IdentityProvider type: %s”, pc.Type)

Copy link
Contributor

Choose a reason for hiding this comment

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

And thank you, no panics!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The function currently only returns []idpSyncData, I'd maybe fix this when gets merged with convertProviderConfigToOsinBytes()

Copy link
Contributor

Choose a reason for hiding this comment

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

icky, ok. for another pr

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2019
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2019
@stlaz
Copy link
Contributor Author

stlaz commented Jan 16, 2019

Fixed comments, rebased on master.

I also added a refactoring to convertToData() which now only returns a pointer to the idpSyncData structure. Lets' hope nothing breaks!

Copy link
Contributor

@ericavonb ericavonb left a comment

Choose a reason for hiding this comment

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

one typo to fix


default:
panic("TODO")
return nil // TODO: some erroring
Copy link
Contributor

Choose a reason for hiding this comment

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

icky, ok. for another pr

@stlaz
Copy link
Contributor Author

stlaz commented Jan 16, 2019

typo fixed

@stlaz
Copy link
Contributor Author

stlaz commented Jan 16, 2019

latest push fixes writing to nil maps

@stlaz stlaz force-pushed the idp_mapping branch 2 times, most recently from d3d794c to d50ca16 Compare January 16, 2019 14:58
@stlaz
Copy link
Contributor Author

stlaz commented Jan 16, 2019

I chipped away the refactoring so that we can merge this earlier. See #26 for the follow-up.

Grabs identity providers' configmaps and secrets from the
top-level config and stores their mapping to volumes/volumeMounts
so that these can later be added to the deployment running OSIN
@stlaz
Copy link
Contributor Author

stlaz commented Jan 16, 2019

Fixed bug in newSourceDataIDPConfigMap(), it had secretVolume() instead of the proper volume func.

@stlaz
Copy link
Contributor Author

stlaz commented Jan 16, 2019

/test e2e-aws

@enj
Copy link
Contributor

enj commented Jan 16, 2019

/retest

Copy link
Contributor

@ericavonb ericavonb left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 16, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ericavonb, stlaz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@stlaz
Copy link
Contributor Author

stlaz commented Jan 16, 2019

/retest

@enj
Copy link
Contributor

enj commented Jan 16, 2019

Tested with 4.0 cluster, htpasswd still works so this is hopefully fine.

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@stlaz
Copy link
Contributor Author

stlaz commented Jan 16, 2019

/retest

1 similar comment
@stlaz
Copy link
Contributor Author

stlaz commented Jan 16, 2019

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@enj
Copy link
Contributor

enj commented Jan 16, 2019

/retest

4 similar comments
@enj
Copy link
Contributor

enj commented Jan 16, 2019

/retest

@enj
Copy link
Contributor

enj commented Jan 16, 2019

/retest

@enj
Copy link
Contributor

enj commented Jan 17, 2019

/retest

@enj
Copy link
Contributor

enj commented Jan 17, 2019

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@stlaz
Copy link
Contributor Author

stlaz commented Jan 17, 2019

/retest

@enj
Copy link
Contributor

enj commented Jan 17, 2019

/refresh

@openshift-ci-robot
Copy link
Contributor

@stlaz: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws-operator 9330345 link /test e2e-aws-operator

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

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. I understand the commands that are listed here.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@stlaz
Copy link
Contributor Author

stlaz commented Jan 17, 2019

/test e2e-aws-operator

@enj
Copy link
Contributor

enj commented Jan 17, 2019

/retest

1 similar comment
@stlaz
Copy link
Contributor Author

stlaz commented Jan 17, 2019

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@enj
Copy link
Contributor

enj commented Jan 17, 2019

kube:admin still works. Time for the 🔨

@enj enj merged commit a61a78d into openshift:master Jan 17, 2019
@stlaz stlaz deleted the idp_mapping branch February 18, 2019 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants