Merge branch 'class4-api' into dev

f5devcentral · Nov 14, 2023 · 3cfbbad · 3cfbbad
2 parents c1fb935 + 6dac61a
commit 3cfbbad
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 6 deletions.
diff --git a/docs/_build/html/_static/js/data.js b/docs/_build/html/_static/js/data.js
@@ -163,15 +163,22 @@ function displayJSON(jsonInput, statusText) {
 
 document.addEventListener("DOMContentLoaded", function() {
     const data = JSON.parse(localStorage.getItem('data'))
+<<<<<<< HEAD
     const { makeId, hostArcadia, ceArcadia, namespace, ceOnPrem, awsSiteName, vk8sName, kubeconfig } = data;
+=======
+    const { makeId, hostArcadia, ceArcadia, namespace, ceOnPrem, awsSiteName, vk8sName } = data;
+>>>>>>> class4-api
     replacePlaceholderWithValue('makeId', makeId);
     replacePlaceholderWithValue('hostArcadia', hostArcadia);
     replacePlaceholderWithValue('ceArcadia', ceArcadia);
     replacePlaceholderWithValue('namespace', namespace);
     replacePlaceholderWithValue('ceOnPrem.clusterName', ceOnPrem.clusterName);
     replacePlaceholderWithValue('awsSiteName', awsSiteName);
     replacePlaceholderWithValue('vk8sName', vk8sName);
+<<<<<<< HEAD
     replacePlaceholderWithValue('kubeconfig', kubeconfig);
+=======
+>>>>>>> class4-api
     
     
   });
@@ -366,6 +373,7 @@ const lbConfig = ({
     }
 
     return config;
+<<<<<<< HEAD
 }
 
 function getStudentData(courseId) {
@@ -461,3 +469,6 @@ function getStudentData(courseId) {
 }
 
 
+=======
+}
+>>>>>>> class4-api
diff --git a/docs/_build/html/class1/class1.html b/docs/_build/html/class1/class1.html
@@ -14,7 +14,11 @@
   <meta name="title" content="Class 1 - F5 XC Services"/>
   <meta name="product" content="F5 XC EMEA Workshop"/>
   <meta name="version" content=""/>
+<<<<<<< HEAD
   <meta name="updated_date"  content="2023-11-09 10:24:45"/>
+=======
+  <meta name="updated_date"  content="2023-11-14 08:05:56"/>
+>>>>>>> class4-api
   <meta name="archived" content="Archived documents excluded"/>
   <meta name="doc_type" content="Manual"/>
   <meta name="lifecycle" content="release"/>
@@ -116,7 +120,10 @@ <h5>F5 XC EMEA Workshop  </h5>
 <li class="toctree-l1"><a class="reference internal" href="../class2/class2.html">Class 2 - Multi Cloud Networking</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../class3/class3.html">Class 3 - Virtual Kubernetes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../class4/class4.html">Class 4 - API Protection</a></li>
+<<<<<<< HEAD
 <li class="toctree-l1"><a class="reference internal" href="../class5/class5.html">Class 5 - F5 XC K8s - UNDER CONSTRUCTION</a></li>
+=======
+>>>>>>> class4-api
 </ul>
 
         </span><!-- Use this file to add extra links to the bottom of the ToC sidebar -->

diff --git a/docs/_build/html/class1/module1/lab1/lab1.html b/docs/_build/html/class1/module1/lab1/lab1.html
@@ -14,7 +14,11 @@
   <meta name="title" content="Lab 1 - Expose the application"/>
   <meta name="product" content="F5 XC EMEA Workshop"/>
   <meta name="version" content=""/>
+<<<<<<< HEAD
   <meta name="updated_date"  content="2023-11-02 12:02:51"/>
+=======
+  <meta name="updated_date"  content="2023-11-09 14:12:43"/>
+>>>>>>> class4-api
   <meta name="archived" content="Archived documents excluded"/>
   <meta name="doc_type" content="Manual"/>
   <meta name="lifecycle" content="release"/>

diff --git a/docs/_build/html/class1/module1/lab2/lab2.html b/docs/_build/html/class1/module1/lab2/lab2.html
@@ -14,7 +14,11 @@
   <meta name="title" content="Lab 2 - Testing and Visibility"/>
   <meta name="product" content="F5 XC EMEA Workshop"/>
   <meta name="version" content=""/>
+<<<<<<< HEAD
   <meta name="updated_date"  content="2023-11-02 12:02:51"/>
+=======
+  <meta name="updated_date"  content="2023-11-09 14:12:43"/>
+>>>>>>> class4-api
   <meta name="archived" content="Archived documents excluded"/>
   <meta name="doc_type" content="Manual"/>
   <meta name="lifecycle" content="release"/>

diff --git a/docs/_build/html/class1/module1/module1.html b/docs/_build/html/class1/module1/module1.html
@@ -14,7 +14,11 @@
   <meta name="title" content="Publish the application"/>
   <meta name="product" content="F5 XC EMEA Workshop"/>
   <meta name="version" content=""/>
+<<<<<<< HEAD
   <meta name="updated_date"  content="2023-11-09 10:24:45"/>
+=======
+  <meta name="updated_date"  content="2023-11-09 14:12:43"/>
+>>>>>>> class4-api
   <meta name="archived" content="Archived documents excluded"/>
   <meta name="doc_type" content="Manual"/>
   <meta name="lifecycle" content="release"/>
@@ -116,7 +120,10 @@ <h5>F5 XC EMEA Workshop  </h5>
 <li class="toctree-l1"><a class="reference internal" href="../../class2/class2.html">Class 2 - Multi Cloud Networking</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../../class3/class3.html">Class 3 - Virtual Kubernetes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../../class4/class4.html">Class 4 - API Protection</a></li>
+<<<<<<< HEAD
 <li class="toctree-l1"><a class="reference internal" href="../../class5/class5.html">Class 5 - F5 XC K8s - UNDER CONSTRUCTION</a></li>
+=======
+>>>>>>> class4-api
 </ul>
 
         </span><!-- Use this file to add extra links to the bottom of the ToC sidebar -->

diff --git a/docs/_build/html/class1/module2/lab1/lab1.html b/docs/_build/html/class1/module2/lab1/lab1.html
@@ -14,7 +14,11 @@
   <meta name="title" content="Lab 1 - Waf config"/>
   <meta name="product" content="F5 XC EMEA Workshop"/>
   <meta name="version" content=""/>
+<<<<<<< HEAD
   <meta name="updated_date"  content="2023-11-02 12:02:51"/>
+=======
+  <meta name="updated_date"  content="2023-11-09 14:12:43"/>
+>>>>>>> class4-api
   <meta name="archived" content="Archived documents excluded"/>
   <meta name="doc_type" content="Manual"/>
   <meta name="lifecycle" content="release"/>

diff --git a/docs/_build/html/class1/module2/lab2/lab2.html b/docs/_build/html/class1/module2/lab2/lab2.html
@@ -14,7 +14,11 @@
   <meta name="title" content="Lab 2 - Testing and Visibility"/>
   <meta name="product" content="F5 XC EMEA Workshop"/>
   <meta name="version" content=""/>
+<<<<<<< HEAD
   <meta name="updated_date"  content="2023-11-02 12:02:51"/>
+=======
+  <meta name="updated_date"  content="2023-11-09 14:12:43"/>
+>>>>>>> class4-api
   <meta name="archived" content="Archived documents excluded"/>
   <meta name="doc_type" content="Manual"/>
   <meta name="lifecycle" content="release"/>

diff --git a/docs/_build/html/class1/module2/module2.html b/docs/_build/html/class1/module2/module2.html
@@ -14,7 +14,11 @@
   <meta name="title" content="Web Application Firewall"/>
   <meta name="product" content="F5 XC EMEA Workshop"/>
   <meta name="version" content=""/>
+<<<<<<< HEAD
   <meta name="updated_date"  content="2023-11-09 10:24:45"/>
+=======
+  <meta name="updated_date"  content="2023-11-09 14:12:43"/>
+>>>>>>> class4-api
   <meta name="archived" content="Archived documents excluded"/>
   <meta name="doc_type" content="Manual"/>
   <meta name="lifecycle" content="release"/>
@@ -116,7 +120,10 @@ <h5>F5 XC EMEA Workshop  </h5>
 <li class="toctree-l1"><a class="reference internal" href="../../class2/class2.html">Class 2 - Multi Cloud Networking</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../../class3/class3.html">Class 3 - Virtual Kubernetes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../../class4/class4.html">Class 4 - API Protection</a></li>
+<<<<<<< HEAD
 <li class="toctree-l1"><a class="reference internal" href="../../class5/class5.html">Class 5 - F5 XC K8s - UNDER CONSTRUCTION</a></li>
+=======
+>>>>>>> class4-api
 </ul>
 
         </span><!-- Use this file to add extra links to the bottom of the ToC sidebar -->

diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html
@@ -15,7 +15,11 @@
   <meta name="title" content="Index"/>
   <meta name="product" content="F5 XC EMEA Workshop"/>
   <meta name="version" content=""/>
+<<<<<<< HEAD
   <meta name="updated_date"  content="2023-11-09 13:12:38"/>
+=======
+  <meta name="updated_date"  content="2023-11-14 08:05:56"/>
+>>>>>>> class4-api
   <meta name="archived" content="Archived documents excluded"/>
   <meta name="doc_type" content="Manual"/>
   <meta name="lifecycle" content="release"/>
@@ -103,7 +107,10 @@ <h5>F5 XC EMEA Workshop  </h5>
 <li class="toctree-l1"><a class="reference internal" href="class2/class2.html">Class 2 - Multi Cloud Networking</a></li>
 <li class="toctree-l1"><a class="reference internal" href="class3/class3.html">Class 3 - Virtual Kubernetes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="class4/class4.html">Class 4 - API Protection</a></li>
+<<<<<<< HEAD
 <li class="toctree-l1"><a class="reference internal" href="class5/class5.html">Class 5 - F5 XC K8s - UNDER CONSTRUCTION</a></li>
+=======
+>>>>>>> class4-api
 </ul>
 
         </span><!-- Use this file to add extra links to the bottom of the ToC sidebar -->

diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
@@ -14,7 +14,11 @@
   <meta name="title" content="F5 Distributed Cloud EMEA Workshop"/>
   <meta name="product" content="F5 XC EMEA Workshop"/>
   <meta name="version" content=""/>
+<<<<<<< HEAD
   <meta name="updated_date"  content="2023-11-09 13:12:38"/>
+=======
+  <meta name="updated_date"  content="2023-11-14 08:05:56"/>
+>>>>>>> class4-api
   <meta name="archived" content="Archived documents excluded"/>
   <meta name="doc_type" content="Manual"/>
   <meta name="lifecycle" content="release"/>
@@ -103,7 +107,10 @@ <h5>F5 XC EMEA Workshop  </h5>
 <li class="toctree-l1"><a class="reference internal" href="class2/class2.html">Class 2 - Multi Cloud Networking</a></li>
 <li class="toctree-l1"><a class="reference internal" href="class3/class3.html">Class 3 - Virtual Kubernetes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="class4/class4.html">Class 4 - API Protection</a></li>
+<<<<<<< HEAD
 <li class="toctree-l1"><a class="reference internal" href="class5/class5.html">Class 5 - F5 XC K8s - UNDER CONSTRUCTION</a></li>
+=======
+>>>>>>> class4-api
 </ul>
 
         </span><!-- Use this file to add extra links to the bottom of the ToC sidebar -->
@@ -238,12 +245,15 @@ <h2>Welcome<a class="headerlink" href="#welcome" title="Permalink to this headli
 <li class="toctree-l1"><a class="reference internal" href="class4/class4.html">Class 4 - API Protection</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="class4/module1/module1.html">Static API Protection</a></li>
 <li class="toctree-l2"><a class="reference internal" href="class4/module2/module2.html">Dynamic API Protection</a></li>
+<<<<<<< HEAD
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="class5/class5.html">Class 5 - F5 XC K8s - UNDER CONSTRUCTION</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="class5/module1/module1.html">Deploy the application</a></li>
 <li class="toctree-l2"><a class="reference internal" href="class5/module2/module2.html">Virtual Kubernetes</a></li>
 <li class="toctree-l2"><a class="reference internal" href="class5/modulea2/modulea2.html">1 Click Config</a></li>
+=======
+>>>>>>> class4-api
 </ul>
 </li>
 </ul>

diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html
@@ -14,7 +14,11 @@
   <meta name="title" content="Search"/>
   <meta name="product" content="F5 XC EMEA Workshop"/>
   <meta name="version" content=""/>
+<<<<<<< HEAD
   <meta name="updated_date"  content="2023-11-09 13:12:38"/>
+=======
+  <meta name="updated_date"  content="2023-11-14 08:05:56"/>
+>>>>>>> class4-api
   <meta name="archived" content="Archived documents excluded"/>
   <meta name="doc_type" content="Manual"/>
   <meta name="lifecycle" content="release"/>
@@ -102,7 +106,10 @@ <h5>F5 XC EMEA Workshop  </h5>
 <li class="toctree-l1"><a class="reference internal" href="class2/class2.html">Class 2 - Multi Cloud Networking</a></li>
 <li class="toctree-l1"><a class="reference internal" href="class3/class3.html">Class 3 - Virtual Kubernetes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="class4/class4.html">Class 4 - API Protection</a></li>
+<<<<<<< HEAD
 <li class="toctree-l1"><a class="reference internal" href="class5/class5.html">Class 5 - F5 XC K8s - UNDER CONSTRUCTION</a></li>
+=======
+>>>>>>> class4-api
 </ul>
 
         </span><!-- Use this file to add extra links to the bottom of the ToC sidebar -->

diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js
diff --git a/docs/class4/module1/lab1/lab1.rst b/docs/class4/module1/lab1/lab1.rst
@@ -70,9 +70,6 @@ b) In the same screen -> Origin Servers -> Add Item -> Fill the bellow data -> A
       **DNS name**            sentence.emea.f5se.com
       ====================    ========================================================================================
 
-   .. raw:: html   
-
-      <script>c1m1l2a();</script>  
 
 1. Create the HTTP LB
 

diff --git a/docs/class4/module1/lab3/lab3.rst b/docs/class4/module1/lab3/lab3.rst
@@ -4,7 +4,7 @@ Test your modern API application protection
 #. If you have curl on your machine, go to the next step. Else, connect with SSH or WEBSSH to the Jumphost machine
 #. Run the below calls
 
-   .. code-block:: bash
+   .. code-block:: none
 
       curl -H "Content-Type: application/json;charset=UTF-8" http://sentence-re-$$makeId$$.workshop.emea.f5se.com/api/adjectives
       curl -H "Content-Type: application/json;charset=UTF-8" http://sentence-re-$$makeId$$.workshop.emea.f5se.com/api/animals
@@ -15,7 +15,7 @@ Test your modern API application protection
 
 #. Now, run the below call
 
-   .. code-block:: bash
+   .. code-block:: none
 
       curl -H "Content-Type: application/json;charset=UTF-8" http://sentence-re-$$makeId$$.workshop.emea.f5se.com/api/colors