From 4cc1d07215bb71aada334152c5123c800678434c Mon Sep 17 00:00:00 2001 From: Sunil Singh Date: Tue, 4 Mar 2025 09:05:49 -0800 Subject: [PATCH 1/3] Revert "update versioned_docs" This reverts commit 16fa2b39ae42a2e6607e2f77255e0b166ab6e646. --- versioned_docs/version-2.11/api/api-tokens.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/versioned_docs/version-2.11/api/api-tokens.md b/versioned_docs/version-2.11/api/api-tokens.md index 65932092303..cecfd9af3cc 100644 --- a/versioned_docs/version-2.11/api/api-tokens.md +++ b/versioned_docs/version-2.11/api/api-tokens.md @@ -63,7 +63,6 @@ These global settings affect Rancher token behavior. | Setting | Description | | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | [`auth-user-session-ttl-minutes`](#auth-user-session-ttl-minutes) | TTL in minutes on a user auth session token. | -| [`auth-user-session-idle-ttl-minutes`](#auth-user-session-idle-ttl-minutes) | TTL in minutes on a user auth session token, without user activity. | | [`kubeconfig-default-token-ttl-minutes`](#kubeconfig-default-token-ttl-minutes) | Default TTL applied to all kubeconfig tokens except for tokens [generated by Rancher CLI](#disable-tokens-in-generated-kubeconfigs). | | [`auth-token-max-ttl-minutes`](#auth-token-max-ttl-minutes) | Max TTL for all tokens except those controlled by [`auth-user-session-ttl-minutes`](#auth-user-session-ttl-minutes). | | [`kubeconfig-generate-token`](#kubeconfig-generate-token) | If true, automatically generate tokens when a user downloads a kubeconfig. | @@ -72,11 +71,6 @@ These global settings affect Rancher token behavior. Time to live (TTL) duration in minutes, used to determine when a user auth session token expires. When expired, the user must log in and obtain a new token. This setting is not affected by [`auth-token-max-ttl-minutes`](#auth-token-max-ttl-minutes). Session tokens are created when a user logs into Rancher. -### auth-user-session-idle-ttl-minutes - -Time to live (TTL) without user activity for tokens controlling a login session, in minutes. -By default, the value for [`auth-user-session-idle-ttl-minutes`](#auth-user-session-idle-ttl-minutes) is be set to the same value as [`auth-user-session-ttl-minutes`](#auth-user-session-ttl-minutes) (for backward compatibility reasons), and it must never be greater than this value. - ### kubeconfig-default-token-ttl-minutes Time to live (TTL) duration in minutes, used to determine when a kubeconfig token expires. When the token is expired, the API rejects the token. This setting can't be larger than [`auth-token-max-ttl-minutes`](#auth-token-max-ttl-minutes). This setting applies to tokens generated in a requested kubeconfig file, except for tokens [generated by Rancher CLI](#disable-tokens-in-generated-kubeconfigs). As of Rancher v2.8, the default duration is `43200`, which means that tokens expire in 30 days. From 94763d89fdbe1c3669aa32432460f581be03fbb3 Mon Sep 17 00:00:00 2001 From: Sunil Singh Date: Tue, 4 Mar 2025 09:05:49 -0800 Subject: [PATCH 2/3] Revert "Update docs/api/api-tokens.md" This reverts commit d4a7f7023adf169e5d2c5f55b041ead3c5432539. --- docs/api/api-tokens.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api/api-tokens.md b/docs/api/api-tokens.md index d5125542ee8..65932092303 100644 --- a/docs/api/api-tokens.md +++ b/docs/api/api-tokens.md @@ -74,8 +74,8 @@ Time to live (TTL) duration in minutes, used to determine when a user auth sessi ### auth-user-session-idle-ttl-minutes -Time to live (TTL) without user activity for login sessions tokens, in minutes. -By default, [`auth-user-session-idle-ttl-minutes`](#auth-user-session-idle-ttl-minutes) is set to the same value as [`auth-user-session-ttl-minutes`](#auth-user-session-ttl-minutes) (for backward compatibility). It must never exceed the value of `auth-user-session-ttl-minutes`. +Time to live (TTL) without user activity for tokens controlling a login session, in minutes. +By default, the value for [`auth-user-session-idle-ttl-minutes`](#auth-user-session-idle-ttl-minutes) is be set to the same value as [`auth-user-session-ttl-minutes`](#auth-user-session-ttl-minutes) (for backward compatibility reasons), and it must never be greater than this value. ### kubeconfig-default-token-ttl-minutes From d946eb97c5c4243a37aa086b9dfb5cfdf633c89e Mon Sep 17 00:00:00 2001 From: Sunil Singh Date: Tue, 4 Mar 2025 09:05:49 -0800 Subject: [PATCH 3/3] Revert "docs: add auth-user-session-idle-ttl-minutes setting" This reverts commit 0d84fe35ac61bd3f8e6e847fa41b96194ad4a3e6. --- docs/api/api-tokens.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/api/api-tokens.md b/docs/api/api-tokens.md index 65932092303..cecfd9af3cc 100644 --- a/docs/api/api-tokens.md +++ b/docs/api/api-tokens.md @@ -63,7 +63,6 @@ These global settings affect Rancher token behavior. | Setting | Description | | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | [`auth-user-session-ttl-minutes`](#auth-user-session-ttl-minutes) | TTL in minutes on a user auth session token. | -| [`auth-user-session-idle-ttl-minutes`](#auth-user-session-idle-ttl-minutes) | TTL in minutes on a user auth session token, without user activity. | | [`kubeconfig-default-token-ttl-minutes`](#kubeconfig-default-token-ttl-minutes) | Default TTL applied to all kubeconfig tokens except for tokens [generated by Rancher CLI](#disable-tokens-in-generated-kubeconfigs). | | [`auth-token-max-ttl-minutes`](#auth-token-max-ttl-minutes) | Max TTL for all tokens except those controlled by [`auth-user-session-ttl-minutes`](#auth-user-session-ttl-minutes). | | [`kubeconfig-generate-token`](#kubeconfig-generate-token) | If true, automatically generate tokens when a user downloads a kubeconfig. | @@ -72,11 +71,6 @@ These global settings affect Rancher token behavior. Time to live (TTL) duration in minutes, used to determine when a user auth session token expires. When expired, the user must log in and obtain a new token. This setting is not affected by [`auth-token-max-ttl-minutes`](#auth-token-max-ttl-minutes). Session tokens are created when a user logs into Rancher. -### auth-user-session-idle-ttl-minutes - -Time to live (TTL) without user activity for tokens controlling a login session, in minutes. -By default, the value for [`auth-user-session-idle-ttl-minutes`](#auth-user-session-idle-ttl-minutes) is be set to the same value as [`auth-user-session-ttl-minutes`](#auth-user-session-ttl-minutes) (for backward compatibility reasons), and it must never be greater than this value. - ### kubeconfig-default-token-ttl-minutes Time to live (TTL) duration in minutes, used to determine when a kubeconfig token expires. When the token is expired, the API rejects the token. This setting can't be larger than [`auth-token-max-ttl-minutes`](#auth-token-max-ttl-minutes). This setting applies to tokens generated in a requested kubeconfig file, except for tokens [generated by Rancher CLI](#disable-tokens-in-generated-kubeconfigs). As of Rancher v2.8, the default duration is `43200`, which means that tokens expire in 30 days.