-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for proxy servers (#676)
* Add Proxy support for Embedded Cluster --------- Co-authored-by: Ricardo Maraschini <ricardo.maraschini@gmail.com> Co-authored-by: Andrew Lavery <laverya@umich.edu>
- Loading branch information
3 people
authored
Jun 17, 2024
1 parent
819d94a
commit 80a3425
Showing
17 changed files
with
471 additions
and
63 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "github.com/replicatedhq/embedded-cluster/pkg/helpers" | ||
| ) | ||
|
|
||
| // createSystemdUnitFiles links the k0s systemd unit file. this also creates a new | ||
| // systemd unit file for the local artifact mirror service. | ||
| func createSystemdUnitFiles(isWorker bool, proxy *Proxy) error { | ||
| dst := systemdUnitFileName() | ||
| if _, err := os.Lstat(dst); err == nil { | ||
| if err := os.Remove(dst); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| src := "/etc/systemd/system/k0scontroller.service" | ||
| if isWorker { | ||
| src = "/etc/systemd/system/k0sworker.service" | ||
| } | ||
| if proxy != nil { | ||
| ensureProxyConfig(fmt.Sprintf("%s.d", src), proxy.HTTPProxy, proxy.HTTPSProxy, proxy.NoProxy) | ||
| } | ||
| if err := os.Symlink(src, dst); err != nil { | ||
| return fmt.Errorf("failed to create symlink: %w", err) | ||
| } | ||
|
|
||
| if _, err := helpers.RunCommand("systemctl", "daemon-reload"); err != nil { | ||
| return fmt.Errorf("unable to get reload systemctl daemon: %w", err) | ||
| } | ||
| return installAndEnableLocalArtifactMirror() | ||
| } | ||
|
|
||
| // ensureProxyConfig creates a new http-proxy.conf configuration file. The file is saved in the | ||
| // systemd directory (/etc/systemd/system/k0scontroller.service.d/). | ||
| func ensureProxyConfig(servicePath string, httpProxy string, httpsProxy string, noProxy string) error { | ||
| // create the directory | ||
| if err := os.MkdirAll(servicePath, 0755); err != nil { | ||
| return fmt.Errorf("unable to create directory: %w", err) | ||
| } | ||
|
|
||
| // create the file | ||
| fp, err := os.OpenFile(filepath.Join(servicePath, "http-proxy.conf"), os.O_RDWR|os.O_CREATE, 0644) | ||
| if err != nil { | ||
| return fmt.Errorf("unable to create proxy file: %w", err) | ||
| } | ||
| defer fp.Close() | ||
|
|
||
| // write the file | ||
| if _, err := fp.WriteString(fmt.Sprintf(`[Service] | ||
| Environment="HTTP_PROXY=%s" | ||
| Environment="HTTPS_PROXY=%s" | ||
| Environment="NO_PROXY=%s"`, | ||
| httpProxy, httpsProxy, noProxy)); err != nil { | ||
| return fmt.Errorf("unable to write proxy file: %w", err) | ||
| } | ||
|
|
||
| return nil | ||
| } |
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
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
Oops, something went wrong.