Skip to content

chore(e2e): backport CI fixes to release-2.39 (4.10) #2661

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

Merged
dcaravel merged 2 commits into from
Feb 4, 2026
Merged

chore(e2e): backport CI fixes to release-2.39 (4.10) #2661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
079dec3
chore(ci): yearly cert update (#2639)
dcaravel Feb 3, 2026
d4f203d
chore(e2e): fix e2e test failures (#2651)
dcaravel Feb 4, 2026
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
2 changes: 1 addition & 1 deletion .openshift-ci/pre_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Deployer:
Deployer - Deploys Scanner and ScannerDB resources and port-forwards the necessary endpoints.
"""

DEPLOY_TIMEOUT = 31 * 60
DEPLOY_TIMEOUT = 41 * 60

def __init__(self, slim=False):
self.slim = slim
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/mock-scanner-db-tls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
data:
ca.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNFRENDQWJhZ0F3SUJBZ0lVSG43dUdEQ2lJME5IWHkwU29CaExVRVY1V0RFd0NnWUlLb1pJemowRUF3SXcKWmpFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SQXdEZ1lEVlFRSApFd2RTWVd4bGFXZG9NUll3RkFZRFZRUUtFdzFTWldRZ1NHRjBMQ0JKYm1NdU1SUXdFZ1lEVlFRTEV3dEZibWRwCmJtVmxjbWx1WnpBZUZ3MHlOREV5TVRneE9EVTRNREJhRncweU9URXlNVGN4T0RVNE1EQmFNR1l4Q3pBSkJnTlYKQkFZVEFsVlRNUmN3RlFZRFZRUUlFdzVPYjNKMGFDQkRZWEp2YkdsdVlURVFNQTRHQTFVRUJ4TUhVbUZzWldsbgphREVXTUJRR0ExVUVDaE1OVW1Wa0lFaGhkQ3dnU1c1akxqRVVNQklHQTFVRUN4TUxSVzVuYVc1bFpYSnBibWN3CldUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFSYjdYWitXN1NQaEVlcGVyWUhsc0NvcHM5RWRJbDEKaFZ5SHl6elh5ekE0Z0wzUC85cS9FSHV6azBYNTNiSk5jTXhSeldnZlB0NmlHbkFFTHB1NjNvRUdvMEl3UURBTwpCZ05WSFE4QkFmOEVCQU1DQVFZd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVW9BaitmWWYyCkY2K01YNlhEdXRLZk9TU1YrclV3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQVB6dmVoVE9ERjFGUjVjSHZtVDYKNENHRHJvS09wa29NYlJ6dWZXRlNYWmlDQWlCZ2VPWDJQeVRpYldIZWEzV0N2TlpYMzFUNkFwbXVtOGQyWnF5ZwpWaWRjZ1E9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
cert.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNURENDQWZLZ0F3SUJBZ0lVTkpJNERqaDhLeWxzeXlZWWR5TlhWVE1CS21jd0NnWUlLb1pJemowRUF3SXcKWmpFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SQXdEZ1lEVlFRSApFd2RTWVd4bGFXZG9NUll3RkFZRFZRUUtFdzFTWldRZ1NHRjBMQ0JKYm1NdU1SUXdFZ1lEVlFRTEV3dEZibWRwCmJtVmxjbWx1WnpBZUZ3MHlOREV5TVRneE9EVTRNREJhRncweU5URXlNVGd4T0RVNE1EQmFNR1l4Q3pBSkJnTlYKQkFZVEFsVlRNUmN3RlFZRFZRUUlFdzVPYjNKMGFDQkRZWEp2YkdsdVlURVFNQTRHQTFVRUJ4TUhVbUZzWldsbgphREVXTUJRR0ExVUVDaE1OVW1Wa0lFaGhkQ3dnU1c1akxqRVVNQklHQTFVRUN4TUxSVzVuYVc1bFpYSnBibWN3CldUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFSWnFLcjhxNXZMb1pKalp0ZDJaQkxMUFBMVnNBamwKbm82bm52VEZpWEZISlVNUDF0ZDJ4Q2R5ZHBDRHA2OFlBOHB0SC9XcVZWTWpsWVdidjdyeE4vOGlvMzR3ZkRBTwpCZ05WSFE4QkFmOEVCQU1DQmFBd0hRWURWUjBsQkJZd0ZBWUlLd1lCQlFVSEF3RUdDQ3NHQVFVRkJ3TUNNQXdHCkExVWRFd0VCL3dRQ01BQXdIUVlEVlIwT0JCWUVGQ1hKbUt1MlNsMEM1Wm14dWJKMXdockNzWWluTUI0R0ExVWQKRVFRWE1CV0NFM05qWVc1dVpYSXRaR0l1YzNSaFkydHliM2d3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQU9oaQphSzhuVjVPd0Vha25JL1BtanVzaDFyZzl3RkozdHZuTm54dzlqL3lGQWlBYURzSGgvaG5uUVdkT3RPbHgvRHpYCmRSWkk1M0FlVGF6eTZhT1lhT3pOc1E9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
key.pem: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU41bE9oWUNTWWdIVE9wL09LQVBseTZZNGJ0a01valE2V1Zwb1ZWbkFuaU9vQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFV2FpcS9LdWJ5NkdTWTJiWGRtUVN5enp5MWJBSTVaNk9wNTcweFlseFJ5VkREOWJYZHNRbgpjbmFRZzZldkdBUEtiUi8xcWxWVEk1V0ZtNys2OFRmL0lnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
ca.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNFRENDQWJhZ0F3SUJBZ0lVTDJHZEhSZmM2ZmxFMWtqUzZJRi8zdk82M280d0NnWUlLb1pJemowRUF3SXcKWmpFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SQXdEZ1lEVlFRSApFd2RTWVd4bGFXZG9NUll3RkFZRFZRUUtFdzFTWldRZ1NHRjBMQ0JKYm1NdU1SUXdFZ1lEVlFRTEV3dEZibWRwCmJtVmxjbWx1WnpBZUZ3MHlOakF5TURNd01qQXlNREJhRncwek1UQXlNREl3TWpBeU1EQmFNR1l4Q3pBSkJnTlYKQkFZVEFsVlRNUmN3RlFZRFZRUUlFdzVPYjNKMGFDQkRZWEp2YkdsdVlURVFNQTRHQTFVRUJ4TUhVbUZzWldsbgphREVXTUJRR0ExVUVDaE1OVW1Wa0lFaGhkQ3dnU1c1akxqRVVNQklHQTFVRUN4TUxSVzVuYVc1bFpYSnBibWN3CldUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFRZFUxZWxmV3RHTzFDZUhvbVpoT2tkaktFMFRGKzQKTWVGMGFOZC9UdGYwNVhLZ0JOZGlSNVlnQnAvMG1QZWVPbnkyZFl2ZFI3M1VNYzRQcE16WGRTVTBvMEl3UURBTwpCZ05WSFE4QkFmOEVCQU1DQVFZd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVXFMWlA2WWhmCjNrdWZVbEZRQThyeXltVU5CRGt3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnVnFtNW9ROWdnK2cvM1ExT3FlNGsKT21lTmpxZHg3ZkZIazBxRVgrOVNLVEVDSVFDckdoVE5hQ2ZrbDZPRHRtaHpoeVoxNTJwWkcwQVlJZCtmVFV3MApMcjR6OXc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
cert.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNURENDQWZLZ0F3SUJBZ0lVUHVybHVlQjJ1YkVESnlSQ1NtdzEyclVGWUdvd0NnWUlLb1pJemowRUF3SXcKWmpFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SQXdEZ1lEVlFRSApFd2RTWVd4bGFXZG9NUll3RkFZRFZRUUtFdzFTWldRZ1NHRjBMQ0JKYm1NdU1SUXdFZ1lEVlFRTEV3dEZibWRwCmJtVmxjbWx1WnpBZUZ3MHlOakF5TURNd01qQXlNREJhRncweU56QXlNRE13TWpBeU1EQmFNR1l4Q3pBSkJnTlYKQkFZVEFsVlRNUmN3RlFZRFZRUUlFdzVPYjNKMGFDQkRZWEp2YkdsdVlURVFNQTRHQTFVRUJ4TUhVbUZzWldsbgphREVXTUJRR0ExVUVDaE1OVW1Wa0lFaGhkQ3dnU1c1akxqRVVNQklHQTFVRUN4TUxSVzVuYVc1bFpYSnBibWN3CldUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFTMU1iTGhwR1R1NmNKbkh2SGd1QzF3MWJzTFV4T00Kd0gxNjZrRHR2VVdPWTcvbkp1bXJUWXlaLzlzL1hBbEJHT3NTbUlxZC9VcjNtRUhMM3NiN3UzbTJvMzR3ZkRBTwpCZ05WSFE4QkFmOEVCQU1DQmFBd0hRWURWUjBsQkJZd0ZBWUlLd1lCQlFVSEF3RUdDQ3NHQVFVRkJ3TUNNQXdHCkExVWRFd0VCL3dRQ01BQXdIUVlEVlIwT0JCWUVGSWxwaG51WkNrczNVMlMxdkRjK1VqQkJyYjJnTUI0R0ExVWQKRVFRWE1CV0NFM05qWVc1dVpYSXRaR0l1YzNSaFkydHliM2d3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQU1JVgo0VHd2TjJZYk9OWWkrKzFMZkFmL3c5RzIwV3NOVDRreTRGYjhPT0hwQWlBMUtkZG53MHAvN1d3ZzhrRkNCUm5YCkRJRUxpU0lHaXpsTUZGakpBZ1o4Q0E9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
key.pem: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUxHakRtdVh5REpnQkRBdUlEdHZHWWFPQWxQTHlQQW5pMUQ0YUM2WWJIRnFvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFdFRHeTRhUms3dW5DWng3eDRMZ3RjTlc3QzFNVGpNQjlldXBBN2IxRmptTy81eWJwcTAyTQptZi9iUDF3SlFSanJFcGlLbmYxSzk1aEJ5OTdHKzd0NXRnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
kind: Secret
metadata:
annotations:
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/mock-scanner-tls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
data:
ca.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNFRENDQWJhZ0F3SUJBZ0lVSG43dUdEQ2lJME5IWHkwU29CaExVRVY1V0RFd0NnWUlLb1pJemowRUF3SXcKWmpFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SQXdEZ1lEVlFRSApFd2RTWVd4bGFXZG9NUll3RkFZRFZRUUtFdzFTWldRZ1NHRjBMQ0JKYm1NdU1SUXdFZ1lEVlFRTEV3dEZibWRwCmJtVmxjbWx1WnpBZUZ3MHlOREV5TVRneE9EVTRNREJhRncweU9URXlNVGN4T0RVNE1EQmFNR1l4Q3pBSkJnTlYKQkFZVEFsVlRNUmN3RlFZRFZRUUlFdzVPYjNKMGFDQkRZWEp2YkdsdVlURVFNQTRHQTFVRUJ4TUhVbUZzWldsbgphREVXTUJRR0ExVUVDaE1OVW1Wa0lFaGhkQ3dnU1c1akxqRVVNQklHQTFVRUN4TUxSVzVuYVc1bFpYSnBibWN3CldUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFSYjdYWitXN1NQaEVlcGVyWUhsc0NvcHM5RWRJbDEKaFZ5SHl6elh5ekE0Z0wzUC85cS9FSHV6azBYNTNiSk5jTXhSeldnZlB0NmlHbkFFTHB1NjNvRUdvMEl3UURBTwpCZ05WSFE4QkFmOEVCQU1DQVFZd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVW9BaitmWWYyCkY2K01YNlhEdXRLZk9TU1YrclV3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQVB6dmVoVE9ERjFGUjVjSHZtVDYKNENHRHJvS09wa29NYlJ6dWZXRlNYWmlDQWlCZ2VPWDJQeVRpYldIZWEzV0N2TlpYMzFUNkFwbXVtOGQyWnF5ZwpWaWRjZ1E9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
cert.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNTVENDQWUrZ0F3SUJBZ0lVTkh1QTB6Vjd6SW0wT3FzMlBMUVJHb2ZVOHBrd0NnWUlLb1pJemowRUF3SXcKWmpFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SQXdEZ1lEVlFRSApFd2RTWVd4bGFXZG9NUll3RkFZRFZRUUtFdzFTWldRZ1NHRjBMQ0JKYm1NdU1SUXdFZ1lEVlFRTEV3dEZibWRwCmJtVmxjbWx1WnpBZUZ3MHlOREV5TVRneE9EVTRNREJhRncweU5URXlNVGd4T0RVNE1EQmFNR1l4Q3pBSkJnTlYKQkFZVEFsVlRNUmN3RlFZRFZRUUlFdzVPYjNKMGFDQkRZWEp2YkdsdVlURVFNQTRHQTFVRUJ4TUhVbUZzWldsbgphREVXTUJRR0ExVUVDaE1OVW1Wa0lFaGhkQ3dnU1c1akxqRVVNQklHQTFVRUN4TUxSVzVuYVc1bFpYSnBibWN3CldUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFUdE5xYXlPQWExVUp1QmI2eEJ4a0I4SXREa3pJM2gKZkJSeU12c3E1UlhualB0Y01sUGxmQWdkOEJNeCsvMnhCN1N3Yk9ONlRwR0w4RUdzM0x5SjZObU5vM3N3ZVRBTwpCZ05WSFE4QkFmOEVCQU1DQmFBd0hRWURWUjBsQkJZd0ZBWUlLd1lCQlFVSEF3RUdDQ3NHQVFVRkJ3TUNNQXdHCkExVWRFd0VCL3dRQ01BQXdIUVlEVlIwT0JCWUVGSHF1RmxDeW5UcUhmTERKR21udGt2OWExa3RVTUJzR0ExVWQKRVFRVU1CS0NFSE5qWVc1dVpYSXVjM1JoWTJ0eWIzZ3dDZ1lJS29aSXpqMEVBd0lEU0FBd1JRSWdZaW1rT2t6OQo0Nm80ci9Ud1haazRtUTNxREVIaHk4dE1MRmkyV0JCSktvZ0NJUUNXZC9RajU2TEtxb2tCSDFsanZLNC9rYXRzCmlzRzBmazFMbm93dlpqZk5tUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
key.pem: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUdkU2FUeHJxYWU0cGJldnVNbVVNQ0tFODBOOHE4Y0JIbnU1bFR1S3lEVkZvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFN1RhbXNqZ0d0VkNiZ1crc1FjWkFmQ0xRNU15TjRYd1Vjakw3S3VVVjU0ejdYREpUNVh3SQpIZkFUTWZ2OXNRZTBzR3pqZWs2UmkvQkJyTnk4aWVqWmpRPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
ca.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNFRENDQWJhZ0F3SUJBZ0lVTDJHZEhSZmM2ZmxFMWtqUzZJRi8zdk82M280d0NnWUlLb1pJemowRUF3SXcKWmpFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SQXdEZ1lEVlFRSApFd2RTWVd4bGFXZG9NUll3RkFZRFZRUUtFdzFTWldRZ1NHRjBMQ0JKYm1NdU1SUXdFZ1lEVlFRTEV3dEZibWRwCmJtVmxjbWx1WnpBZUZ3MHlOakF5TURNd01qQXlNREJhRncwek1UQXlNREl3TWpBeU1EQmFNR1l4Q3pBSkJnTlYKQkFZVEFsVlRNUmN3RlFZRFZRUUlFdzVPYjNKMGFDQkRZWEp2YkdsdVlURVFNQTRHQTFVRUJ4TUhVbUZzWldsbgphREVXTUJRR0ExVUVDaE1OVW1Wa0lFaGhkQ3dnU1c1akxqRVVNQklHQTFVRUN4TUxSVzVuYVc1bFpYSnBibWN3CldUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFRZFUxZWxmV3RHTzFDZUhvbVpoT2tkaktFMFRGKzQKTWVGMGFOZC9UdGYwNVhLZ0JOZGlSNVlnQnAvMG1QZWVPbnkyZFl2ZFI3M1VNYzRQcE16WGRTVTBvMEl3UURBTwpCZ05WSFE4QkFmOEVCQU1DQVFZd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVXFMWlA2WWhmCjNrdWZVbEZRQThyeXltVU5CRGt3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnVnFtNW9ROWdnK2cvM1ExT3FlNGsKT21lTmpxZHg3ZkZIazBxRVgrOVNLVEVDSVFDckdoVE5hQ2ZrbDZPRHRtaHpoeVoxNTJwWkcwQVlJZCtmVFV3MApMcjR6OXc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
cert.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNTVENDQWUrZ0F3SUJBZ0lVTXpmVnUvc0dFeiswQzBkYk5ERFlUdXV0UXVFd0NnWUlLb1pJemowRUF3SXcKWmpFTE1Ba0dBMVVFQmhNQ1ZWTXhGekFWQmdOVkJBZ1REazV2Y25Sb0lFTmhjbTlzYVc1aE1SQXdEZ1lEVlFRSApFd2RTWVd4bGFXZG9NUll3RkFZRFZRUUtFdzFTWldRZ1NHRjBMQ0JKYm1NdU1SUXdFZ1lEVlFRTEV3dEZibWRwCmJtVmxjbWx1WnpBZUZ3MHlOakF5TURNd01qQXlNREJhRncweU56QXlNRE13TWpBeU1EQmFNR1l4Q3pBSkJnTlYKQkFZVEFsVlRNUmN3RlFZRFZRUUlFdzVPYjNKMGFDQkRZWEp2YkdsdVlURVFNQTRHQTFVRUJ4TUhVbUZzWldsbgphREVXTUJRR0ExVUVDaE1OVW1Wa0lFaGhkQ3dnU1c1akxqRVVNQklHQTFVRUN4TUxSVzVuYVc1bFpYSnBibWN3CldUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFTVU5VaGtSSmx6T2ovcGJodnRTUmxFRWxCUzRXZ3AKN0xENWF6WDVzaWRLemtTUXo2MGk3WGtqdzROMUJFQ0hVK0lQTGErZWdoMUhhREg0bEVtbmp3OGJvM3N3ZVRBTwpCZ05WSFE4QkFmOEVCQU1DQmFBd0hRWURWUjBsQkJZd0ZBWUlLd1lCQlFVSEF3RUdDQ3NHQVFVRkJ3TUNNQXdHCkExVWRFd0VCL3dRQ01BQXdIUVlEVlIwT0JCWUVGSko5NElJNE9OTDl0MTNaZXZRQXlSTHFGVjRZTUJzR0ExVWQKRVFRVU1CS0NFSE5qWVc1dVpYSXVjM1JoWTJ0eWIzZ3dDZ1lJS29aSXpqMEVBd0lEU0FBd1JRSWhBT2QvWXc2SApmYkRHZncrZ0hoTTFHN0RZdlVSa2pma3hWZlhtUmhFcjRxK3ZBaUFZY1QyMVFYcE1SbDVNTTJWNHMrQUIwZDI0Ci9TZEV4TVllcDFIOW8zMVdJUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
key.pem: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU41Z09ER2tCVDhNOGsveXlNSzM1Y05XWTFtQkZLRHVUSERhSlMzSEZLb0NvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFbERWSVpFU1pjem8vNlc0YjdVa1pSQkpRVXVGb0tleXcrV3MxK2JJblNzNUVrTSt0SXUxNQpJOE9EZFFSQWgxUGlEeTJ2bm9JZFIyZ3grSlJKcDQ4UEd3PT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
kind: Secret
metadata:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion cmd/clair/testdata/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ scanner:
options:
# PostgreSQL Connection string
# https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
source: host=scanner-db.stackrox.svc port=5432 user=postgres sslmode=verify-full statement_timeout=60000
source: host=scanner-db.stackrox.svc port=5432 user=postgres sslmode=verify-full statement_timeout=180000

# Number of elements kept in the cache
# Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database.
Expand Down
77 changes: 73 additions & 4 deletions e2etests/testcase_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ var testCases = []testCase{
{
Name: "CVE-2018-1125",
NamespaceName: "centos:7",
Description: "DOCUMENTATION: If a process inspected by pgrep has an argument longer than INT_MAX bytes, \"int bytes\" could wrap around back to a large positive int (rather than approaching zero), leading to a stack buffer overflow via strncat(). MITIGATION: The procps suite on Red Hat Enterprise Linux is built with FORTIFY, which limits the impact of this stack overflow (and others like it) to a crash.",
Description: "DOCUMENTATION: If a process inspected by pgrep has an argument longer than INT_MAX bytes, \"int bytes\" could wrap around back to a large positive int (rather than approaching zero), leading to a stack buffer overflow via strncat(). MITIGATION: The procps suite on Red Hat Enterprise Linux is built with FORTIFY, which limits the impact of this stack overflow (and others like it) to a crash.",
Link: "https://access.redhat.com/security/cve/CVE-2018-1125",
Severity: "Low",
Metadata: map[string]interface{}{
Expand Down Expand Up @@ -3032,10 +3032,33 @@ var testCases = []testCase{
},
FixedBy: "2.12.3",
},
{
Name: "CVE-2025-68161",
Description: "The Socket Appender in Apache Log4j Core versions 2.0-beta9 through 2.25.2 does not perform TLS hostname verification of the peer certificate, even when the verifyHostName https://logging.apache.org/log4j/2.x/manual/appenders/network.html#SslConfiguration-attr-verifyHostName configuration attribute or the log4j2.sslVerifyHostName https://logging.apache.org/log4j/2.x/manual/systemproperties.html#log4j2.sslVerifyHostName system property is set to true.\n\nThis issue may allow a man-in-the-middle attacker to intercept or redirect log traffic under the following conditions:\n\n * The attacker is able to intercept or redirect network traffic between the client and the log receiver.\n * The attacker can present a server certificate issued by a certification authority trusted by the Socket Appender’s configured trust store (or by the default Java trust store if no custom trust store is configured).\n\n\nUsers are advised to upgrade to Apache Log4j Core version 2.25.3, which addresses this issue.\n\nAs an alternative mitigation, the Socket Appender may be configured to use a private or restricted trust root to limit the set of trusted certificates.",
Link: "https://nvd.nist.gov/vuln/detail/CVE-2025-68161",
Severity: "Moderate",
Metadata: map[string]interface{}{
"NVD": map[string]interface{}{
"CVSSv3": map[string]interface{}{
"ExploitabilityScore": 2.2,
"ImpactScore": 2.5,
"Score": 4.8,
"Vectors": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:L/A:N",
},
"CVSSv2": map[string]interface{}{
"ExploitabilityScore": 0.0,
"ImpactScore": 0.0,
"Score": 0.0,
"Vectors": "",
},
},
},
FixedBy: "2.25.3",
},
},
AddedBy: "sha256:477d0b4ccc14566aec80c3360aba6c84208c9d337727434c3914bd87b023dab3",
Location: "usr/share/logstash/vendor/bundle/jruby/2.5.0/gems/logstash-input-tcp-6.0.10-java/vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.10/logstash-input-tcp-6.0.10.jar:log4j-core",
FixedBy: "2.12.4",
FixedBy: "2.25.3",
},
{
Name: "log4j",
Expand Down Expand Up @@ -3134,10 +3157,33 @@ var testCases = []testCase{
},
FixedBy: "2.17.0",
},
{
Name: "CVE-2025-68161",
Description: "The Socket Appender in Apache Log4j Core versions 2.0-beta9 through 2.25.2 does not perform TLS hostname verification of the peer certificate, even when the verifyHostName https://logging.apache.org/log4j/2.x/manual/appenders/network.html#SslConfiguration-attr-verifyHostName configuration attribute or the log4j2.sslVerifyHostName https://logging.apache.org/log4j/2.x/manual/systemproperties.html#log4j2.sslVerifyHostName system property is set to true.\n\nThis issue may allow a man-in-the-middle attacker to intercept or redirect log traffic under the following conditions:\n\n * The attacker is able to intercept or redirect network traffic between the client and the log receiver.\n * The attacker can present a server certificate issued by a certification authority trusted by the Socket Appender’s configured trust store (or by the default Java trust store if no custom trust store is configured).\n\n\nUsers are advised to upgrade to Apache Log4j Core version 2.25.3, which addresses this issue.\n\nAs an alternative mitigation, the Socket Appender may be configured to use a private or restricted trust root to limit the set of trusted certificates.",
Link: "https://nvd.nist.gov/vuln/detail/CVE-2025-68161",
Severity: "Moderate",
Metadata: map[string]interface{}{
"NVD": map[string]interface{}{
"CVSSv3": map[string]interface{}{
"ExploitabilityScore": 2.2,
"ImpactScore": 2.5,
"Score": 4.8,
"Vectors": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:L/A:N",
},
"CVSSv2": map[string]interface{}{
"ExploitabilityScore": 0.0,
"ImpactScore": 0.0,
"Score": 0.0,
"Vectors": "",
},
},
},
FixedBy: "2.25.3",
},
},
AddedBy: "sha256:477d0b4ccc14566aec80c3360aba6c84208c9d337727434c3914bd87b023dab3",
Location: "usr/share/logstash/logstash-core/lib/jars/log4j-core-2.14.0.jar",
FixedBy: "2.17.1",
FixedBy: "2.25.3",
},
},
},
Expand Down Expand Up @@ -3223,10 +3269,33 @@ var testCases = []testCase{
},
FixedBy: "2.12.3",
},
{
Name: "CVE-2025-68161",
Description: "The Socket Appender in Apache Log4j Core versions 2.0-beta9 through 2.25.2 does not perform TLS hostname verification of the peer certificate, even when the verifyHostName https://logging.apache.org/log4j/2.x/manual/appenders/network.html#SslConfiguration-attr-verifyHostName configuration attribute or the log4j2.sslVerifyHostName https://logging.apache.org/log4j/2.x/manual/systemproperties.html#log4j2.sslVerifyHostName system property is set to true.\n\nThis issue may allow a man-in-the-middle attacker to intercept or redirect log traffic under the following conditions:\n\n * The attacker is able to intercept or redirect network traffic between the client and the log receiver.\n * The attacker can present a server certificate issued by a certification authority trusted by the Socket Appender’s configured trust store (or by the default Java trust store if no custom trust store is configured).\n\n\nUsers are advised to upgrade to Apache Log4j Core version 2.25.3, which addresses this issue.\n\nAs an alternative mitigation, the Socket Appender may be configured to use a private or restricted trust root to limit the set of trusted certificates.",
Link: "https://nvd.nist.gov/vuln/detail/CVE-2025-68161",
Severity: "Moderate",
Metadata: map[string]interface{}{
"NVD": map[string]interface{}{
"CVSSv3": map[string]interface{}{
"ExploitabilityScore": 2.2,
"ImpactScore": 2.5,
"Score": 4.8,
"Vectors": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:L/A:N",
},
"CVSSv2": map[string]interface{}{
"ExploitabilityScore": 0.0,
"ImpactScore": 0.0,
"Score": 0.0,
"Vectors": "",
},
},
},
FixedBy: "2.25.3",
},
},
AddedBy: "sha256:d84ba7ea7803fa43fca06730523d264b31c562968cfd7020f0584f5ec1b26225",
Location: "log4j-core-2.12.2.jar",
FixedBy: "2.12.4",
FixedBy: "2.25.3",
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions scripts/cert/gen-cert.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ yq eval ".data[\"cert.pem\"] = \"${SCANNER_CERT}\"" tmp.yaml > tmp2.yaml
yq eval ".data[\"key.pem\"] = \"${SCANNER_KEY}\"" tmp2.yaml > tmp3.yaml
mv tmp3.yaml "${SCANNER_TLS_FILE}"

rm *.yaml
rm -f tmp.yaml tmp2.yaml

echo "Generating Cert/Key pair for Scanner DB"
cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname scanner-db.stackrox "$ROOT/scripts/cert/csr.json" | cfssljson -bare
Expand All @@ -33,4 +33,4 @@ yq eval ".data[\"cert.pem\"] = \"${SCANNER_DB_CERT}\"" tmp.yaml > tmp2.yaml
yq eval ".data[\"key.pem\"] = \"${SCANNER_DB_KEY}\"" tmp2.yaml > tmp3.yaml
mv tmp3.yaml "${SCANNER_DB_TLS_FILE}"

rm -f *.pem *.csr *.yaml
rm -f *.pem *.csr tmp.yaml tmp2.yaml
2 changes: 1 addition & 1 deletion scripts/ci/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ _wait_for_scanner() {
kubectl -n stackrox get pod
POD="$(kubectl -n stackrox get pod -o jsonpath='{.items[?(@.metadata.labels.app=="scanner")].metadata.name}')"
[[ -n "${POD}" ]]
kubectl -n stackrox wait "--for=condition=Ready" "pod/${POD}" --timeout=30m
kubectl -n stackrox wait "--for=condition=Ready" "pod/${POD}" --timeout=40m
kubectl -n stackrox get pod
}

Expand Down