Skip to content

Commit e0f9a83

Browse files
authored
Merge pull request #3709 from AkihiroSuda/de-deprecate-ssh-portfwd
De-deprecate LIMA_SSH_PORT_FORWARDER
2 parents b727b6e + a78393c commit e0f9a83

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

pkg/hostagent/hostagent.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ type HostAgent struct {
5353
instName string
5454
instSSHAddress string
5555
sshConfig *ssh.SSHConfig
56-
portForwarder *portForwarder // legacy SSH port forwarder (deprecated)
56+
portForwarder *portForwarder // legacy SSH port forwarder
5757
grpcPortForwarder *portfwd.Forwarder
5858

5959
onClose []func() error // LIFO
@@ -660,7 +660,6 @@ func (a *HostAgent) processGuestAgentEvents(ctx context.Context, client *guestag
660660
}
661661
}
662662
if useSSHFwd {
663-
logrus.Warn("LIMA_SSH_PORT_FORWARDER is deprecated")
664663
a.portForwarder.OnEvent(ctx, ev)
665664
} else {
666665
a.grpcPortForwarder.OnEvent(ctx, client, ev)

website/content/en/docs/config/environment-variables.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ This page documents the environment variables used in Lima.
7575
```sh
7676
export LIMA_SSH_PORT_FORWARDER=false
7777
```
78-
- **Note**: Deprecated since v1.1. It is expected that this variable will be removed in future.
7978
- **The history of the default value**:
8079
| Version | Default value |
8180
|---------------|---------------------|
@@ -170,4 +169,4 @@ This page documents the environment variables used in Lima.
170169
- **Usage**:
171170
```sh
172171
export QEMU_SYSTEM_X86_64=/usr/local/bin/qemu-system-x86_64
173-
```
172+
```

website/content/en/docs/releases/deprecated.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ The following features are deprecated:
88
- CentOS 7 support
99
- Loading non-strict YAMLs (i.e., YAMLs with unknown properties)
1010
- `limactl show-ssh` command (Use `ssh -F ~/.lima/default/ssh.config lima-default` instead)
11-
- `LIMA_SSH_PORT_FORWARDER=true` (since Lima v1.1)
1211
- Ansible provisioning mode (Use `ansible-playbook playbook.yaml` after the start instead)
1312

1413
## Removed features

0 commit comments

Comments
 (0)