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

Jump to bottom

OCPBUGS-24619: Update to latest k8s v0.25.15 API server and enable HTTP/2 DoS mitigations #660

Merged
merged 8 commits into from Jan 19, 2024
Merged

OCPBUGS-24619: Update to latest k8s v0.25.15 API server and enable HTTP/2 DoS mitigations #660

merged 8 commits into from Jan 19, 2024

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented Jan 16, 2024

No description provided.

@tmshort
Copy link
Contributor Author

tmshort commented Jan 16, 2024

/hold

@tmshort tmshort marked this pull request as draft January 16, 2024 19:27
@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jan 16, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tmshort

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2024
@tmshort
Copy link
Contributor Author

tmshort commented Jan 16, 2024

/test

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 16, 2024

@tmshort: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test e2e-gcp-console-olm
  • /test e2e-gcp-olm
  • /test e2e-gcp-ovn
  • /test e2e-upgrade
  • /test images
  • /test periodics-images
  • /test unit-api
  • /test unit-olm
  • /test unit-psm
  • /test unit-registry
  • /test verify

The following commands are available to trigger optional jobs:

  • /test e2e-gcp-olm-flaky

Use /test all to run all jobs.

In response to this:

/test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tmshort
Copy link
Contributor Author

tmshort commented Jan 16, 2024

/test all

awgreene and others added 8 commits January 16, 2024 17:16
@awgreene @tmshort
Bump k8s dependencies to v0.25.15
8c55058 
Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Signed-off-by: Todd Short <todd.short@me.com>

Upstream-repository: api
Upstream-commit: 071829b7c42526d9fb58023024abfb62c7a3e516
(cherry picked from commit eea062a)
@awgreene @tmshort
Bump k8s dependencies to v0.25.15
ffee573 
Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Signed-off-by: Todd Short <todd.short@me.com>

Upstream-repository: operator-registry
Upstream-commit: f538df278daeed4b25453d15d6d282f0dc31beb7
(cherry picked from commit ba6bc64)
@awgreene @tmshort
Bump k8s dependencies to v0.25.15
ab980ac 
Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Signed-off-by: Todd Short <todd.short@me.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 80109a6d48e2d6b6338a84a7770854ebaef59ee1
(cherry picked from commit 78d52e8)
@awgreene @tmshort
Enable http2 DOS mitigations for unauthenticated clients
a708558 
Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Signed-off-by: Todd Short <todd.short@me.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 3385102efb91b27ce0b7ae01d6e94a7fa9b7938b
(cherry picked from commit d28f924)
@awgreene @tmshort
Generate Manifests
18a181e 
Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Signed-off-by: Todd Short <todd.short@me.com>

(cherry picked from commit 57881c3)
@awgreene @tmshort
Use generated namespaces in e2e tests
706083d 
This commit updates all of OLM e2e test suites to generate a namespace
rather than using a hard coded test namespace passed into the test as a
parameter. The motivation for this change include:
1. Decreasing the opportunity for tests to influence each other. Tests
   are not guaranteed to cleanup after themselves and may influence the
   results of other tests.
2. Some distributions of OLM run alongside other controllers which may
   revert changes to resources in predetermined namespaces.

Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Signed-off-by: Todd Short <todd.short@me.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 108d6db0d11d5224214904c02e91391b0aada286
(cherry picked from commit 0ac3add)
@awgreene @tmshort
Add test comment back
947d546 
This commit reintroduces test documentation accidentally removed in
operator-framework/operator-lifecycle-manager#3042

Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Signed-off-by: Todd Short <todd.short@me.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 543167908548535a76635659659b42272a949adc
(cherry picked from commit 6eb08f5)
@dtfranz @tmshort
Fixing flake tests so they don't fail 100% of the time.
cb45b98 
E2E tests were updated recently to use a generated namespace with an OperatorGroup created from the beginning of each test. However some of the tests were not updated to reflect this and were still creating and deleting resources in an additional namespace, or began to fail because the test environment required that no OperatorGroups exist from the beginning of the test.

This commit addresses two tests that have been failing at a rate of 100% due to the issues stated above.

Signed-off-by: Daniel Franz <dfranz@redhat.com>
Signed-off-by: Todd Short <todd.short@me.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 91b5762a982cd8640ff2b18f8bc222f55f9a047b
(cherry picked from commit cc9240e)
@tmshort
Copy link
Contributor Author

tmshort commented Jan 17, 2024

/test

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 17, 2024

@tmshort: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test e2e-gcp-console-olm
  • /test e2e-gcp-olm
  • /test e2e-gcp-ovn
  • /test e2e-upgrade
  • /test images
  • /test periodics-images
  • /test unit-api
  • /test unit-olm
  • /test unit-psm
  • /test unit-registry
  • /test verify

The following commands are available to trigger optional jobs:

  • /test e2e-gcp-olm-flaky

Use /test all to run all jobs.

In response to this:

/test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tmshort
Copy link
Contributor Author

tmshort commented Jan 17, 2024

/test all

@tmshort
Copy link
Contributor Author

tmshort commented Jan 18, 2024

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 18, 2024
@tmshort tmshort changed the title Release 4.12 fix testing OCPBUGS-24619: Update to latest k8s v0.25.15 API server and enable HTTP/2 DoS mitigations Jan 18, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 18, 2024
@tmshort tmshort marked this pull request as ready for review January 18, 2024 14:39
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jan 18, 2024
@openshift-ci-robot
Copy link

@tmshort: This pull request references Jira Issue OCPBUGS-24619, which is invalid:

  • expected Jira Issue OCPBUGS-24619 to depend on a bug targeting a version in 4.13.0, 4.13.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 18, 2024
@tmshort
Copy link
Contributor Author

tmshort commented Jan 18, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jan 18, 2024
@openshift-ci-robot
Copy link

@tmshort: This pull request references Jira Issue OCPBUGS-24619, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.12.z) matches configured target version for branch (4.12.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-20815 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-20815 targets the "4.13.z" version, which is one of the valid target versions: 4.13.0, 4.13.z
  • bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jan 18, 2024
@grokspawn
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2024
@tmshort
Copy link
Contributor Author

tmshort commented Jan 18, 2024

/test e2e-gcp-olm

@joelanford
Copy link
Member

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 18, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 18, 2024

@tmshort: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@Xia-Zhao-rh
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 19, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 4b287bd into openshift:release-4.12 Jan 19, 2024
13 checks passed
@openshift-ci-robot
Copy link

@tmshort: Jira Issue OCPBUGS-24619: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-24619 has been moved to the MODIFIED state.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@tmshort tmshort deleted the release-4.12-fix branch January 19, 2024 14:56
@tmshort tmshort mentioned this pull request Jan 19, 2024
Merged
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.12.0-202401190520.p0.g4b287bd.assembly.stream for distgit operator-lifecycle-manager.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.12.0-0.nightly-2024-01-20-172754

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anik120 anik120 Awaiting requested review from anik120

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

@jianzhangbjz jianzhangbjz Awaiting requested review from jianzhangbjz

@ankitathomas ankitathomas Awaiting requested review from ankitathomas

Assignees

@bandrade bandrade

@jianzhangbjz jianzhangbjz

@emmajiafan emmajiafan

@kuiwang02 kuiwang02

@Xia-Zhao-rh Xia-Zhao-rh

@KeenonLee KeenonLee

@grokspawn grokspawn

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet