Off-shoot from #331 Split out the non-OIDC related changes, such as supporting a user-supplied ConfigMap work in #346