Merge pull request #3918 from rancher/staging-to-master

Staging to master
2026-09-26 13:08:11 +00:00 · 2022-03-31 22:01:55 +02:00
parent 02e8521dda 4697949241
commit d8f3fd0081
5 changed files with 61 additions and 3 deletions
@@ -40,7 +40,21 @@ You can override the primary color used throughout the UI with a custom color of

 ### Fixed Banners

+{{% tabs %}}
+{{% tab "Rancher before v2.6.4"  %}}
 Display a custom fixed banner in the header, footer, or both.
+{{% /tab %}}
+{{% tab "Rancher v2.6.4+" %}}
+Display a custom fixed banner in the header, footer, or both.
+
+As of Rancher v2.6.4, configuration of fixed banners has moved from the **Branding** tab to the **Banners** tab.
+
+To configure banner settings,
+
+1. Click **☰ > Global settings**.
+2. Click **Banners**.
+{{% /tab %}}
+{{% /tabs %}}

 # Custom Navigation Links

@@ -34,6 +34,11 @@ Choose the default security group or configure a security group.

 Please refer to [Amazon EC2 security group when using Node Driver]({{<baseurl>}}/rancher/v2.6/en/installation/requirements/ports/#rancher-aws-ec2-security-group) to see what rules are created in the `rancher-nodes` Security Group.

+---
+**_New in v2.6.4_**
+
+If you provide your own security group for an EC2 instance, please note that Rancher will not modify it. As such, you will be responsible for ensuring that your security group is set to allow the [necessary ports for Rancher to provision the instance]({{<baseurl>}}/rancher/v2.6/en/installation/requirements/ports/#ports-for-rancher-server-nodes-on-rke). For more information on controlling inbound and outbound traffic to EC2 instances with security groups, refer [here](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_SecurityGroups.html#WorkingWithSecurityGroups).
+
 ### Instance Options

 Configure the instances that will be created. Make sure you configure the correct **SSH User** for the configured AMI. It is possible that a selected region does not support the default instance type. In this scenario you must select an instance type that does exist, otherwise an error will occur stating the requested configuration is not supported.
@@ -74,11 +74,14 @@ To add a private CA for Helm Chart repositories:
    [...]
    ```

- **Git-based chart repositories**: It is not currently possible to add a private CA. For git-based chart repositories with a certificate signed by a private CA, you must disable TLS verification. Click **Edit YAML** for the chart repo, and add the key/value pair as follows: 
+- **Git-based chart repositories**: You must add a base64 encoded copy of the CA certificate in DER format to the spec.caBundle field of the chart repo, such as `openssl x509 -outform der -in ca.pem | base64 -w0`. Click **Edit YAML** for the chart repo and set, as in the following example:</br>
    ```
    [...]
    spec:
-      insecureSkipTLSVerify: true
+      caBundle:
+    MIIFXzCCA0egAwIBAgIUWNy8WrvSkgNzV0zdWRP79j9cVcEwDQYJKoZIhvcNAQELBQAwPzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRQwEgYDVQQKDAtNeU9yZywgSW5jLjENMAsGA1UEAwwEcm9vdDAeFw0yMTEyMTQwODMyMTdaFw0yNDEwMDMwODMyMT
+    ...
+    nDxZ/tNXt/WPJr/PgEB3hQdInDWYMg7vGO0Oz00G5kWg0sJ0ZTSoA10ZwdjIdGEeKlj1NlPyAqpQ+uDnmx6DW+zqfYtLnc/g6GuLLVPamraqN+gyU8CHwAWPNjZonFN9Vpg0PIk1I2zuOc4EHifoTAXSpnjfzfyAxCaZsnTptimlPFJJqAMj+FfDArGmr4=
    [...]
    ```
    
@@ -9,7 +9,7 @@ Once the infrastructure is ready, you can continue with setting up an RKE cluste

 First, you have to install Docker and setup the HTTP proxy on all three Linux nodes. For this perform the following steps on all three nodes.

-For convenience export the IP address and port of your proxy into an environment variable and set up the HTTP_PROXY variables for your current shell:
+For convenience, export the IP address and port of your proxy into an environment variable and set up the HTTP_PROXY variables for your current shell:

 ```
 export proxy_host="10.0.0.5:8888"
@@ -58,6 +58,24 @@ sudo systemctl daemon-reload
 sudo systemctl restart docker
 ```

+#### Air-gapped proxy
+
+_New in v2.6.4_
+
+You can now provision node driver clusters from an air-gapped cluster configured to use a proxy for outbound connections.
+
+In addition to setting the default rules for a proxy server, you will need to add additional rules, shown below, to provision node driver clusters from a proxied Rancher environment.
+
+You will configure your filepath according to your setup, e.g., `/etc/apt/apt.conf.d/proxy.conf`:
+
+```
+acl SSL_ports port 22
+acl SSL_ports port 2376
+
+acl Safe_ports port 22      # ssh
+acl Safe_ports port 2376    # docker port
+```
+
 ### Creating the RKE Cluster

 You need several command line tools on the host where you have SSH access to the Linux nodes to create and interact with the cluster:
@@ -40,3 +40,21 @@ docker run -d --restart=unless-stopped \
 ```

 Privileged access is [required.]({{<baseurl>}}/rancher/v2.6/en/installation/other-installation-methods/single-node-docker/#privileged-access-for-rancher)
+
+### Air-gapped proxy configuration
+
+_New in v2.6.4_
+
+You can now provision node driver clusters from an air-gapped cluster configured to use a proxy for outbound connections.
+
+In addition to setting the default rules for a proxy server as shown above, you will need to add additional rules, shown below, to provision node driver clusters from a proxied Rancher environment.
+
+You will configure your filepath according to your setup, e.g., `/etc/apt/apt.conf.d/proxy.conf`:
+
+```
+acl SSL_ports port 22
+acl SSL_ports port 2376
+
+acl Safe_ports port 22      # ssh
+acl Safe_ports port 2376    # docker port
+```