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

Fix proxy configuration for airgapped environments #7913

Merged
merged 1 commit into from
Mar 29, 2024

Conversation

ahreehong
Copy link
Member

Description of changes:
The CNI reconciler fails to generate cilium manifests in an airgapped environment because it tries to fetch the image from public.ecr.aws instead of through the proxy. This is due to the proxy configuration not being passed when constructing an instance of the HelmClient in the controller.

This PR adds the proxyConfiguration as an option when building the HelmClient

Testing (if applicable):

  • Tested manually by creating a vsphere cluster in a simulated airgapped environment and creating a cluster using proxy configuration
  • Created new e2e tests for vsphere and cloudstack that tests a create flow using proxy in an airgapped environment.

Documentation added/planned (if applicable):

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 29, 2024
Copy link

codecov bot commented Mar 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 73.47%. Comparing base (6939bfa) to head (3f70625).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #7913   +/-   ##
=======================================
  Coverage   73.46%   73.47%           
=======================================
  Files         577      577           
  Lines       35744    35745    +1     
=======================================
+ Hits        26261    26262    +1     
  Misses       7826     7826           
  Partials     1657     1657           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -39,6 +39,21 @@ func runAirgapConfigFlow(test *framework.ClusterE2ETest, localCIDRs string) {
test.DeleteCluster()
}

// runAirgapConfigProxyFlow run airgap deployment but allow bootstrap cluster to access local peers.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// runAirgapConfigProxyFlow run airgap deployment but allow bootstrap cluster to access local peers.
// runAirgapConfigProxyFlow runs air-gap deployment workflow with allowing bootstrap cluster to access local peers.

Copy link
Member

Choose a reason for hiding this comment

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

lets update the function comment for both runAirgapConfigProxyFlow and runAirgapConfigFlow, clarifying what the flow does in details for each case.

@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

@ahreehong
Copy link
Member Author

/cherry-pick release-0.19

@eks-distro-pr-bot
Copy link
Contributor

@ahreehong: once the present PR merges, I will cherry-pick it on top of release-0.19 in a new PR and assign it to you.

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.

@eks-distro-bot eks-distro-bot merged commit 0a31b11 into aws:main Mar 29, 2024
10 checks passed
@eks-distro-pr-bot
Copy link
Contributor

@ahreehong: new pull request created: #7914

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.

@ahreehong ahreehong mentioned this pull request Apr 10, 2024
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