kubernetes-client/python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2215 from showjason/replace-utcnow-with-now

Browse Source 
replace utcnow with now, due to utcnow will be deprecated
This commit is contained in:
Kubernetes Prow Robot 2024-04-02 08:28:10 -07:00 committed by GitHub
commit e0234d3e71
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/deployment_crud.py
View File

@ -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()
}

3
examples/dynamic-client/deployment_rolling_restart.py
View File

@ -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()
}
}

2
kubernetes/base/config/kube_config.py
View File

@ -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):

14
kubernetes/base/config/kube_config_test.py
View File

@ -30,7 +30,7 @@ from six import PY3, next
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 @@ TEST_USERNAME = "me"
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 @@ class TestKubeConfigLoader(BaseTestCase):
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 @@ class TestKubeConfigLoader(BaseTestCase):
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 @@ class TestKubeConfigLoader(BaseTestCase):
@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