Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[controller] Adapt Python hooks for Deckhouse pod's switch to Alt Linux #14

Merged
merged 2 commits into from
Feb 16, 2024
Merged

[controller] Adapt Python hooks for Deckhouse pod's switch to Alt Linux #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd1d5a6
Fix in certificate generation
duckhawk Feb 16, 2024
43d7c7e
Merge branch 'main' into fix-hooks
yaroslavborbat Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions hooks/lib/certificate/сertificate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ def with_metadata(self, country: str = None,
def add_extension(self, type_name: str,
critical: bool,
value: str,
subject: crypto.Optional["X509"] = None,
issuer: crypto.Optional["X509"] = None):
subject: crypto.X509 = None,
issuer: crypto.X509 = None):
"""
Adds extensions to certificate.
:param type_name: The name of the type of extension_ to create.
Expand All @@ -96,10 +96,10 @@ def add_extension(self, type_name: str,
:type value: :py:class:`str`
:param subject: Optional X509 certificate to use as subject.
:type subject: :py:class:`crypto.Optional["X509"]`
:type subject: :py:class:`crypto.X509`
:param issuer: Optional X509 certificate to use as issuer.
:type issuer: :py:class:`crypto.Optional["X509"]`
:type issuer: :py:class:`crypto.X509`
"""
ext = crypto.X509Extension(type_name=str.encode(type_name),
critical=critical,
Expand Down
7 changes: 3 additions & 4 deletions lib/python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cffi==1.16.0
cryptography==41.0.4
cryptography==42.0.2
DateTime==5.2
deckhouse==0.4.9
dictdiffer==0.9.0
dotmap==1.3.30
pycparser==2.21
pyOpenSSL==23.2.0
pyOpenSSL==24.0.0
pytz==2023.3.post1
PyYAML==6.0.1
zope.interface==6.0
Expand All @@ -14,6 +14,5 @@ jsonpointer==2.4
attrs==23.1.0
jsonschema==4.19.1
jsonschema-specifications==2023.7.1
kubernetes==28.1.0
kubernetes-validate==1.28.0
rpds-py==0.10.6