[v1.16.1] sync with upstream #37
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: Tim Ramlot <[email protected]>
…ance_tests Simplify CertificateSigningRequest conformance tests and add missing tests
…ld_metrics Add process and go runtime metrics for controller
Signed-off-by: Tim Ramlot <[email protected]>
Fix Venafi conformance test
Signed-off-by: Tim Ramlot <[email protected]>
Signed-off-by: Tim Ramlot <[email protected]>
Signed-off-by: Tim Ramlot <[email protected]>
Signed-off-by: Tim Ramlot <[email protected]>
Signed-off-by: Tim Ramlot <[email protected]>
…ure/5514-venafi-issuer-ca-ref-support Feature/5514 - Add SecretRef support for venafi TPP issuer CA Bundle
Refactor Certificate conformance to tabular tests
Signed-off-by: cert-manager-bot <[email protected]>
Signed-off-by: Tim Ramlot <[email protected]>
…aster [CI] Merge self-upgrade-master into master
Previously, E2E_EXISTING_CHART=true E2E_CERT_MANAGER_VERSION=1.14.2 make e2e-setup-certmanager would fail with the error: Error: unknown flag: --version1.14.2 Signed-off-by: Maël Valais <[email protected]>
…anager_version make e2e-setup-certmanager: E2E_CERT_MANAGER_VERSION now works
Signed-off-by: Ashley Davis <[email protected]>
Signed-off-by: Adam Talbot <[email protected]>
Bump go-retryablehttp to address CVE-2024-6104
…ault-config-apiversion-and-kind feat: default ControllerConfiguration apiVersion and kind in helm
…lpointer exception Signed-off-by: Tim Ramlot <[email protected]>
BUGFIX: Venafi issuer and clusterissuer checks were failing due to nilpointer exception
…set memory limit = request following best practice Signed-off-by: Tim Ramlot <[email protected]>
Since the actual duration is unknown until a cert has been issued, providing an absolute duration for renewBefore can result in accidental renewal loops. The new renewBeforePercentage field computes the effective renewBefore using the actual duration, allowing users to better express intent while maintaining backwards compatibility. Fixes cert-manager#4423, resolves cert-manager#5821 Signed-off-by: Christopher Broglie <[email protected]>
feat: Add renewBeforePercentage alternative to renewBefore
…quest_and_limit Tests: add bind resource request to improve availability during tests
Signed-off-by: Tim Ramlot <[email protected]>
Tests: use supported bind9 image and run as non-root
Signed-off-by: Yuedong Wu <[email protected]>
Route53 DNS01 Solver: Always fall back on the ambient region
By reducing the make parallelism. Signed-off-by: Richard Wall <[email protected]>
N1_HIGHCPU_32 is no longer listed in the table of supported GCB machine types, but there is the following foot note in the documentation: > Cloud Build continues to offer n1-highcpu-8 and n1-highcpu-32 machine types. They are offered at the same price as e2-highcpu-8 and e2-highcpu-32 https://cloud.google.com/build/pricing Signed-off-by: Richard Wall <[email protected]>
…k-7308-to-release-1.16 [release-1.16] Fix makestage OOM failures
…memory use of the cert-manager components by enabling the use of the WatchList (Streaming Lists) feature" Signed-off-by: Richard Wall <[email protected]>
…k-7315-to-release-1.16 [release-1.16] Revert "Reduce load on the Kubernetes API server and reduce the peak memory use of the cert-manager components by enabling the use of the WatchList (Streaming Lists) feature"
Signed-off-by: Richard Wall <[email protected]>
Signed-off-by: Richard Wall <[email protected]>
Signed-off-by: Richard Wall <[email protected]>
…k-7317-to-release-1.16 [release-1.16] Allow extra environment variables to be added to cainjector, webhook and startupapicheck
Signed-off-by: cert-manager-bot <[email protected]>
…k-7321-to-release-1.16 [release-1.16] [CI] Merge self-upgrade-master into master
Signed-off-by: Richard Wall <[email protected]>
…k-7323-to-release-1.16 [release-1.16] make update-base-images
Signed-off-by: Tim Ramlot <[email protected]>
Signed-off-by: Tim Ramlot <[email protected]>
…k-7339-to-release-1.16 [release-1.16] BUGFIX: use correct resource namespace for Cluster Issuers
…both string and integer values Signed-off-by: Tim Ramlot <[email protected]>
…k-7343-to-release-1.16 [release-1.16] BUGFIX: Update schema validation to accept both string and integer values
Signed-off-by: Tim Ramlot <[email protected]>
…elease-1.16 [CI] Merge self-upgrade-release-1.16 into release-1.16
Signed-off-by: jordanp <[email protected]>
…k-7351-to-release-1.16 [release-1.16] Helm chart: fix documentation for service accounts annotations
Signed-off-by: Tim Ramlot <[email protected]>
…k-7350-to-release-1.16 [release-1.16] Helm: add enabled to json schema
sclevine
approved these changes
Oct 16, 2024
|
If you merge upstream into our fork it produces a bit messy diff. For example, this is how our current fork diff against upstream looks like: It shows only our custom commits, so it makes it easy to find all the modifications we had to make. Tried from my side as well, but couldn't produce better diff as well. It actually looks OK in the file diff, just the commit history looks different. |
taraspos
approved these changes
Oct 17, 2024
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.
Merge
upstream/v1.16.1intoorigin/teleport. Validatedmake testandmake generate-allbehaviors.Had to resolve a few merge conflicts but they were all lock/license files for the most part.
Resulting diff vs upstream: cert-manager/cert-manager@v1.16.1...gravitational:cert-manager:mjsmith/v1.16.1-sync