Skip to content

ROX-14973: Various fixes for release-3.72#4830

Merged
gavin-stackrox merged 14 commits intorelease-3.72from
gavin/patches-for-3-72
Feb 14, 2023
Merged

ROX-14973: Various fixes for release-3.72#4830
gavin-stackrox merged 14 commits intorelease-3.72from
gavin/patches-for-3-72

Conversation

@gavin-stackrox
Copy link
Contributor

@gavin-stackrox gavin-stackrox commented Feb 11, 2023

Description

WIP.

Picked so far

d955417 [ROX-13500] Perform type check for V1 CronJob (#3787)
eb1b45f Start using the batch/v1 api for CronJobs (#3854)
5e1595c ROX-14485: update monitoring psp (#4655)
f5baf26 ROX-14427: set PSPs for CI to false for k8s version 1.25 and higher (#4488)
42719ea ROX-12856: roxctl: Make sure that PSPs are not rendered for deployment bundles (#3230)

For test flakes

497b8b2 [ROX-9864] : Sleep after creating deployment to wait for image CVEs being discovered and added to db (#3834)
75091a7 CI: Handle updated vuln counts (#3471)
8b7f402 CI: Increase a range of CVE count to avoid flakes (#3415)
d252f1f Drop PodSecurityPolicy from errors files. (#4774)
4bba794 Fix TLSChallenge certificate test flake and increase cert expiry date (#3843)
3c38bb8 booleanpolicy-test-follow-up (#4255)
dec194c fix-booleanpolicy-test (#4253)
4b47141 CI: Switch to containerd for k8s v1.23 support (#3650)

Checklist

  • Investigated and inspected CI test results

Testing Performed

CI is sufficient

mtesseract and others added 5 commits February 11, 2023 00:15
…t bundles (#3230)

Make sure that auto-sensing for PSPs is disabled when rendering deployment bundles.
Fix PSP logic in local deployment script.
…4488)

* set POD_SECURITY_POLICIES based on kubernetes version

* set POD_SECURITY_POLICIES when true aswell
@gavin-stackrox
Copy link
Contributor Author

/test openshift-newest-operator-e2e-tests
/test openshift-newest-qa-e2e-tests
/test openshift-oldest-operator-e2e-tests
/test openshift-oldest-qa-e2e-tests
/test openshift-penult-operator-e2e-tests
/test openshift-penultimate-qa-e2e-tests

1 similar comment
@gavin-stackrox
Copy link
Contributor Author

/test openshift-newest-operator-e2e-tests
/test openshift-newest-qa-e2e-tests
/test openshift-oldest-operator-e2e-tests
/test openshift-oldest-qa-e2e-tests
/test openshift-penult-operator-e2e-tests
/test openshift-penultimate-qa-e2e-tests

@ghost
Copy link

ghost commented Feb 11, 2023

Images are ready for the commit at 0a735eb.

To use with deploy scripts, first export MAIN_IMAGE_TAG=3.72.3-15-g0a735ebab6.

@gavin-stackrox
Copy link
Contributor Author

/test openshift-penultimate-operator-e2e-tests

@gavin-stackrox gavin-stackrox requested a review from a team as a code owner February 11, 2023 03:49
@gitguardian
Copy link

gitguardian bot commented Feb 11, 2023

⚠️ GitGuardian has uncovered 2 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id Secret Commit Filename
3038032 Generic High Entropy Secret 4bba794 sensor/common/centralclient/client_test.go View secret
3038032 Generic High Entropy Secret 4bba794 sensor/common/centralclient/client_test.go View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

@gavin-stackrox
Copy link
Contributor Author

/test openshift-penultimate-operator-e2e-tests

/test openshift-penultimate-qa-e2e-tests

@gavin-stackrox gavin-stackrox changed the title WIP: Various fixes for release-3.72 Various fixes for release-3.72 Feb 11, 2023
@gavin-stackrox gavin-stackrox removed the request for review from a team February 11, 2023 03:57
@@ -18,13 +18,14 @@ $ LOAD_BALANCER=route ./deploy/openshift/deploy.sh

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(not about this line)

It seems changes are applied fine in this PR (except of one case I highlighted).

I did not go to check what each separate included PR means or fixes, but the ones about PSP and CronJobs that are included definitely seem relevant.

My main question: what was the method you used to determine which changes to pick for this PR?
How do we make sure that there are no other PRs that should be included too?

Copy link
Contributor

@msugakov msugakov Feb 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like all items returned from the following commands are here and the rest I assume were hand-picked for tests to pass.

git log -G PodSecurityPolicy
git log -G PSP
git log -G batch/v1

Copy link
Contributor

@msugakov msugakov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please delete the redundant fragment.

@msugakov msugakov changed the title Various fixes for release-3.72 ROX-14973: Various fixes for release-3.72 Feb 13, 2023
Co-authored-by: Misha Sugakov <537715+msugakov@users.noreply.github.com>
@gavin-stackrox gavin-stackrox merged commit ea491fa into release-3.72 Feb 14, 2023
@gavin-stackrox gavin-stackrox deleted the gavin/patches-for-3-72 branch February 14, 2023 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.