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.

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

Add patch for insecure proxy support for helm #3046

Merged
merged 1 commit into from
Apr 1, 2024

Conversation

ahreehong
Copy link
Member

@ahreehong ahreehong commented Apr 1, 2024

Issue #, if available:

Description of changes:
We removed our patches adding support for the flag --insecure-skip-tls-verify, as the functionality had been added to upstream helm. However, upstream has a bug when using proxy with the --insecure-skip-tls-verify flag so the helm commands fails.

This PR adds a patch to fix this bug

Testing
Manually ran helm commands with the --insecure-skip-tls-verify flag with proxy and verified the commands work.
Built EKS-A controller to use the patched helm and verified cluster creation worked.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 1, 2024
@ahreehong ahreehong force-pushed the helm-proxy-patch branch 2 times, most recently from b33423e to 2e1639d Compare April 1, 2024 18:15
@eks-distro-bot eks-distro-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 1, 2024
@ahreehong
Copy link
Member Author

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahreehong

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

@eks-distro-bot eks-distro-bot merged commit 20835f3 into aws:main Apr 1, 2024
2 checks passed
@ahreehong
Copy link
Member Author

/cherry-pick release-0.19

@eks-distro-pr-bot
Copy link
Contributor

@ahreehong: #3046 failed to apply on top of branch "release-0.19":

Applying: Add patch for insecure proxy support for helm
.git/rebase-apply/patch:41: space before tab in indent.
 			IdleConnTimeout:       90 * time.Second,
.git/rebase-apply/patch:42: space before tab in indent.
 			TLSHandshakeTimeout:   10 * time.Second,
.git/rebase-apply/patch:43: space before tab in indent.
 			ExpectContinueTimeout: 1 * time.Second,
.git/rebase-apply/patch:45: space before tab in indent.
 		}
.git/rebase-apply/patch:46: space before tab in indent.
 	})
warning: squelched 11 whitespace errors
warning: 16 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	projects/helm/helm/CHECKSUMS
Falling back to patching base and 3-way merge...
Auto-merging projects/helm/helm/CHECKSUMS
CONFLICT (content): Merge conflict in projects/helm/helm/CHECKSUMS
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add patch for insecure proxy support for helm
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.19

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants