diff --git a/examples/deployment_crud.py b/examples/deployment_crud.py index 45a759786d..51eec78db9 100644 --- a/examples/deployment_crud.py +++ b/examples/deployment_crud.py @@ -108,8 +108,7 @@ def restart_deployment(api, deployment): # update `spec.template.metadata` section # to add `kubectl.kubernetes.io/restartedAt` annotation deployment.spec.template.metadata.annotations = { - "kubectl.kubernetes.io/restartedAt": datetime.datetime.utcnow() - .replace(tzinfo=pytz.UTC) + "kubectl.kubernetes.io/restartedAt": datetime.datetime.now(tz=pytz.UTC) .isoformat() } diff --git a/examples/dynamic-client/deployment_rolling_restart.py b/examples/dynamic-client/deployment_rolling_restart.py index 8218e9e711..afa616f7dd 100644 --- a/examples/dynamic-client/deployment_rolling_restart.py +++ b/examples/dynamic-client/deployment_rolling_restart.py @@ -84,8 +84,7 @@ def main(): deployment_manifest["spec"]["template"]["metadata"] = { "annotations": { - "kubectl.kubernetes.io/restartedAt": datetime.datetime.utcnow() - .replace(tzinfo=pytz.UTC) + "kubectl.kubernetes.io/restartedAt": datetime.datetime.now(tz=pytz.UTC) .isoformat() } } diff --git a/kubernetes/base/config/kube_config.py b/kubernetes/base/config/kube_config.py index e5b2a1fb90..09cda8bda0 100644 --- a/kubernetes/base/config/kube_config.py +++ b/kubernetes/base/config/kube_config.py @@ -80,7 +80,7 @@ def _create_temp_file_with_content(content, temp_file_path=None): def _is_expired(expiry): return ((parse_rfc3339(expiry) - EXPIRY_SKEW_PREVENTION_DELAY) <= - datetime.datetime.utcnow().replace(tzinfo=UTC)) + datetime.datetime.now(tz=UTC)) class FileOrData(object): diff --git a/kubernetes/base/config/kube_config_test.py b/kubernetes/base/config/kube_config_test.py index 3f40ebab4f..f5ea181d09 100644 --- a/kubernetes/base/config/kube_config_test.py +++ b/kubernetes/base/config/kube_config_test.py @@ -30,7 +30,7 @@ from kubernetes.client import Configuration from .config_exception import ConfigException -from .dateutil import format_rfc3339, parse_rfc3339 +from .dateutil import UTC, format_rfc3339, parse_rfc3339 from .kube_config import (ENV_KUBECONFIG_PATH_SEPARATOR, CommandTokenSource, ConfigNode, FileOrData, KubeConfigLoader, KubeConfigMerger, _cleanup_temp_files, @@ -89,10 +89,10 @@ def _raise_exception(st): TEST_PASSWORD = "pass" # token for me:pass TEST_BASIC_TOKEN = "Basic bWU6cGFzcw==" -DATETIME_EXPIRY_PAST = datetime.datetime.utcnow( -) - datetime.timedelta(minutes=PAST_EXPIRY_TIMEDELTA) -DATETIME_EXPIRY_FUTURE = datetime.datetime.utcnow( -) + datetime.timedelta(minutes=FUTURE_EXPIRY_TIMEDELTA) +DATETIME_EXPIRY_PAST = datetime.datetime.now(tz=UTC + ).replace(tzinfo=None) - datetime.timedelta(minutes=PAST_EXPIRY_TIMEDELTA) +DATETIME_EXPIRY_FUTURE = datetime.datetime.now(tz=UTC + ).replace(tzinfo=None) + datetime.timedelta(minutes=FUTURE_EXPIRY_TIMEDELTA) TEST_TOKEN_EXPIRY_PAST = _format_expiry_datetime(DATETIME_EXPIRY_PAST) TEST_SSL_HOST = "https://test-host" @@ -1028,7 +1028,7 @@ def test_load_gcp_token_no_refresh(self): def test_load_gcp_token_with_refresh(self): def cred(): return None cred.token = TEST_ANOTHER_DATA_BASE64 - cred.expiry = datetime.datetime.utcnow() + cred.expiry = datetime.datetime.now(tz=UTC).replace(tzinfo=None) loader = KubeConfigLoader( config_dict=self.TEST_KUBE_CONFIG, @@ -1124,7 +1124,6 @@ def test_oidc_with_idp_ca_file_refresh(self, mock_ApiClient, mock_OAuth2Session) active_context="expired_oidc_with_idp_ca_file", ) - self.assertTrue(loader._load_auth_provider_token()) self.assertEqual("Bearer abc123", loader.token) @@ -1529,6 +1528,7 @@ def test_user_exec_auth_certificates(self, mock): @mock.patch('kubernetes.config.kube_config.ExecProvider.run', autospec=True) def test_user_exec_cwd(self, mock): capture = {} + def capture_cwd(exec_provider): capture['cwd'] = exec_provider.cwd mock.side_effect = capture_cwd