diff --git a/docs/reference/embedded-cluster-install.mdx b/docs/reference/embedded-cluster-install.mdx
index 22541ff058..8164a52702 100644
--- a/docs/reference/embedded-cluster-install.mdx
+++ b/docs/reference/embedded-cluster-install.mdx
@@ -70,11 +70,11 @@ sudo ./APP_SLUG install --license LICENSE_FILE [flags]
`--no-proxy` |
Comma-separated list of hosts for which not to use a proxy.
- For single-node installations, pass the IP address of the node where you are installing. For multi-node installations, when deploying the first node, pass the list of IP addresses for all nodes in the cluster (typically in CIDR notation).
+ For single-node installations, pass the IP address of the node where you are installing. For multi-node installations, when deploying the first node, pass the list of IP addresses for all nodes in the cluster (typically in CIDR notation). The network interface's subnet will automatically be added to the no-proxy list if the node's IP address is not already included.
The following are never proxied:
- Internal cluster communication (`localhost`, `127.0.0.1`, `.cluster.local`, `.svc`)
- - The CIDRs used for assigning IPs to Kubernetes Pods and Services. By default, the Pod CIDR is `10.244.0.0/16` and the Service CIDR `10.96.0.0/12`. For information about how to change these defaults, see [Set IP Address Ranges for Pods and Services](#set-ip-address-ranges-for-pods-and-services).
+ - The CIDR block used for assigning IPs to Kubernetes Pods and Services. By default, the CIDR block is `10.244.0.0/16`. For information about how to change this default, see [Set IP Address Range for Pods and Services](#set-ip-address-range-for-pods-and-services).
To ensure your application's internal cluster communication is not proxied, use fully qualified domain names like `my-service.my-namespace.svc` or `my-service.my-namespace.svc.cluster.local`.
@@ -82,17 +82,9 @@ sudo ./APP_SLUG install --license LICENSE_FILE [flags]
|
- | `--pod-cidr` |
+ `--cidr` |
- The range of IP addresses that can be assigned to Pods, in CIDR notation. **Default:** By default, the Pod CIDR is `10.244.0.0/16`.
- **Limitation:** The `--pod-cidr` flag is not supported on Red Hat Enterprise Linux (RHEL) 9 operating systems.
- |
-
-
- | `--service-cidr` |
-
- The range of IP addresses that can be assigned to Services, in CIDR notation. **Default:** By default, the Service CIDR is `10.96.0.0/12`.
- **Limitation:** The `--service-cidr` flags is not supported on Red Hat Enterprise Linux (RHEL) 9 operating systems.
+ The range of IP addresses that can be assigned to Pods and Services, in CIDR notation. **Default:** By default, the CIDR block is `10.244.0.0/16`.
|
@@ -130,8 +122,8 @@ Where:
* `HOST:PORT` is the host and port of the proxy server
* `LIST_OF_HOSTS` is the list of hosts to not proxy. For example, the IP address of the node where you are installing. Or, for multi-node clusters, the list of IP addresses for all nodes in the cluster, typically in CIDR notation.
-### Set IP Address Range for Pods
+### Set IP Address Range for Pods and Services
```bash
-sudo ./my-app install --license license.yaml --pod-cidr 172.16.136.0/16
-```
\ No newline at end of file
+sudo ./my-app install --license license.yaml --cidr 172.16.136.0/16
+```
diff --git a/docs/release-notes/rn-app-manager.md b/docs/release-notes/rn-app-manager.md
index 0c0ff4f656..f72e7eca96 100644
--- a/docs/release-notes/rn-app-manager.md
+++ b/docs/release-notes/rn-app-manager.md
@@ -25,6 +25,7 @@ Released on October 22, 2024
Support for Kubernetes: 1.29, 1.30, and 1.31
### Bug Fixes {#bug-fixes-1-119-1}
+
* Fixes an issue where proxy settings was removed when upgrading the Admin Console with `kubectl kots admin-console upgrade`.
* Fixes an issue where `--strict-security-context` was removed when upgrading the Admin Console with `kubectl kots admin-console upgrade`.
diff --git a/docs/vendor/embedded-disaster-recovery.mdx b/docs/vendor/embedded-disaster-recovery.mdx
index ab048853ba..c76016b431 100644
--- a/docs/vendor/embedded-disaster-recovery.mdx
+++ b/docs/vendor/embedded-disaster-recovery.mdx
@@ -142,7 +142,7 @@ To restore from a backup:
* If the installation is behind a proxy, the same proxy settings provided during install must be provided to the restore command using `--http-proxy`, `--https-proxy`, and `--no-proxy`. For more information, see [Install Behind a Proxy](/enterprise/installing-embedded#proxy).
- * If the `--pod-cidr` and `--service-cidr` flags were used during install to the set IP address ranges for Pods and Services, these flags must be provided with the same CIDRs during the restore. If these flags are not provided or are provided with different CIDRs, the restore will fail with an error message telling you to rerun with the appropriate flags and values. However, it will take some time before that error occurs. For more information, see [Set IP Address Ranges for Pods and Services](/enterprise/installing-embedded#set-ip-address-ranges-for-pods-and-services).
+ * If the `--cidr` flag was used during install to the set IP address ranges for Pods and Services, this flag must be provided with the same CIDR during the restore. If this flag is not provided or is provided with a different CIDR, the restore will fail with an error message telling you to rerun with the appropriate value. However, it will take some time before that error occurs. For more information, see [Set IP Address Ranges for Pods and Services](/enterprise/installing-embedded#set-ip-address-ranges-for-pods-and-services).
* If the `--local-artifact-mirror-port` flag was used during install to change the port for the Local Artifact Mirror (LAM), you can optionally use the `--local-artifact-mirror-port` flag to choose a different LAM port during restore. For example, `restore --local-artifact-mirror-port=50000`. If no LAM port is provided during restore, the LAM port that was supplied during installation will be used. For more information, see [Change Admin Console and LAM Ports](/enterprise/installing-embedded#adm-lam-ports).