diff --git a/content/docs/pulumi-cloud/access-management/oidc-client/_index.md b/content/docs/pulumi-cloud/access-management/oidc-client/_index.md index e3a767a22ace..f0cba2ede8a1 100644 --- a/content/docs/pulumi-cloud/access-management/oidc-client/_index.md +++ b/content/docs/pulumi-cloud/access-management/oidc-client/_index.md @@ -24,6 +24,16 @@ Pulumi supports establishing trust relationships with third party OIDC providers For third party services that have capabilities to issue OIDC id_tokens, it is possible to register them as a trusted OIDC Issuer to leverage these tokens to be exchanged by a short-lived Pulumi access token automatically to avoid having to store hardcoded credentials. +## Token types by edition + +The available OIDC token types vary depending on your Pulumi edition: + +- **Individual**: `personal` tokens only +- **Team**: `personal` and `organization` tokens +- **Enterprise and Business Critical**: `personal`, `organization`, and `team` tokens + +When configuring authorization policies and requesting tokens, ensure you select a token type that is available for your edition. + ## Configuring trust relationships ### Register the OIDC issuer @@ -145,5 +155,5 @@ curl -X POST \ To configure OIDC, refer to one of our guides: -- [Configuring OIDC for Github](/docs/pulumi-cloud/oidc/client/github/) +- [Configuring OIDC for GitHub](/docs/pulumi-cloud/oidc/client/github/) - [Configuring OIDC for Google Kubernetes Engine](/docs/pulumi-cloud/oidc/client/kubernetes-gke/) diff --git a/content/docs/pulumi-cloud/access-management/oidc-client/github.md b/content/docs/pulumi-cloud/access-management/oidc-client/github.md index 645e91d47fd4..2c641b01269f 100644 --- a/content/docs/pulumi-cloud/access-management/oidc-client/github.md +++ b/content/docs/pulumi-cloud/access-management/oidc-client/github.md @@ -16,6 +16,10 @@ aliases: This document outlines the steps required to configure Pulumi to accept Github id_tokens to be exchanged by Organization access tokens. +{{< notes type="info" >}} +This guide demonstrates using `organization` tokens. Depending on your [Pulumi edition](/docs/pulumi-cloud/access-management/oidc-client/#token-types-by-edition), you may also use `personal` or `team` tokens by adjusting the token type in the authorization policies and the `requested-token-type` parameter. +{{< /notes >}} + ## Prerequisites * You must be an admin of your Pulumi organization. @@ -86,3 +90,4 @@ jobs: command: preview stack-name: org-name/stack-name ``` + diff --git a/content/docs/pulumi-cloud/access-management/oidc-client/kubernetes-eks.md b/content/docs/pulumi-cloud/access-management/oidc-client/kubernetes-eks.md index 10490776a7fb..988c4a95e3d1 100644 --- a/content/docs/pulumi-cloud/access-management/oidc-client/kubernetes-eks.md +++ b/content/docs/pulumi-cloud/access-management/oidc-client/kubernetes-eks.md @@ -19,6 +19,10 @@ aliases: This document outlines the steps required to configure Pulumi to accept Elastic Kubernetes Service (EKS) id_tokens to be exchanged for a personal access token. With this configuration, Kubernetes pods authenticate to Pulumi Cloud using OIDC tokens issued by EKS. +{{< notes type="info" >}} +This guide demonstrates using `personal` tokens. Depending on your [Pulumi edition](/docs/pulumi-cloud/access-management/oidc-client/#token-types-by-edition), you may also use `organization` or `team` tokens by adjusting the token type in the authorization policies and the `requested-token-type` parameter. +{{< /notes >}} + ## Prerequisites * You must be an admin of your Pulumi organization. @@ -182,7 +186,7 @@ const job = new kubernetes.batch.v1.Job("runner", { spec: { template: { spec: { - serviceAccountName: "pulumi-service-account" + serviceAccountName: "pulumi-service-account", containers: [{ name: "runner", image: "pulumi/pulumi:latest", diff --git a/content/docs/pulumi-cloud/access-management/oidc-client/kubernetes-gke.md b/content/docs/pulumi-cloud/access-management/oidc-client/kubernetes-gke.md index be0ba3ec699a..0667b468a3ce 100644 --- a/content/docs/pulumi-cloud/access-management/oidc-client/kubernetes-gke.md +++ b/content/docs/pulumi-cloud/access-management/oidc-client/kubernetes-gke.md @@ -18,6 +18,10 @@ This document outlines the steps required to configure Pulumi to accept Google K See ["Bound Tokens"](https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-bound-service-account-tokens) for more background. +{{< notes type="info" >}} +This guide demonstrates using `organization` tokens. Depending on your [Pulumi edition](/docs/pulumi-cloud/access-management/oidc-client/#token-types-by-edition), you may also use `personal` or `team` tokens by adjusting the token type in the authorization policies and the `requested-token-type` parameter. +{{< /notes >}} + ## Prerequisites * You must be an admin of your Pulumi organization.