Upstream rebase to 2.12.1 #22
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com>
Signed-off-by: Yoon Park <yoongon.park@gmail.com>
Signed-off-by: Indresh-Prakash <indreshprakash24@gmail.com>
… `msgBacklog` (kedacore#4736) Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>
Signed-off-by: dylan <dylan@channel.io>
Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>
Signed-off-by: spiritzhou <iammrzhouzhenghan@gmail.com> Signed-off-by: SpiritZhou <iammrzhouzhenghan@gmail.com> Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com> Co-authored-by: Tom Kerkhove <kerkhove.tom@gmail.com>
…edacore#4768) Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es>
…edacore#4774) Co-authored-by: Tom Kerkhove <kerkhove.tom@gmail.com>
Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> Signed-off-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>
…4707) Signed-off-by: Yoon Park <yoongon.park@gmail.com>
Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>
…acore#4839) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
joelsmith
force-pushed
the
rebase
branch
2 times, most recently
from
3a6340a to
9444f3e
Compare
|
/retest |
1 similar comment
|
/retest |
|
Strange... without the fix for /retest |
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
jkyros
reviewed
Mar 7, 2024
This is used by CPaaS where Cachito will make a cached copy of anything needed during the build so that an offline brew build can succeed.
* hack/cma-verify-history.sh: checks history to make sure to use rebasebot-friendly commit messages
* Allow privileged pods in OpenShift test namespaces The way the e2e test suite is set up, there are several pods that are to running with more privilege than our "restricted" SCC provides. Long-term I don't think there is anything in here that *requires* the privilege, but we'll need to do some testing and find out. In the mean time, this injects an adjusted pod admission policy into each test namespace via the centralized namespace creation helper function so that those privileged pods can run in the test namespaces. * Specify securityContext for privileged e2e pods The e2e test suite here is used to running in a "vanilla kube" environment that does not have OpenShift/OpenShift CI restrictions. This becomes a problem when one of the test containers attempts to do something privileged (like bind to a privileged port) and is denied. This just adds securityContexts to the pods that require privilege so that they can get assigned a proper SCC and successfully run. The securityContext addition is limited to only the tests that OpenShift runs (internal, sequential, cpu/memory/kafka scalers) because we haven't tested the others. * Allow e2e test image overrides for OpenShift CI The e2e test suite references multiple images spread across multiple public registries (ghcr.io,docker.io,k8s.io) and some of those registries have pull limits, which will cause our tests to fail. We also cache some of these upstream images in our CI system, and so it is beneficial to be able to reference our cached copy rather than have to pull it from "the internet" every time. Anyway, the way that the e2e tests are set up, all those images are hard-coded in each of the manifests, which are just vars that exist in each test's .go file. They are not templated. There is, however a central helper function that applies all these resources (using kubectl). So, in order for us to be able to override the image list for CI, this temporarily: - adds an image rewrite map that specifies replacement images for images we might have difficulty pulling - adds a helper function that will let those replacement images be specified by environment variables for use in CI until we can figure out a more elegant refactor. * Account for OpenShift CI in Prometheus build test There is a test in the prometheus sequential suite that checks the git commit hash of the current code and compares it to the containers running in the test to make sure that the test version matches the code version. This version is injected as GIT_COMMIT during the docker builds in the Makefile, but it does not get injected when the containers are build in OpenShift CI. I would like to find a way to inject it via CI, but until then we are supplying a dummy string "dummy-ci-commit-value" that is at least "yes you are running against a CI payload we built, and not one that you pulled from upstream". Eventually when we figure out how to make all the variables available in CI and inject them, this can go away because then the commits will match.
* Pull test container dockerfile out of CI and into keda repo Previously we were building the test container in CI from a dockerfile_literal, which was kind of hacky and more difficult to manage than it being here in the keda repo. This pulls that dockerfile out of CI and into a Dockerfile.tests which we now just reference from CI. * Add Makefile targets to makefile for OpenShift tests We kind of stuffed those tests into CI quick so we had something, and when we did we didn't heavily consider ergonomics. Now that we find ourselves having to enable additional tests for fixes and new features, it will be much easier in the long run if we can manage the test targets here in the repo so we don't have to put in a separate PR to the release repo to see if our changes work. This adds some e2e-test-openshift* makefile targets that we can point and whatever we need to, and once CI is updated, it can just call those targets, whatever they happen to entail. * Reenable CPU scaler test Now that we figured out how the CPU test was broken, we can add it back in to the testing since it's supported. This adds the cpu test into the e2e-test-openshift Makefile target, so when CI calls it, it will run with the rest of the scaler tests
This excludes deps and tests from snyk scans to cut down on noise. This also excludes the tests/ directory as it contains some launcher .go files that don't end in _test.go, but are part of the testing suite and are not shipped with the final product.
…e/v2.12 branch instead of main Signed-off-by: Joel Smith <joelsmith@redhat.com>
Signed-off-by: Joel Smith <joelsmith@redhat.com>
The CPU scaler test assumes a default metrics window of 30s, so those testing on platforms where it is set to a larger value will potentially fail the CPU scaler test because the metrics won't be ready by the time the test starts. This: - Adds a helper that waits for either the metrics to show up in the HPA, or for some amount of time to pass, whichever happens first - Uses said helper to ensure that the metrics are ready before the CPU test starts testing scaling Signed-off-by: John Kyros <jkyros@redhat.com>
Signed-off-by: Joel Smith <joelsmith@redhat.com>
|
looks good! |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jkyros, joelsmith 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 |
|
@joelsmith: 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. |
|
Upstream e2e test fix merged. |
openshift-ci
bot
removed
the
do-not-merge/hold
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cd .rebase.ci-operator.yamland squash into existing carry commitOWNERS, squash where appropriateThe new upstream version brings in optional support for opentelemetry metrics, which we don't use. Two additional PRs on the main branch were cherry-picked here (
UPSTREAM: 5436: Add ENABLE_OPENTELEMETRY flagandUPSTREAM: 5578: e2e: Fix e2e test in non-opentelemetry case) to make that new feature default-disabled so that the opentelemetry e2e test can pass.