Merge pull request #171 from f5devcentral/develop

gregcoward · web-flow · commit dc0b472db73a · 2026-05-21T17:23:25.000-07:00
update ip addressing in documentation
diff --git a/docs/class1/class1.rst b/docs/class1/class1.rst
@@ -22,11 +22,11 @@ We will leverage the following setup to configure the Kubernetes environment.
    * - **Hostname**
      - **IP-ADDR**
      - **Credentials**
-   * - ocp-provisioner
-     - 10.1.1.4
-     - ubuntu/HelloUDF
+   * - superjump
+     - 10.1.1.6
+     - ubuntu/ubuntu
    * - bigip1
-     - 10.1.1.5
+     - 10.1.1.4
      - admin/F5site02@
    * - kube-master1
      - 10.1.1.11
diff --git a/docs/class1/kubernetes/cluster-deployment.yaml b/docs/class1/kubernetes/cluster-deployment.yaml
@@ -34,7 +34,7 @@ spec:
           args: [
             "--bigip-username=$(BIGIP_USERNAME)",
             "--bigip-password=$(BIGIP_PASSWORD)",
-            "--bigip-url=10.1.1.5",
+            "--bigip-url=10.1.1.4",
             "--insecure=true",
             "--bigip-partition=kubernetes",
             "--pool-member-type=cluster",
diff --git a/docs/class1/kubernetes/configmap-hello-world.yaml b/docs/class1/kubernetes/configmap-hello-world.yaml
@@ -24,7 +24,7 @@ data:
                     "serviceMain": {
                         "class": "Service_HTTP",
                         "virtualAddresses": [
-                            "10.1.10.101"
+                            "10.1.1.4"
                         ],
                         "pool": "web_pool",
                         "virtualPort": 80
diff --git a/docs/class1/kubernetes/ingresslink/ingresslink-deployment.yaml b/docs/class1/kubernetes/ingresslink/ingresslink-deployment.yaml
@@ -34,7 +34,7 @@ spec:
           args: [
             "--bigip-username=$(BIGIP_USERNAME)",
             "--bigip-password=$(BIGIP_PASSWORD)",
-            "--bigip-url=10.1.1.5",
+            "--bigip-url=10.1.1.4",
             "--insecure=true",
             "--custom-resource-mode=true",
             "--bigip-partition=kubernetes",
diff --git a/docs/class1/kubernetes/ingresslink/vs-ingresslink.yaml b/docs/class1/kubernetes/ingresslink/vs-ingresslink.yaml
@@ -4,7 +4,7 @@ metadata:
   name: vs-ingresslink
   namespace: nginx-ingress
 spec:
-  virtualServerAddress: "10.1.10.101"
+  virtualServerAddress: "10.1.1.4"
   iRules:
     - /Common/Proxy_Protocol_iRule
   selector:
diff --git a/docs/class1/kubernetes/nodeport-deployment.yaml b/docs/class1/kubernetes/nodeport-deployment.yaml
@@ -21,7 +21,7 @@ spec:
         - args:
             - --bigip-username=$(BIGIP_USERNAME)
             - --bigip-password=$(BIGIP_PASSWORD)
-            - --bigip-url=10.1.1.5
+            - --bigip-url=10.1.1.4
             - --bigip-partition=kubernetes
             - --pool-member-type=nodeport
             - --insecure=true
diff --git a/docs/class1/module1/lab2.rst b/docs/class1/module1/lab2.rst
@@ -122,8 +122,8 @@ required files and launch them.
    .. warning:: Don't forget to select the "kubernetes" partition or you'll
       see nothing.
 
-   Here you can see a new Virtual Server, "ingress_10.1.10.101_80" was created,
-   listening on 10.1.10.101:80 in partition "kubernetes".
+   Here you can see a new Virtual Server, "ingress_10-1-1-4_80" was created,
+   listening on 10.1.1.4:80 in partition "kubernetes".
 
    .. image:: ../images/f5-container-connector-check-app-ingress.png
 
@@ -149,7 +149,7 @@ required files and launch them.
    .. image:: ../images/udffirefox.png
 
 #. The *Firefox* application installed on the ocp-provisioner system's will appear in your browser (i.e., a *browser-in-a-browser*).
-   Find and click on the "**Hello, World**" bookmark/shortcut, or type http://10.1.10.101 in the appropriate URL field.
+   Find and click on the "**Hello, World**" bookmark/shortcut, or type http://10.1.1.4 in the appropriate URL field.
 
    .. image:: ../images/ffhelloworld.png
 
diff --git a/docs/class1/module1/lab3.rst b/docs/class1/module1/lab3.rst
@@ -118,7 +118,7 @@ required files and launch them.
    Browse to :menuselection:`Local Traffic --> Virtual Servers`
 
    Here you can see a new Virtual Server, "**serviceMain**" was created,
-   listening on **10.1.10.101:80** in partition "**AS3**".
+   listening on **10.1.1.4:80** in partition "**AS3**".
 
    .. image:: ../images/f5-container-connector-check-app-bigipconfig-as3.png
 
@@ -134,7 +134,7 @@ required files and launch them.
 
 #. Access your web application via **Firefox** on the **ocp-provisioner**.
 
-   .. note:: Select the "Hello, World" shortcut or type http://10.1.10.101 in the
+   .. note:: Select the "Hello, World" shortcut or type http://10.1.1.4 in the
       URL field.
 
    .. image:: ../images/f5-container-connector-access-app.png
diff --git a/docs/class1/module2/lab1.rst b/docs/class1/module2/lab1.rst
@@ -42,7 +42,7 @@ To do so we'll need to configure BIG-IP first.
 
    .. code-block:: bash
 
-      ssh admin@10.1.1.5 tmsh create auth partition kubernetes
+      ssh admin@10.1.1.4 tmsh create auth partition kubernetes
 
 #. Install AS3 via the management console
 
@@ -64,15 +64,15 @@ To do so we'll need to configure BIG-IP first.
 
    .. code-block:: bash
 
-      ssh admin@10.1.1.5 tmsh create net tunnels vxlan fl-vxlan { app-service none port 8472 flooding-type none }
+      ssh admin@10.1.1.4 tmsh create net tunnels vxlan fl-vxlan { app-service none port 8472 flooding-type none }
 
 #. Create a vxlan tunnel.
 
    - Browse to: :menuselection:`Network --> Tunnels --> Tunnel List`
    - Create a new tunnel called "**fl-tunnel**"
    - Set the Profile to the one previously created called "**fl-vxlan**"
    - set the Key = **1**
-   - Set the Local Address to **10.1.10.101**
+   - Set the Local Address to **10.1.1.4**
    - Click **Finished**
 
    .. image:: ../images/create-fl-vxlan-tunnel.png
@@ -81,7 +81,7 @@ To do so we'll need to configure BIG-IP first.
 
    .. code-block:: bash
 
-      ssh admin@10.1.1.5 tmsh create net tunnels tunnel fl-tunnel { app-service none key 1 local-address 10.1.10.101 profile fl-vxlan }
+      ssh admin@10.1.1.4 tmsh create net tunnels tunnel fl-tunnel { app-service none key 1 local-address 10.1.1.4 profile fl-vxlan }
 
 #. Create the vxlan tunnel self-ip
 
@@ -111,7 +111,17 @@ To do so we'll need to configure BIG-IP first.
 
    .. code-block:: bash
 
-      ssh admin@10.1.1.5 tmsh create net self fl-vxlan-selfip { address 10.42.20.1/16 vlan fl-tunnel allow-service all }
+      ssh admin@10.1.1.4 tmsh create net self fl-vxlan-selfip { address 10.42.20.1/16 vlan fl-tunnel allow-service all }
+
+#. Create route to Flannel network
+
+   - Browse to: :menuselection:`Network --> Routes`
+   - Create a new route called "**flannel_route**"
+   - Set the Destination to "**10.244.0.0**"
+   - Set the Netmask to "**255.255.0.0**"
+   - Set the Resource to "Use VLAN / Tunnle"
+   - Set the VLAN / Tunnel to "**fl-tunnel**" (*Created earlier*)
+   - Click **Finished**
 
 CIS Deployment
 --------------
@@ -149,7 +159,7 @@ CIS Deployment
 
    .. code-block:: bash
 
-      ssh admin@10.1.1.5 tmsh show net tunnels tunnel fl-tunnel all-properties
+      ssh admin@10.1.1.4 tmsh show net tunnels tunnel fl-tunnel all-properties
 
    .. image:: ../images/get-fl-tunnel-mac-addr.png
 
@@ -159,7 +169,7 @@ CIS Deployment
 
       .. code-block:: bash
          
-         ssh admin@10.1.1.5 tmsh show net tunnels tunnel fl-tunnel all-properties | grep MAC | cut -c 33-51
+         ssh admin@10.1.1.4 tmsh show net tunnels tunnel fl-tunnel all-properties | grep MAC | cut -c 33-51
 
 #. In the Web Shell window (*command line of kube-master1*), edit the **bigip-node.yaml**
    file to change the highlighted MAC address with the MAC address copied from the previous step.
diff --git a/docs/class1/module2/lab2.rst b/docs/class1/module2/lab2.rst
@@ -85,8 +85,8 @@ On **kube-master1** we will create all the required files:
    .. warning:: Don't forget to select the "kubernetes" partition or you'll
       see nothing.
 
-   Here you can see a new Virtual Server, "**ingress_10.1.10.101_80**" was created,
-   listening on **10.1.10.101:80** in partition "**kubernetes**".
+   Here you can see a new Virtual Server, "**ingress_10.1.1.4_80**" was created,
+   listening on **10.1.1.4:80** in partition "**kubernetes**".
 
    .. image:: ../images/f5-container-connector-check-app-ingress2.png
 
@@ -100,9 +100,9 @@ On **kube-master1** we will create all the required files:
    .. note:: You can see that the pool members IP addresses are assigned from
       the overlay network (**ClusterIP mode**)
 
-#. Access your web application via **Firefox** on the **ocp-provioner**.
+#. Access your web application via **Firefox** on the **superjump**.
 
-   .. note:: Select the "Hello, World" shortcut or type http://10.1.10.101 in the
+   .. note:: Select the "Hello, World" shortcut or type http://10.1.1.4 in the
       URL field.
 
    .. image:: ../images/f5-container-connector-access-app.png
diff --git a/docs/class1/module2/lab3.rst b/docs/class1/module2/lab3.rst
@@ -78,7 +78,7 @@ On **kube-master1** we will create all the required files:
    Browse to: :menuselection:`Local Traffic --> Virtual Servers`
 
    Here you can see a new Virtual Server, "**serviceMain**" was created,
-   listening on **10.1.10.101:80** in partition "*AS3*".
+   listening on **10.1.1.4:80** in partition "*AS3*".
 
    .. image:: ../images/f5-container-connector-check-app-bigipconfig-as3.png
 
@@ -92,9 +92,9 @@ On **kube-master1** we will create all the required files:
    .. note:: You can see that the pool members IP addresses are assigned from
       the overlay network (**ClusterIP mode**)
 
-#. Access your web application via **Firefox** on the **ocp-provisioner**.
+#. Access your web application via **Firefox** on the **superjump**.
 
-   .. note:: Select the "**Hello, World**" shortcut or type **http://10.1.10.101** in the
+   .. note:: Select the "**Hello, World**" shortcut or type **http://10.1.1.4** in the
       URL field.
 
    .. image:: ../images/f5-container-connector-access-app.png
diff --git a/docs/class1/module3/lab1.rst b/docs/class1/module3/lab1.rst
@@ -178,7 +178,7 @@ the NGINX Ingress Controller.
 Access NGINX From Outside the Cluster
 -------------------------------------
 
-#. Go back to your UDF **ocp-provisioner -> Firefox** access window and "browse" to
+#. Go back to your UDF **superjump -> Firefox** access window and "browse" to
    the *kube-master1*'s internal host IP address (10.1.1.11) with the previously recorded port.
    For example: 
 
diff --git a/docs/class1/module3/lab2.rst b/docs/class1/module3/lab2.rst
@@ -174,7 +174,7 @@ two files, a service and configmap.
    .. image:: ../images/f5-container-connector-check-app-bigipconfig-as3.png
 
    Here you can see a new Virtual Server, "**serviceMain**" was created,
-   listening on **10.1.10.101:80** in partition "**AS3**".
+   listening on **10.1.1.4:80** in partition "**AS3**".
 
 #. Check the Pools to see a new pool and the associated pool members.
 
diff --git a/docs/class1/module4/lab1.rst b/docs/class1/module4/lab1.rst
@@ -148,7 +148,7 @@ Create an IngressLink Resource
 #. Inspect the IngressLink resource
 
    .. attention:: Ensure the IP ADDR in the IngressLink resource matches the
-      required IP. In this lab we're using 10.1.10.101 as the virtual IP. This
+      required IP. In this lab we're using 10.1.1.4 as the virtual IP. This
       IP ADDR will be used to configure the BIG-IP device to load balance the
       Ingress Controller resources.
 
@@ -193,8 +193,8 @@ Create an IngressLink Resource
    .. warning:: Don't forget to select the "kubernetes" partition or you'll
    see nothing.
 
-   Here you can see two new Virtual Servers, "**ingress_link_crd_10.1.10.101_80**" and
-   "**ingress_link_crd_10.1.10.101_443**" was created, in partition "**kubernetes**".
+   Here you can see two new Virtual Servers, "**ingress_link_crd_10_1_1_4_80**" and
+   "**ingress_link_crd_10_1_1_4_443**" was created, in partition "**kubernetes**".
 
    .. image:: ../images/ingress-link-vs.png
 
diff --git a/docs/class1/module4/lab2.rst b/docs/class1/module4/lab2.rst
@@ -35,14 +35,14 @@ Lab 4.2 - Deploy the Cafe Application
 Test the Application
 --------------------
 
-Now let's test access to the new web application "*through*"" **Firefox** on **ocp-provisioner**.
+Now let's test access to the new web application "*through*"" **Firefox** on **superjump**.
 
 #. Go back to the Firefox session you opened in a previous task. If you need to open a new session,
    browse back to the **Deployment** tab of your UDF lab session at
-   https://udf.f5.com and connect to **ocp-provisioner** using the **Firefox** access method.
+   https://udf.f5.com and connect to **superjump** using the **Firefox** access method.
 
    .. note:: The web application is not directly accessible from the public Internet.
-      But since the **ocp-provisioner** system is connected to the same internal virtual lab network 
+      But since the **superjump** system is connected to the same internal virtual lab network 
       we can use the **Firefox** access method because it provides *browser-in-a-browser*
       functionality that allows remote browsing to this new private web site.
 
diff --git a/docs/class2/class2.rst b/docs/class2/class2.rst
@@ -23,5 +23,5 @@ We will leverage the following setup to configure the OpenShift environment.
      - **IP-ADDR**
      - **Credentials**
    * - bigip1
-     - 10.1.1.5
+     - 10.1.1.4
      - admin/F5site02@
