From 5b823bb4a9547bb937e5bdcb723275decf5b6c9d Mon Sep 17 00:00:00 2001
From: AbhishekJamhoriya <jamhoriya.1@iitj.ac.in>
Date: Thu, 10 Feb 2022 13:42:46 +0530
Subject: [PATCH 01/27]     color: rgba(255, 255, 255, .75);

Signed-off-by: AbhishekJamhoriya <jamhoriya.1@iitj.ac.in>
---
 docs/v0.5/assets/css/style.css                | 5 +++--
 docs/v0.5/concepts/architecture/adapters.html | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/v0.5/assets/css/style.css b/docs/v0.5/assets/css/style.css
index bc2033b3ec3..bc4348d7226 100644
--- a/docs/v0.5/assets/css/style.css
+++ b/docs/v0.5/assets/css/style.css
@@ -1021,7 +1021,7 @@ pre { margin-top: 0; margin-bottom: 0; font-family: "SFMono-Regular", Consolas,
 .mt-4 { margin-top: 24px !important; }
 
 /* Set a $size margin on the right at $breakpoint */
-.mr-4 { margin-right: 24px !important; }
+.mr-4 { margin-right: 24px !important;color: black; }
 
 /* Set a $size margin on the bottom at $breakpoint */
 .mb-4 { margin-bottom: 24px !important; }
@@ -1748,7 +1748,8 @@ pre { margin-top: 0; margin-bottom: 0; font-family: "SFMono-Regular", Consolas,
 .px-1 { padding-right: 4px !important; padding-left: 4px !important; }
 
 /* Set a $size padding to the top & bottom at $breakpoint */
-.py-1 { padding-top: 4px !important; padding-bottom: 4px !important; }
+.py-1 { padding-top: 4px !important; padding-bottom: 4px !important; color: rgba(255, 255, 255, .75);
+  font-weight: 900; }
 
 /* Set a $size padding to all sides at $breakpoint */
 .p-2 { padding: 8px !important; }
diff --git a/docs/v0.5/concepts/architecture/adapters.html b/docs/v0.5/concepts/architecture/adapters.html
index 12539953a3e..a680069364a 100644
--- a/docs/v0.5/concepts/architecture/adapters.html
+++ b/docs/v0.5/concepts/architecture/adapters.html
@@ -188,7 +188,7 @@
   <nav class="collapse td-sidebar-nav pt-1 pl-3" id="td-section-nav">
   <div class="version" class="nav-item  ml-md-auto ">
       <span class="text-black text-bold"> &nbsp;Meshery Version &nbsp;
-    <select onchange="window.location=this.value" class="appearance-none flex-1 w-full px-0 py-1 placeholder-gray-900 tracking-wide bg-white focus:outline-none" name="versioningSelection" id="versioningSelection">
+    <select onchange="window.location=this.value" class="appearance-none flex-1 w-full px-0 py-1 placeholder-gray-900 tracking-wide bg-transparent focus:outline-none" name="versioningSelection" id="versioningSelection">
       <!-- <option value="">Versions</option> -->
       
 

From 4f398914065b4a6bfbb9811246632b0f313f23e2 Mon Sep 17 00:00:00 2001
From: AbhishekJamhoriya <jamhoriya.1@iitj.ac.in>
Date: Sat, 12 Feb 2022 16:11:40 +0530
Subject: [PATCH 02/27] styled the version component

Signed-off-by: AbhishekJamhoriya <jamhoriya.1@iitj.ac.in>
---
 docs/_includes/header.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index cfbeb5a0fd3..da3cd7b9a6a 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -27,7 +27,7 @@
 
         <!--Version Selector -->
 
-        <select onchange="window.location=this.value" class="appearance-none flex-1 w-full px-0 py-1 placeholder-gray-900 tracking-wide bg-white focus:outline-none" name="versioningSelection" id="versioningSelection">
+        <select onchange="window.location=this.value" class="appearance-none flex-1 w-full px-0 py-1 placeholder-gray-900 tracking-wide bg-transparent focus:outline-none nav-link" name="versioningSelection" id="versioningSelection">
           <!-- <option value="">Versions</option> -->
           {% assign versions = site.data.versions  %}
 
@@ -40,7 +40,7 @@
           {%- else -%}
             {%- assign optionSelected = "" -%}
           {%- endif -%}
-          <option {{optionSelected}} value="{% if link.url %}{{ site.baseurl }}/{{ link.url }}{% endif %}" class="nav-item mr-4 mb-2 mb-lg-0">
+          <option {{optionSelected}} value="{% if link.url %}{{ site.baseurl }}/{{ link.url }}{% endif %}" class="nav-item mr-4 mb-2 mb-lg-0 text-black">
             <span>{{ link.version }}</span>
           </option>
           {% endfor %}

From b732a6b4b41666c3dbe51e3e9cc7561e6e587cf8 Mon Sep 17 00:00:00 2001
From: AbhishekJamhoriya <jamhoriya.1@iitj.ac.in>
Date: Fri, 18 Feb 2022 04:25:42 +0530
Subject: [PATCH 03/27] making the version selector a bit rounder

Signed-off-by: AbhishekJamhoriya <jamhoriya.1@iitj.ac.in>
---
 docs/_includes/header.html |  2 +-
 docs/assets/css/main.css   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index da3cd7b9a6a..b47cda337c2 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -27,7 +27,7 @@
 
         <!--Version Selector -->
 
-        <select onchange="window.location=this.value" class="appearance-none flex-1 w-full px-0 py-1 placeholder-gray-900 tracking-wide bg-transparent focus:outline-none nav-link" name="versioningSelection" id="versioningSelection">
+        <select onchange="window.location=this.value" class="appearance-none flex-1 w-full px-0 py-1 placeholder-gray-900 tracking-wide bg-transparent focus:outline-none nav-link version-selector" name="versioningSelection" id="versioningSelection">
           <!-- <option value="">Versions</option> -->
           {% assign versions = site.data.versions  %}
 
diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
index 960af662b88..dd30831ebf6 100644
--- a/docs/assets/css/main.css
+++ b/docs/assets/css/main.css
@@ -9219,8 +9219,9 @@ button.bg-dark:focus {
     margin-top: 1.5rem!important
 }
 
-.mr-4,
-.mx-4 {
+
+.mx-4 ,
+.mr-4{
     margin-right: 1.5rem!important
 }
 
@@ -9288,7 +9289,8 @@ button.bg-dark:focus {
 
 .pt-1,
 .py-1 {
-    padding-top: .25rem!important
+    padding-top: .25rem!important;
+    
 }
 
 .pr-1,
@@ -9298,7 +9300,8 @@ button.bg-dark:focus {
 
 .pb-1,
 .py-1 {
-    padding-bottom: .25rem!important
+    padding-bottom: .25rem!important;
+   
 }
 
 .pl-1,
@@ -18780,6 +18783,10 @@ footer {
     display: block;
     font-weight: bold;
 }
+.version-selector{
+    border-radius: 0.3rem;
+}
+
 /* mobile responisness for video*/
 
 @media(min-width:1rem) and (max-width:19.9rem){

From 27995baaea3184e3aa0806bc68bbd83cd9e893c2 Mon Sep 17 00:00:00 2001
From: AbhishekJamhoriya <jamhoriya.1@iitj.ac.in>
Date: Fri, 18 Feb 2022 04:53:33 +0530
Subject: [PATCH 04/27] removing focus outline

Signed-off-by: AbhishekJamhoriya <jamhoriya.1@iitj.ac.in>
---
 docs/assets/css/main.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
index dd30831ebf6..abd174e54b1 100644
--- a/docs/assets/css/main.css
+++ b/docs/assets/css/main.css
@@ -18786,7 +18786,9 @@ footer {
 .version-selector{
     border-radius: 0.3rem;
 }
-
+.version-selector:focus{
+    outline: none;
+}
 /* mobile responisness for video*/
 
 @media(min-width:1rem) and (max-width:19.9rem){

From e20f899f2d03cef3fab4a07bd0d95eeb5e218216 Mon Sep 17 00:00:00 2001
From: AbhishekJamhoriya <jamhoriya.1@iitj.ac.in>
Date: Thu, 24 Feb 2022 00:56:32 +0530
Subject: [PATCH 05/27] resolved mobile view issue

Signed-off-by: AbhishekJamhoriya <jamhoriya.1@iitj.ac.in>
---
 docs/assets/css/main.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
index abd174e54b1..bba49d4dc3a 100644
--- a/docs/assets/css/main.css
+++ b/docs/assets/css/main.css
@@ -18038,7 +18038,7 @@ html body .md-typeset .headerlink {
     }
     .td-navbar .td-navbar-nav-scroll {
         max-width: 100%;
-        height: 2.5rem;
+        height: 3.5rem;
         margin-top: .25rem;
         overflow: hidden;
         font-size: .875rem
@@ -18785,6 +18785,7 @@ footer {
 }
 .version-selector{
     border-radius: 0.3rem;
+    width: auto;
 }
 .version-selector:focus{
     outline: none;

From 78242235412d60cae6b29ed1c81be0ca6437a200 Mon Sep 17 00:00:00 2001
From: Aditya Chatterjee <speak2adi@gmail.com>
Date: Thu, 17 Mar 2022 21:57:01 +0530
Subject: [PATCH 06/27] add cilium

Signed-off-by: Aditya Chatterjee <speak2adi@gmail.com>
---
 Makefile                                         |  2 +-
 docker-compose.yaml                              |  6 ++++++
 provider-ui/package-lock.json                    |  1 -
 .../PatternService/helper.js                     |  6 +++++-
 ui/components/Navigator.js                       |  7 +++++++
 ui/package-lock.json                             |  1 -
 ui/public/static/img/cilium-light.svg            | 16 ++++++++++++++++
 ui/public/static/img/cilium_service_mesh.svg     | 16 ++++++++++++++++
 8 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 ui/public/static/img/cilium-light.svg
 create mode 100644 ui/public/static/img/cilium_service_mesh.svg

diff --git a/Makefile b/Makefile
index 77ad3f3fbb9..f3f7067020f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-ADAPTER_URLS := "localhost:10000 localhost:10001 localhost:10002 localhost:10004 localhost:10005 localhost:10006 localhost:10007 localhost:10008 localhost:10009 localhost:10010"
+ADAPTER_URLS := "localhost:10000 localhost:10001 localhost:10002 localhost:10004 localhost:10005 localhost:10006 localhost:10007 localhost:10008 localhost:10009 localhost:10010 localhost:10012"
 
 MESHERY_CLOUD_LOCAL="http://localhost:9876"
 MESHERY_CLOUD_DEV="http://localhost:9876"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ffac1794cb3..a76ec1837b2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -75,6 +75,12 @@ services:
      - "com.centurylinklabs.watchtower.enable=true"
    ports:
      - "10010:10010"
+  meshery-cilium: 
+    image: layer5/meshery-cilium:stable-latest
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
+    ports:
+      - "10012:10012"
   # nighthawk-lg:
   #   image: envoyproxy/nighthawk-dev:latest
   watchtower:
diff --git a/provider-ui/package-lock.json b/provider-ui/package-lock.json
index 92eee8b592b..9a84da16142 100644
--- a/provider-ui/package-lock.json
+++ b/provider-ui/package-lock.json
@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "provider-ui",
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/ui/components/MesheryMeshInterface/PatternService/helper.js b/ui/components/MesheryMeshInterface/PatternService/helper.js
index 280caea47e7..24c592c54d0 100644
--- a/ui/components/MesheryMeshInterface/PatternService/helper.js
+++ b/ui/components/MesheryMeshInterface/PatternService/helper.js
@@ -40,10 +40,12 @@ export function getRefinedJsonSchema(jsonSchema, hideTitle = true, handleError)
 function handleExceptionalFields(schema) {
   const xKubernetesIntOrString = 'x-kubernetes-int-or-string';
   const xKubernetesPreserveUnknownFields = 'x-kubernetes-preserve-unknown-fields';
+  const additionalProperties = 'additionalProperties';
 
   const exceptionalFieldToTypeMap = {
     [xKubernetesIntOrString] : ['string'], // string can hold integers too
-    [xKubernetesPreserveUnknownFields] : [schema?.type || 'object']
+    [xKubernetesPreserveUnknownFields] : [schema?.type || 'object'],
+    [additionalProperties] : ['string']
   }
 
   let returnedType;
@@ -77,6 +79,7 @@ function getDefaults(types) {
 function addTitleToPropertiesJSONSchema(jsonSchema) {
   const newProperties = jsonSchema?.properties
 
+
   if (newProperties && typeof newProperties === 'object') {
     Object.keys(newProperties).map(key => {
       if (Object.prototype.hasOwnProperty.call(newProperties, key)) {
@@ -115,6 +118,7 @@ function addTitleToPropertiesJSONSchema(jsonSchema) {
     })
 
     return { ...jsonSchema, properties : newProperties };
+
   }
   return undefined
 }
diff --git a/ui/components/Navigator.js b/ui/components/Navigator.js
index 9aa44b5ce34..561d98c7db1 100644
--- a/ui/components/Navigator.js
+++ b/ui/components/Navigator.js
@@ -317,6 +317,13 @@ const categories = [
         link : true,
         show : true,
       },
+      {
+        id : "Cilium",
+        href : "/management/cilium",
+        title : "Cilium",
+        link : true,
+        show : true,
+      },
       {
         id : "Istio",
         href : "/management/istio",
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 48a25c9dc03..4a149b4d6ca 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "ui",
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/ui/public/static/img/cilium-light.svg b/ui/public/static/img/cilium-light.svg
new file mode 100644
index 00000000000..c336ca9676c
--- /dev/null
+++ b/ui/public/static/img/cilium-light.svg
@@ -0,0 +1,16 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.3361 18.8075H24.2368L21.6571 23.3262L24.2368 27.7838H29.3361L31.9157 23.3262L29.3361 18.8075Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.3361 6.83905H24.2368L21.6571 11.3577L24.2368 15.8153H29.3361L31.9157 11.3577L29.3361 6.83905Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.0774 1.13983H13.9781L11.3984 5.65852L13.9781 10.1161H19.0774L21.6571 5.65852L19.0774 1.13983Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.81889 6.83905H3.71959L1.13989 11.3577L3.71959 15.8153H8.81889L11.3985 11.3577L8.81889 6.83905Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.0774 12.5383H13.9781L11.3984 17.057L13.9781 21.5146H19.0774L21.6571 17.057L19.0774 12.5383Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.81889 18.8075H3.71959L1.13989 23.3262L3.71959 27.7838H8.81889L11.3985 23.3262L8.81889 18.8075Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.0774 24.5067H13.9781L11.3984 29.0254L13.9781 33.483H19.0774L21.6571 29.0254L19.0774 24.5067Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.8181 20.7783H14.2377L11.9205 16.8397L14.2377 12.8471H18.8181L21.1352 16.8397L18.8181 20.7783ZM19.6441 11.3984H13.3933L10.2587 16.831L13.3933 22.227H19.6441L22.797 16.831L19.6441 11.3984Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3932 23.3669L10.2587 28.7995L13.3932 34.1954H19.6441L22.797 28.7995L19.6441 23.3669H13.3932ZM11.9204 28.8082L14.2376 24.8156H18.818L21.1352 28.8082L18.818 32.7468H14.2376L11.9204 28.8082Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3932 0L10.2587 5.43263L13.3932 10.8285H19.6441L22.797 5.43263L19.6441 0H13.3932ZM11.9204 5.4412L14.2376 1.4487H18.818L21.1352 5.4412L18.818 9.37985H14.2376L11.9204 5.4412Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6518 17.6676L20.5172 23.1002L23.6518 28.4961H29.9026L33.0555 23.1002L29.9026 17.6676H23.6518ZM22.1791 23.1088L24.4962 19.1162H29.0766L31.3937 23.1088L29.0766 27.0475H24.4962L22.1791 23.1088Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6518 5.69922L20.5172 11.1319L23.6518 16.5278H29.9026L33.0555 11.1319L29.9026 5.69922H23.6518ZM22.1791 11.1405L24.4962 7.14791H29.0766L31.3937 11.1405L29.0766 15.0791H24.4962L22.1791 11.1405Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.13453 17.6676L0 23.1002L3.13453 28.4961H9.38542L12.5383 23.1002L9.38542 17.6676H3.13453ZM1.66179 23.1088L3.97892 19.1162H8.55933L10.8765 23.1088L8.55933 27.0475H3.97892L1.66179 23.1088Z" fill="#FFFFFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.13453 5.69922L0 11.1319L3.13453 16.5278H9.38542L12.5383 11.1319L9.38542 5.69922H3.13453ZM1.66179 11.1405L3.97892 7.14791H8.55933L10.8765 11.1405L8.55933 15.0791H3.97892L1.66179 11.1405Z" fill="#FFFFFF"/>
+</svg>
diff --git a/ui/public/static/img/cilium_service_mesh.svg b/ui/public/static/img/cilium_service_mesh.svg
new file mode 100644
index 00000000000..fc30aa90aef
--- /dev/null
+++ b/ui/public/static/img/cilium_service_mesh.svg
@@ -0,0 +1,16 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.3361 18.8075H24.2368L21.6571 23.3262L24.2368 27.7838H29.3361L31.9157 23.3262L29.3361 18.8075Z" fill="#8061A9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.3361 6.83905H24.2368L21.6571 11.3577L24.2368 15.8153H29.3361L31.9157 11.3577L29.3361 6.83905Z" fill="#F17323"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.0774 1.13983H13.9781L11.3984 5.65852L13.9781 10.1161H19.0774L21.6571 5.65852L19.0774 1.13983Z" fill="#F8C517"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.81889 6.83905H3.71959L1.13989 11.3577L3.71959 15.8153H8.81889L11.3985 11.3577L8.81889 6.83905Z" fill="#CADD72"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.0774 12.5383H13.9781L11.3984 17.057L13.9781 21.5146H19.0774L21.6571 17.057L19.0774 12.5383Z" fill="#E82629"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.81889 18.8075H3.71959L1.13989 23.3262L3.71959 27.7838H8.81889L11.3985 23.3262L8.81889 18.8075Z" fill="#98C93E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.0774 24.5067H13.9781L11.3984 29.0254L13.9781 33.483H19.0774L21.6571 29.0254L19.0774 24.5067Z" fill="#628AC6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.8181 20.7783H14.2377L11.9205 16.8397L14.2377 12.8471H18.8181L21.1352 16.8397L18.8181 20.7783ZM19.6441 11.3984H13.3933L10.2587 16.831L13.3933 22.227H19.6441L22.797 16.831L19.6441 11.3984Z" fill="#363736"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3932 23.3669L10.2587 28.7995L13.3932 34.1954H19.6441L22.797 28.7995L19.6441 23.3669H13.3932ZM11.9204 28.8082L14.2376 24.8156H18.818L21.1352 28.8082L18.818 32.7468H14.2376L11.9204 28.8082Z" fill="#363736"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3932 0L10.2587 5.43263L13.3932 10.8285H19.6441L22.797 5.43263L19.6441 0H13.3932ZM11.9204 5.4412L14.2376 1.4487H18.818L21.1352 5.4412L18.818 9.37985H14.2376L11.9204 5.4412Z" fill="#363736"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6518 17.6676L20.5172 23.1002L23.6518 28.4961H29.9026L33.0555 23.1002L29.9026 17.6676H23.6518ZM22.1791 23.1088L24.4962 19.1162H29.0766L31.3937 23.1088L29.0766 27.0475H24.4962L22.1791 23.1088Z" fill="#363736"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6518 5.69922L20.5172 11.1319L23.6518 16.5278H29.9026L33.0555 11.1319L29.9026 5.69922H23.6518ZM22.1791 11.1405L24.4962 7.14791H29.0766L31.3937 11.1405L29.0766 15.0791H24.4962L22.1791 11.1405Z" fill="#363736"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.13453 17.6676L0 23.1002L3.13453 28.4961H9.38542L12.5383 23.1002L9.38542 17.6676H3.13453ZM1.66179 23.1088L3.97892 19.1162H8.55933L10.8765 23.1088L8.55933 27.0475H3.97892L1.66179 23.1088Z" fill="#363736"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.13453 5.69922L0 11.1319L3.13453 16.5278H9.38542L12.5383 11.1319L9.38542 5.69922H3.13453ZM1.66179 11.1405L3.97892 7.14791H8.55933L10.8765 11.1405L8.55933 15.0791H3.97892L1.66179 11.1405Z" fill="#363736"/>
+</svg>

From d1a0b4a16e19e8e5caffc0c9f5d7669a65b679d1 Mon Sep 17 00:00:00 2001
From: Aadhitya A <aadhitya864@gmail.com>
Date: Sat, 19 Mar 2022 22:40:47 +0530
Subject: [PATCH 07/27] Update glob expressions for path updates

Signed-off-by: Aadhitya A <aadhitya864@gmail.com>
---
 .github/codecov.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/codecov.yml b/.github/codecov.yml
index c8ca4a865ce..098cd109671 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -25,20 +25,21 @@ flags:
   # Filter the folders to be measured by each flag
   front-end-integration-tests:
     paths:
-      - ui/cypress/integration/integration
+      - */ui/cypress/integration/integration/**
     carryforward: true
   front-end-e2e-tests:
     paths:
-      - ui/cypress/integration/e2e
+      - */ui/cypress/integration/e2e/**
     carryforward: true
   backend:
     paths:
-      - cmd
-      - handlers
-      - helpers
-      - internal
-      - mesheryctl
-      - meshes
-      - models
-      - router
+    # Accepts only glob patterns, not regex
+      - */cmd/**
+      - */handlers/**
+      - */helpers/**
+      - */internal/**
+      - */mesheryctl/**
+      - */meshes/**
+      - */models/**
+      - */router/**
     carryforward: true

From e8dd42a6b1f606ea9a84cb7e2af33c481317f220 Mon Sep 17 00:00:00 2001
From: Aadhitya A <aadhitya864@gmail.com>
Date: Sat, 19 Mar 2022 22:48:19 +0530
Subject: [PATCH 08/27] Remove UI from coverage tests

Signed-off-by: Aadhitya A <aadhitya864@gmail.com>
---
 .github/codecov.yml | 4 ++--
 docs/.ruby-version  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 docs/.ruby-version

diff --git a/.github/codecov.yml b/.github/codecov.yml
index 098cd109671..174e1f0fdc4 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -25,11 +25,11 @@ flags:
   # Filter the folders to be measured by each flag
   front-end-integration-tests:
     paths:
-      - */ui/cypress/integration/integration/**
+      - ui/cypress/integration/integration
     carryforward: true
   front-end-e2e-tests:
     paths:
-      - */ui/cypress/integration/e2e/**
+      - ui/cypress/integration/e2e
     carryforward: true
   backend:
     paths:
diff --git a/docs/.ruby-version b/docs/.ruby-version
new file mode 100644
index 00000000000..860487ca19c
--- /dev/null
+++ b/docs/.ruby-version
@@ -0,0 +1 @@
+2.7.1

From eea8c5df0f60a84a43c89d6d293cdcdf2fdb815e Mon Sep 17 00:00:00 2001
From: Aadhitya A <aadhitya864@gmail.com>
Date: Sat, 19 Mar 2022 22:53:50 +0530
Subject: [PATCH 09/27] Remove temp ruby version file

Signed-off-by: Aadhitya A <aadhitya864@gmail.com>
---
 docs/.ruby-version | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docs/.ruby-version

diff --git a/docs/.ruby-version b/docs/.ruby-version
deleted file mode 100644
index 860487ca19c..00000000000
--- a/docs/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-2.7.1

From 94910e4bcea88dda6272575fd15b1c3c1ee5b961 Mon Sep 17 00:00:00 2001
From: Aadhitya A <aadhitya864@gmail.com>
Date: Sat, 19 Mar 2022 23:37:35 +0530
Subject: [PATCH 10/27] Update paths with quotes

Signed-off-by: Aadhitya A <aadhitya864@gmail.com>
---
 .github/codecov.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/codecov.yml b/.github/codecov.yml
index 174e1f0fdc4..f7d65170750 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -34,12 +34,12 @@ flags:
   backend:
     paths:
     # Accepts only glob patterns, not regex
-      - */cmd/**
-      - */handlers/**
-      - */helpers/**
-      - */internal/**
-      - */mesheryctl/**
-      - */meshes/**
-      - */models/**
-      - */router/**
+      - "*/cmd/**"
+      - "*/handlers/**"
+      - "*/helpers/**"
+      - "*/internal/**
+      - "*/mesheryctl/**" 
+      - "*/meshes/**"
+      - "*/models/**"
+      - "*/router/**"
     carryforward: true

From 15283a9a27d4012f3452ca9c5a81ab0d9cee90fc Mon Sep 17 00:00:00 2001
From: Aadhitya A <aadhitya864@gmail.com>
Date: Sun, 20 Mar 2022 21:28:23 +0530
Subject: [PATCH 11/27] Add sample test for helpers folder

Signed-off-by: Aadhitya A <aadhitya864@gmail.com>
---
 .github/codecov.yml        |  2 +-
 helpers/kubernetes_test.go | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 helpers/kubernetes_test.go

diff --git a/.github/codecov.yml b/.github/codecov.yml
index f7d65170750..2e5a7b325cd 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -37,7 +37,7 @@ flags:
       - "*/cmd/**"
       - "*/handlers/**"
       - "*/helpers/**"
-      - "*/internal/**
+      - "*/internal/**"
       - "*/mesheryctl/**" 
       - "*/meshes/**"
       - "*/models/**"
diff --git a/helpers/kubernetes_test.go b/helpers/kubernetes_test.go
new file mode 100644
index 00000000000..52036df811a
--- /dev/null
+++ b/helpers/kubernetes_test.go
@@ -0,0 +1,23 @@
+package helpers
+
+import (
+	"testing"
+
+	"github.com/layer5io/meshery/mesheryctl/pkg/utils"
+)
+
+func TestFetchKubernetesVersion(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping tests")
+	}
+
+	utils.SetupContextEnv(t)
+	utils.StartMockery(t)
+	testByte := []byte{0,0}
+	var testContext string= ""
+	
+	_, err := FetchKubernetesVersion(testByte, testContext)
+	if err != nil {
+		t.Error("FetchKubernetesVersion() failed")
+	}
+}
\ No newline at end of file

From 7518e87a0d05a3f8c99786c5705952677387f109 Mon Sep 17 00:00:00 2001
From: Aadhitya A <aadhitya864@gmail.com>
Date: Mon, 21 Mar 2022 09:01:51 +0530
Subject: [PATCH 12/27] Add sample tests

Signed-off-by: Aadhitya A <aadhitya864@gmail.com>
---
 cmd/main_test.go                 | 16 ++++++++++++++++
 handlers/middlewares_test.go     | 16 ++++++++++++++++
 helpers/kubernetes_test.go       |  2 +-
 internal/channels/broker_test.go | 16 ++++++++++++++++
 internal/sql/map_test.go         | 17 +++++++++++++++++
 meshes/client_test.go            | 18 ++++++++++++++++++
 router/server_test.go            | 18 ++++++++++++++++++
 7 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 cmd/main_test.go
 create mode 100644 handlers/middlewares_test.go
 create mode 100644 internal/channels/broker_test.go
 create mode 100644 internal/sql/map_test.go
 create mode 100644 meshes/client_test.go
 create mode 100644 router/server_test.go

diff --git a/cmd/main_test.go b/cmd/main_test.go
new file mode 100644
index 00000000000..1e72eb42375
--- /dev/null
+++ b/cmd/main_test.go
@@ -0,0 +1,16 @@
+package main
+
+import (
+	"testing"
+)
+
+func TestMain(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode.")
+	}
+
+	_, err := main()
+	if err != nil {
+		t.Errorf("main() failed with error: %s", err)
+	}
+}
diff --git a/handlers/middlewares_test.go b/handlers/middlewares_test.go
new file mode 100644
index 00000000000..a0d777b6875
--- /dev/null
+++ b/handlers/middlewares_test.go
@@ -0,0 +1,16 @@
+package handlers
+
+import (
+	"testing"
+)
+
+func TestAuthMiddleWare(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode.")
+	}
+
+	_, err := AuthMiddleWare(nil, nil)
+	if err != nil {
+		t.Errorf("AuthMiddleWare() failed with error: %s", err)
+	}
+}
diff --git a/helpers/kubernetes_test.go b/helpers/kubernetes_test.go
index 52036df811a..b68f54c196e 100644
--- a/helpers/kubernetes_test.go
+++ b/helpers/kubernetes_test.go
@@ -20,4 +20,4 @@ func TestFetchKubernetesVersion(t *testing.T) {
 	if err != nil {
 		t.Error("FetchKubernetesVersion() failed")
 	}
-}
\ No newline at end of file
+}
diff --git a/internal/channels/broker_test.go b/internal/channels/broker_test.go
new file mode 100644
index 00000000000..2825d57066d
--- /dev/null
+++ b/internal/channels/broker_test.go
@@ -0,0 +1,16 @@
+package channels
+
+import (
+	"testing"
+)
+
+func TestNewBrokerSubscribeChannel(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode.")
+	}
+
+	ch := NewBrokerSubscribeChannel()
+	if ch == nil {
+		t.Error("NewBrokerSubscribeChannel() returned nil.")
+	}
+}
diff --git a/internal/sql/map_test.go b/internal/sql/map_test.go
new file mode 100644
index 00000000000..8bab299f956
--- /dev/null
+++ b/internal/sql/map_test.go
@@ -0,0 +1,17 @@
+package sql
+
+import (
+	"testing"
+)
+
+var Sample map[string]interface{}
+
+func TestScan(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode.")
+	}
+	err := Map.Interface(Sample)
+	if err != nil {
+		t.Errorf("Scan() failed with error: %s", err)
+	}
+}
diff --git a/meshes/client_test.go b/meshes/client_test.go
new file mode 100644
index 00000000000..e4707fcd40f
--- /dev/null
+++ b/meshes/client_test.go
@@ -0,0 +1,18 @@
+package meshes
+
+import (
+	"testing"
+)
+
+m := MeshClient("nil", "nil")
+
+func TestClose(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode.")
+	}
+
+	err := m.Close()
+	if err != nil {
+		t.Errorf("Close() failed with error: %s", err)
+	}
+}
diff --git a/router/server_test.go b/router/server_test.go
new file mode 100644
index 00000000000..3613cb31a92
--- /dev/null
+++ b/router/server_test.go
@@ -0,0 +1,18 @@
+package router
+
+import (
+	"testing"
+)
+
+r := Router("nil", 0)
+
+func TestClose(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode.")
+	}
+
+	err := r.Close()
+	if err != nil {
+		t.Errorf("Close() failed with error: %s", err)
+	}
+} 

From 19f4663ae294714a950bd65646054d37eda26c47 Mon Sep 17 00:00:00 2001
From: Aadhitya A <aadhitya864@gmail.com>
Date: Mon, 21 Mar 2022 09:59:40 +0530
Subject: [PATCH 13/27] Correct sample tests to dummy tests

Signed-off-by: Aadhitya A <aadhitya864@gmail.com>
---
 cmd/main_test.go             |  5 +----
 handlers/middlewares_test.go |  9 +++++----
 meshes/client_test.go        | 11 +++++------
 router/server_test.go        | 11 +++++------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/cmd/main_test.go b/cmd/main_test.go
index 1e72eb42375..82e6808c1b1 100644
--- a/cmd/main_test.go
+++ b/cmd/main_test.go
@@ -9,8 +9,5 @@ func TestMain(t *testing.T) {
 		t.Skip("Skipping test in short mode.")
 	}
 
-	_, err := main()
-	if err != nil {
-		t.Errorf("main() failed with error: %s", err)
-	}
+	t.Log("Need to run main() skipping")
 }
diff --git a/handlers/middlewares_test.go b/handlers/middlewares_test.go
index a0d777b6875..99a3b81accb 100644
--- a/handlers/middlewares_test.go
+++ b/handlers/middlewares_test.go
@@ -9,8 +9,9 @@ func TestAuthMiddleWare(t *testing.T) {
 		t.Skip("Skipping test in short mode.")
 	}
 
-	_, err := AuthMiddleWare(nil, nil)
-	if err != nil {
-		t.Errorf("AuthMiddleWare() failed with error: %s", err)
-	}
+	t.Log("Need to run AuthMiddleware() skipping")
+	//_, err := AuthMiddleware(nil, nil)
+	//if err != nil {
+	//	t.Errorf("AuthMiddleWare() failed with error: %s", err)
+	//}
 }
diff --git a/meshes/client_test.go b/meshes/client_test.go
index e4707fcd40f..86705122907 100644
--- a/meshes/client_test.go
+++ b/meshes/client_test.go
@@ -4,15 +4,14 @@ import (
 	"testing"
 )
 
-m := MeshClient("nil", "nil")
-
 func TestClose(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping test in short mode.")
 	}
 
-	err := m.Close()
-	if err != nil {
-		t.Errorf("Close() failed with error: %s", err)
-	}
+	t.Log("Need to run Close() skipping")
+	//err := m.Close()
+	//if err != nil {
+	//	t.Errorf("Close() failed with error: %s", err)
+	//}
 }
diff --git a/router/server_test.go b/router/server_test.go
index 3613cb31a92..1f5c00971bd 100644
--- a/router/server_test.go
+++ b/router/server_test.go
@@ -4,15 +4,14 @@ import (
 	"testing"
 )
 
-r := Router("nil", 0)
-
 func TestClose(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping test in short mode.")
 	}
 
-	err := r.Close()
-	if err != nil {
-		t.Errorf("Close() failed with error: %s", err)
-	}
+	t.Log("Need to run Close() skipping")
+	//err := r.Close()
+	//if err != nil {
+	//	t.Errorf("Close() failed with error: %s", err)
+	//}
 } 

From 24a1afeb955b59d1ba230bd2c53f26028c4e8727 Mon Sep 17 00:00:00 2001
From: leecalcote <leecalcote@gmail.com>
Date: Mon, 21 Mar 2022 14:46:00 -0500
Subject: [PATCH 14/27] more cilium considerations

Signed-off-by: leecalcote <leecalcote@gmail.com>
---
 ui/components/Navigator.js | 2 ++
 ui/utils/nameMapper.js     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/ui/components/Navigator.js b/ui/components/Navigator.js
index 561d98c7db1..1f1c6113844 100644
--- a/ui/components/Navigator.js
+++ b/ui/components/Navigator.js
@@ -749,6 +749,8 @@ class Navigator extends React.Component {
       let aName = adapter.name.toLowerCase();
       // Manually changing adapter name so that it matches the internal name
       if (aName === "osm") aName = "open service mesh";
+      if (aName === "cilium") aName = "cilium service mesh";
+      if (aName === "nginx") aName = "nginx service mesh";
       if (category !== aName) {
         return;
       }
diff --git a/ui/utils/nameMapper.js b/ui/utils/nameMapper.js
index cbbe6757e50..db60a93fd24 100644
--- a/ui/utils/nameMapper.js
+++ b/ui/utils/nameMapper.js
@@ -47,6 +47,7 @@ export function getMeshProperties(name) {
     case "kuma": return { name, img : "/static/img/kuma.svg", color : "#291953" }
     case "nginx_service_mesh": return { name, img : "/static/img/nginx.svg", color : "#009639" }
     case "open_service_mesh": return { name, img : "/static/img/openservicemesh.svg", color : "#6ED3B9" }
+    case "cilium_service_mesh": return { name, img : "/static/img/cilium_service_mesh.svg", color : "#6B91C7" }
     case "citrix": return { name, img : "/static/img/citrix_service_mesh.svg", color : "#466BB0" }
     case "traefik_mesh": return { name, img : "/static/img/traefik_mesh.svg", color : "#9D0FB0" }
     case "consul": return { name, img : "/static/img/consul.svg", color : "#D62783" }

From 4ee72c4fe4b3dc691bbcbe108e9d7b1cc31bb2de Mon Sep 17 00:00:00 2001
From: leecalcote <leecalcote@users.noreply.github.com>
Date: Mon, 21 Mar 2022 20:08:02 +0000
Subject: [PATCH 15/27] [Docs] Release Notes for Meshery

Signed-off-by: l5io <ci@layer5.io>
---
 docs/_releases/v0.6.0-rc-5c.md | 86 ++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 docs/_releases/v0.6.0-rc-5c.md

diff --git a/docs/_releases/v0.6.0-rc-5c.md b/docs/_releases/v0.6.0-rc-5c.md
new file mode 100644
index 00000000000..c80bb90f7ac
--- /dev/null
+++ b/docs/_releases/v0.6.0-rc-5c.md
@@ -0,0 +1,86 @@
+---
+layout: release
+date: 2022-03-21
+tag: v0.6.0-rc-5c
+---
+
+## What's New
+## 🔤 General
+- [WIP] Init Docker Extension UI @theBeginner86 (#5242)
+- [meshery] Add support for cilium adapter @hexxdump (#5238)
+- Remove whitespace from k8s generated components @Revolyssup (#5226)
+- Update swagger.yaml @zahertalab (#5216)
+- Add Mario to CI maintainers list @alphaX86 (#5219)
+- [DOCS] Maintainers file update @Chadha93 (#5223)
+- get latest wasm filters from latest release @Revolyssup (#5176)
+- [WIP] Meshery perf helm @hershd23 (#5166)
+- handle panic when preference load test is not provided in UserPrefsHandler @sourikghosh (#5177)
+- Update README.md - Content misaligned in the main readme file @RakeshPotnuru (#5189)
+- Fix #5180 @Revolyssup (#5183)
+- Set appropriate metadata.name for namespace @Revolyssup (#5175)
+- Transition of role for Utkarsh @leecalcote (#5178)
+
+## ⌨️ Meshery CLI
+
+- [Meshery] added cilium as component @piyushsingariya (#5234)
+- Fixed spacing on error message. @cpepper96 (#5230)
+- [mesheryctl] Introducing `--port-forward` in `system dashboard` @piyushsingariya (#5053)
+
+## 🖥 Meshery UI
+
+- add cilium @warunicorn19 (#5235)
+- [UI] Replicate Imports for Filters and Application similar to Patterns and fix e2e failure @SAEb-ai (#5213)
+- More settings options in remote provider tab @theBeginner86 (#5217)
+- fix: Accept the rjsf custom components from the Meshery Extension @Abhishek-kumar09 (#5225)
+- [CI] UI: OS and Arch for fsevents package @leecalcote (#5224)
+- [UI] Pattern update and delete handler call 🐛 bug fix  @Chadha93 (#5208)
+- Revert "[UI] Replicate Imports for Filters and Applications similar to Patterns" @leecalcote (#5212)
+- [UI] Replicate Imports for Filters and Applications similar to Patterns @SAEb-ai (#5203)
+- removed deprecated grpc option @sourikghosh (#5200)
+- Bump next from 11.1.3 to 12.1.0 in /provider-ui @dependabot (#5089)
+- Bump relay-runtime from 11.0.2 to 13.1.1 in /ui @dependabot (#5135)
+- [UI][Server] Update API endpoint call @Chadha93 (#5197)
+- [UI] Dashboard service mesh proxy tooltip  @Chadha93 (#5202)
+- Bump eslint-config-next from 11.1.3 to 12.1.0 in /provider-ui @dependabot (#5133)
+- Bump @babel/traverse from 7.16.3 to 7.17.3 in /ui @dependabot (#5185)
+- Bump eslint-config-airbnb from 18.2.1 to 19.0.4 in /ui @dependabot (#5186)
+- [UI] Fixed Context Menu peek behaviour @NikhilSharma03 (#5188)
+- Bump @fortawesome/free-brands-svg-icons from 5.15.4 to 6.0.0 in /ui @dependabot (#5155)
+- [UI][Bug Hunt] Enabled clickaway feature on the context-switcher | CU-232yuch @asubedy (#5181)
+- Bump lint-staged from 12.3.3 to 12.3.5 in /ui @dependabot (#5182)
+- Bump billboard.js from 3.2.1 to 3.3.3 in /ui @dependabot (#5156)
+
+## 🔋 Patterns, Filters, Applications
+
+- Remove UUIDs from being service name of designs and add depends-on @Revolyssup (#5218)
+- Add name field for pattern request to avoid "MesheryGeneratedPatternFile" @Revolyssup (#5207)
+- [UI] Pattern update and delete handler call 🐛 bug fix  @Chadha93 (#5208)
+
+## 🧰 Maintenance
+
+- [CI] Update and add tests, glob expressions for backend files in CodeCov @alphaX86 (#5240)
+- [Meshery] added cilium as component @piyushsingariya (#5234)
+- Hardcoded image name for DDE @hershd23 (#5241)
+- Workflow for Docker Desktop Extension @hershd23 (#5236)
+- Fixed spacing on error message. @cpepper96 (#5230)
+- [CI] Docs: Move to Ruby 2.7.5 @leecalcote (#5222)
+- Bump next from 11.1.3 to 12.1.0 in /provider-ui @dependabot (#5089)
+- Bump relay-runtime from 11.0.2 to 13.1.1 in /ui @dependabot (#5135)
+- Bump eslint-config-next from 11.1.3 to 12.1.0 in /provider-ui @dependabot (#5133)
+- Bump @babel/traverse from 7.16.3 to 7.17.3 in /ui @dependabot (#5185)
+- Bump eslint-config-airbnb from 18.2.1 to 19.0.4 in /ui @dependabot (#5186)
+- Bump fortio.org/fortio from 1.20.0 to 1.21.0 @dependabot (#5161)
+- Bump @fortawesome/free-brands-svg-icons from 5.15.4 to 6.0.0 in /ui @dependabot (#5155)
+- Bump lint-staged from 12.3.3 to 12.3.5 in /ui @dependabot (#5182)
+- Bump billboard.js from 3.2.1 to 3.3.3 in /ui @dependabot (#5156)
+
+## 📖 Documentation
+
+- Update CONTRIBUTING.md @RakeshPotnuru (#5221)
+- Update contributing-docs.md w/signoff @RakeshPotnuru (#5191)
+- Added port 10013 to docs to reserve the port @hershd23 (#5179)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@Abhishek-kumar09, @Chadha93, @MarioArriaga92, @NikhilSharma03, @RakeshPotnuru, @Revolyssup, @SAEb-ai, @alphaX86, @asubedy, @cpepper96, @dependabot, @dependabot[bot], @hershd23, @hexxdump, @l5io, @leecalcote, @piyushsingariya, @sourikghosh, @theBeginner86, @warunicorn19 and @zahertalab

From 0d00e9379701538b49d3b103f7a9465c81c6ab55 Mon Sep 17 00:00:00 2001
From: Lee Calcote <lee.calcote@layer5.io>
Date: Mon, 21 Mar 2022 15:34:44 -0500
Subject: [PATCH 16/27] Upgrade to checkout@v0.3.0

---
 .github/workflows/build-and-release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index fe059748609..7ee82a8654d 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.0
         with:
           fetch-depth: 1
       - name: Docker login
@@ -43,7 +43,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.0
         with:
             fetch-depth: 0
       - name: Set up Go

From a5250ed800707c357eca119bc2810b302cb32391 Mon Sep 17 00:00:00 2001
From: leecalcote <leecalcote@gmail.com>
Date: Mon, 21 Mar 2022 15:45:04 -0500
Subject: [PATCH 17/27] bump to 1.17

Signed-off-by: leecalcote <leecalcote@gmail.com>
---
 .github/workflows/ci.yml                    |   2 +-
 .github/workflows/go-testing-ci.yml         |   8 +-
 .github/workflows/mesheryctl-ci.yml         |   2 +-
 Dockerfile                                  |   2 +-
 go.mod                                      | 164 +++++++++++++++++++-
 install/docker-desktop-extension/Dockerfile |   2 +-
 6 files changed, 171 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87b1cf887c2..54fa99e918c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v3.0.0
       with:
-        go-version: '1.16.7'
+        go-version: '1.17'
     - name: Setup Cache
       uses: actions/cache@v3.0.0
       with:
diff --git a/.github/workflows/go-testing-ci.yml b/.github/workflows/go-testing-ci.yml
index 8acd376d496..ba83fe9878f 100644
--- a/.github/workflows/go-testing-ci.yml
+++ b/.github/workflows/go-testing-ci.yml
@@ -25,7 +25,7 @@ jobs:
     name: Unit tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.0.0
         with:
           fetch-depth: 2
       - name: Install lynx for xdg-open support
@@ -33,7 +33,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.16.7"
+          go-version: "1.17"
       - name: Run coverage
         run: go test --short ./... -race -coverprofile=coverage.txt -covermode=atomic
       - name: Upload coverage to Codecov
@@ -53,9 +53,9 @@ jobs:
       - name: Install lynx for xdg-open support
         run: sudo apt-get install lynx
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3.0.0
         with:
-          go-version: "1.16.7"
+          go-version: "1.17"
       - name: Create k8s Kind Cluster
         uses: helm/kind-action@v1.1.0
         with:
diff --git a/.github/workflows/mesheryctl-ci.yml b/.github/workflows/mesheryctl-ci.yml
index 586e6c25e5f..ed9c3320b65 100644
--- a/.github/workflows/mesheryctl-ci.yml
+++ b/.github/workflows/mesheryctl-ci.yml
@@ -59,7 +59,7 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-go-
     - name: goreleaser WITHOUT tag
-      uses: goreleaser/goreleaser-action@v2
+      uses: goreleaser/goreleaser-action@v2.8.0
       if: success() && startsWith(github.ref, 'refs/tags/') == false
       env:
         RELEASE_CHANNEL: "edge"
diff --git a/Dockerfile b/Dockerfile
index bf19ee58141..97dfceb4420 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16 as meshery-server
+FROM golang:1.17 as meshery-server
 ARG TOKEN
 ARG GIT_VERSION
 ARG GIT_COMMITSHA
diff --git a/go.mod b/go.mod
index 127c0dcd45a..886403ba37a 100644
--- a/go.mod
+++ b/go.mod
@@ -68,4 +68,166 @@ require (
 	sigs.k8s.io/controller-runtime v0.10.3
 )
 
-require github.com/opencontainers/image-spec v1.0.2 // indirect
+require (
+	cloud.google.com/go v0.99.0 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+	github.com/BurntSushi/toml v0.3.1 // indirect
+	github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
+	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/Masterminds/semver/v3 v3.1.1 // indirect
+	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
+	github.com/Masterminds/squirrel v1.5.2 // indirect
+	github.com/Microsoft/go-winio v0.4.17 // indirect
+	github.com/Microsoft/hcsshim v0.8.21 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/acomagu/bufpipe v1.0.3 // indirect
+	github.com/agnivade/levenshtein v1.1.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bsm/redislock v0.7.1 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/capnm/sysinfo v0.0.0-20130621111458-5909a53897f3 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
+	github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
+	github.com/containerd/containerd v1.5.7 // indirect
+	github.com/containerd/continuity v0.1.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/docker/cli v20.10.7+incompatible // indirect
+	github.com/docker/distribution v2.7.1+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.6.3 // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-metrics v0.0.1 // indirect
+	github.com/docker/go-units v0.4.0 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
+	github.com/fatih/color v1.13.0 // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/go-errors/errors v1.0.1 // indirect
+	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.3.1 // indirect
+	github.com/go-git/go-git/v5 v5.4.2 // indirect
+	github.com/go-logr/logr v0.4.0 // indirect
+	github.com/go-openapi/analysis v0.19.10 // indirect
+	github.com/go-openapi/errors v0.19.8 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/loads v0.19.5 // indirect
+	github.com/go-openapi/spec v0.19.8 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/go-openapi/validate v0.19.10 // indirect
+	github.com/go-redis/redis/v8 v8.11.4 // indirect
+	github.com/go-redis/redis_rate/v9 v9.1.2 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/btree v1.0.1 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/gosimple/unidecode v1.0.1 // indirect
+	github.com/gosuri/uitable v0.0.4 // indirect
+	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/huandu/xstrings v1.3.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.4 // indirect
+	github.com/jmoiron/sqlx v1.3.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
+	github.com/klauspost/compress v1.14.4 // indirect
+	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
+	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
+	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
+	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/mattn/go-sqlite3 v1.14.6 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/mitchellh/copystructure v1.1.1 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/mitchellh/reflectwalk v1.0.1 // indirect
+	github.com/moby/locker v1.0.1 // indirect
+	github.com/moby/spdystream v0.2.0 // indirect
+	github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d // indirect
+	github.com/nats-io/nkeys v0.3.0 // indirect
+	github.com/nats-io/nuid v1.0.1 // indirect
+	github.com/oklog/ulid v1.3.1 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.0.2 // indirect
+	github.com/opencontainers/runc v1.0.2 // indirect
+	github.com/pelletier/go-toml v1.9.4 // indirect
+	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/qri-io/jsonpointer v0.1.1 // indirect
+	github.com/rubenv/sql-migrate v0.0.0-20210614095031-55d5740dbbcc // indirect
+	github.com/russross/blackfriday v1.5.2 // indirect
+	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/shopspring/decimal v1.2.0 // indirect
+	github.com/spf13/afero v1.6.0 // indirect
+	github.com/spf13/cast v1.4.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/stretchr/testify v1.7.0 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	github.com/xanzy/ssh-agent v0.3.0 // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
+	github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
+	go.mongodb.org/mongo-driver v1.5.1 // indirect
+	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
+	golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
+	gopkg.in/gorp.v1 v1.7.2 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.66.2 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gorm.io/driver/sqlite v1.1.4 // indirect
+	helm.sh/helm/v3 v3.7.2 // indirect
+	k8s.io/apiserver v0.22.4 // indirect
+	k8s.io/cli-runtime v0.23.0-alpha.1 // indirect
+	k8s.io/component-base v0.23.0-alpha.1 // indirect
+	k8s.io/klog/v2 v2.10.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
+	k8s.io/kubectl v0.23.0-alpha.1 // indirect
+	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
+	oras.land/oras-go v0.4.0 // indirect
+	sigs.k8s.io/kustomize/api v0.10.1 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
+)
diff --git a/install/docker-desktop-extension/Dockerfile b/install/docker-desktop-extension/Dockerfile
index 5128f04d5f7..8bfcaf29d74 100644
--- a/install/docker-desktop-extension/Dockerfile
+++ b/install/docker-desktop-extension/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16 as meshery-server
+FROM golang:1.17 as meshery-server
 ARG TOKEN
 ARG GIT_VERSION
 ARG GIT_COMMITSHA

From 6ee553d048fa503113727f8eb2a61d0a94f12409 Mon Sep 17 00:00:00 2001
From: leecalcote <leecalcote@users.noreply.github.com>
Date: Mon, 21 Mar 2022 21:42:42 +0000
Subject: [PATCH 18/27] [Docs] Release Notes for Meshery

Signed-off-by: l5io <ci@layer5.io>
---
 docs/_releases/v0.6.0-rc-5d.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docs/_releases/v0.6.0-rc-5d.md

diff --git a/docs/_releases/v0.6.0-rc-5d.md b/docs/_releases/v0.6.0-rc-5d.md
new file mode 100644
index 00000000000..b86996779d7
--- /dev/null
+++ b/docs/_releases/v0.6.0-rc-5d.md
@@ -0,0 +1,16 @@
+---
+layout: release
+date: 2022-03-21
+tag: v0.6.0-rc-5d
+---
+
+## What's New
+## 🔤 General
+## 🧰 Maintenance
+
+- [CI] Chore: Bump to Golang 1.17 @leecalcote (#5243)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@leecalcote

From 49f4ee3511b5447aaf603c8c4e74e9a0cf8e4927 Mon Sep 17 00:00:00 2001
From: Lee Calcote <lee.calcote@layer5.io>
Date: Mon, 21 Mar 2022 21:53:20 -0500
Subject: [PATCH 19/27] go 1.17

---
 .github/workflows/build-and-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 7ee82a8654d..f63a162ea38 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -49,7 +49,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3.0.0
         with:
-          go-version: ${{ secrets.GO_VERSION }}
+          go-version: 1.17
       - name: goreleaser with tag
         uses: goreleaser/goreleaser-action@v2.8.0
         env:

From 06d7c8028aa68a53b07795091fa4b3992150dded Mon Sep 17 00:00:00 2001
From: leecalcote <leecalcote@gmail.com>
Date: Mon, 21 Mar 2022 22:12:49 -0500
Subject: [PATCH 20/27] dde update

Signed-off-by: leecalcote <leecalcote@gmail.com>
---
 .github/workflows/build-and-release-edge.yml | 4 ++--
 .github/workflows/helm-chart-releaser.yml    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-release-edge.yml b/.github/workflows/build-and-release-edge.yml
index 71883b9874f..fe079183417 100644
--- a/.github/workflows/build-and-release-edge.yml
+++ b/.github/workflows/build-and-release-edge.yml
@@ -9,13 +9,13 @@ on:
 jobs:
   build:
     name: Docker build and push
-    if: github.repository == 'meshery/meshery'
+    if: github.repository == 'meshery/meshery' && github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
     env:
       RELEASE_CHANNEL: "edge"
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 1
       - name: Docker login
diff --git a/.github/workflows/helm-chart-releaser.yml b/.github/workflows/helm-chart-releaser.yml
index c9a6a63d7b9..47772b9da42 100644
--- a/.github/workflows/helm-chart-releaser.yml
+++ b/.github/workflows/helm-chart-releaser.yml
@@ -24,8 +24,8 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{github.event_name == 'pull_request'}}
     steps:
-    - uses: actions/checkout@v2
-    - uses: azure/setup-helm@v1
+    - uses: actions/checkout@v3
+    - uses: azure/setup-helm@v2.0
       with:
         version: 'v3.6.0' # default is latest stable
       id: install
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }} && ${{ github.ref == 'refs/heads/master' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: set env
         id: vars
         # https://github.community/t/how-to-get-just-the-tag-name/16241/7

From 0d9e2aa3f950dd98e7d13b3767a340e1d0739330 Mon Sep 17 00:00:00 2001
From: leecalcote <leecalcote@gmail.com>
Date: Mon, 21 Mar 2022 22:13:03 -0500
Subject: [PATCH 21/27] action version upgrade

Signed-off-by: leecalcote <leecalcote@gmail.com>
---
 .github/workflows/build-and-preview-site.yml |  6 +--
 .github/workflows/build-dde.yml              | 41 ++++++++++++++++++--
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-preview-site.yml b/.github/workflows/build-and-preview-site.yml
index ed4b7a26119..ca18462b900 100644
--- a/.github/workflows/build-and-preview-site.yml
+++ b/.github/workflows/build-and-preview-site.yml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v3
         with:
           persist-credentials: false
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@v1.99.0
         with:
           ruby-version: 2.7.5 # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
@@ -26,7 +26,7 @@ jobs:
       - name: Zip Site
         run: bash docs/script.sh
       - name: Upload files
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: site-dir
           path: ./site-dir.zip
diff --git a/.github/workflows/build-dde.yml b/.github/workflows/build-dde.yml
index 4706e9019e0..255282f8649 100644
--- a/.github/workflows/build-dde.yml
+++ b/.github/workflows/build-dde.yml
@@ -11,15 +11,15 @@ on:
 
 
 jobs:
-  build:
-    name: Docker build and push
-    if: github.repository == 'meshery/meshery'
+  edge-build:
+    name: Docker build and push (edge release)
+    if: github.repository == 'meshery/meshery' && startsWith(github.ref, 'refs/tags/') != true && success()
     env:
       RELEASE_CHANNEL: "edge"
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 1
       - name: Delete default files present at project root
@@ -42,3 +42,36 @@ jobs:
         run: |
           docker push meshery/meshery-docker-desktop-extension:edge-latest
           docker push meshery/meshery-docker-desktop-extension:edge-${GITHUB_SHA::8}
+  stable-build:
+    name: Docker build and push (edge release)
+    if: github.repository == 'meshery/meshery' && github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
+    env:
+      RELEASE_CHANNEL: "stable"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+      - name: Delete default files present at project root
+        run: |
+          rm Dockerfile
+          rm .dockerignore
+      - name: Move files from ./install/docker-desktop-extension to project root
+        run: |
+          mv ./install/docker-desktop-extension/* ./
+      - name: Docker login
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Docker stable build & tag
+        run: |
+          DOCKER_BUILDKIT=1 docker build --no-cache -t meshery/meshery-docker-desktop-extension:stable-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::8} --build-arg GIT_VERSION="stable-latest" --build-arg RELEASE_CHANNEL=${RELEASE_CHANNEL} .
+          docker tag meshery/meshery-docker-desktop-extension:stable-latest meshery/meshery-docker-desktop-extension:stable-${GITHUB_SHA::8}
+      - name: Docker stable push
+        run: |
+          docker push meshery/meshery-docker-desktop-extension:stable-latest
+          docker push meshery/meshery-docker-desktop-extension:stable-${GITHUB_SHA::8}
+
+

From 002fd6ba342c223c38d8ac04fcaa04b7c9a99a27 Mon Sep 17 00:00:00 2001
From: leecalcote <leecalcote@users.noreply.github.com>
Date: Tue, 22 Mar 2022 03:28:19 +0000
Subject: [PATCH 22/27] [Docs] Release Notes for Meshery

Signed-off-by: l5io <ci@layer5.io>
---
 docs/_releases/v0.6.0-rc-5f.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docs/_releases/v0.6.0-rc-5f.md

diff --git a/docs/_releases/v0.6.0-rc-5f.md b/docs/_releases/v0.6.0-rc-5f.md
new file mode 100644
index 00000000000..175963a183b
--- /dev/null
+++ b/docs/_releases/v0.6.0-rc-5f.md
@@ -0,0 +1,16 @@
+---
+layout: release
+date: 2022-03-22
+tag: v0.6.0-rc-5f
+---
+
+## What's New
+## 🔤 General
+## 📖 Documentation
+
+- Style the version component @AbhishekJamhoriya (#5054)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@AbhishekJamhoriya and @leecalcote

From 42d2163150c14c4836095d57624d96fe53dc9e1f Mon Sep 17 00:00:00 2001
From: Revolyssup <Revolyssup@users.noreply.github.com>
Date: Tue, 22 Mar 2022 07:48:11 +0000
Subject: [PATCH 23/27] [Docs] Test status of adapter

Signed-off-by: l5io <ci@layer5.io>
---
 .../meshery-istio/03-22-2022-07-48-03_21a7ae54.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md

diff --git a/docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md b/docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md
new file mode 100644
index 00000000000..30c9827fe39
--- /dev/null
+++ b/docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md
@@ -0,0 +1,15 @@
+---
+timestamp: "2022-03-22 07:47:48 UTC Tue"
+meshery-component: meshery-istio
+meshery-component-version: edge
+meshery-server-version: "v0.6.0-rc-5f"
+k8s-distro: minikube
+k8s-version: "v1.20.1"
+service-mesh: istio
+service-mesh-version: "1.13.2"
+tests:
+  istiod: "Running"
+  istio-egressgateway: "Running"
+  istio-ingressgateway:  "Running"
+overall-status: "passing"
+---

From c86d2a25590fa4f2b98013a8c8e49f67404f6bdf Mon Sep 17 00:00:00 2001
From: Revolyssup <Revolyssup@users.noreply.github.com>
Date: Tue, 22 Mar 2022 07:48:34 +0000
Subject: [PATCH 24/27] [Docs] Test status of adapter

Signed-off-by: l5io <ci@layer5.io>
---
 .../meshery-istio/03-22-2022-07-48-03_21a7ae54.md               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md b/docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md
index 30c9827fe39..f06006ebaa2 100644
--- a/docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md
+++ b/docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md
@@ -11,5 +11,7 @@ tests:
   istiod: "Running"
   istio-egressgateway: "Running"
   istio-ingressgateway:  "Running"
+  grafana-addon: null
+  prometheus-addon: null
 overall-status: "passing"
 ---

From 497ea97dcfabeda1ea00601c7907c1ff1a7c5335 Mon Sep 17 00:00:00 2001
From: Revolyssup <Revolyssup@users.noreply.github.com>
Date: Tue, 22 Mar 2022 07:58:37 +0000
Subject: [PATCH 25/27] [Docs] Test status of adapter

Signed-off-by: l5io <ci@layer5.io>
---
 .../03-22-2022-07-58-03_26d264be.md             | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 docs/_compatibility/meshery-traefik-mesh/03-22-2022-07-58-03_26d264be.md

diff --git a/docs/_compatibility/meshery-traefik-mesh/03-22-2022-07-58-03_26d264be.md b/docs/_compatibility/meshery-traefik-mesh/03-22-2022-07-58-03_26d264be.md
new file mode 100644
index 00000000000..f7ed34dd565
--- /dev/null
+++ b/docs/_compatibility/meshery-traefik-mesh/03-22-2022-07-58-03_26d264be.md
@@ -0,0 +1,17 @@
+---
+timestamp: "2022-03-22 07:58:11 UTC Tue"
+meshery-component: meshery-traefik-mesh
+meshery-component-version: edge
+meshery-server-version: "v0.6.0-rc-5f"
+k8s-distro: minikube
+k8s-version: "v1.20.1"
+service-mesh: traefik-mesh
+service-mesh-version: ""
+tests:
+  traefik-mesh-controller: "Running"
+  traefik-mesh-proxy: "Running"
+  grafana-core:  "Running"
+  jaeger: "Running"
+  prometheus-core: "Running" 
+overall-status: "passing"
+---

From 257d3e529855f0c323452d378d38c6151ffb2d92 Mon Sep 17 00:00:00 2001
From: leecalcote <leecalcote@users.noreply.github.com>
Date: Tue, 22 Mar 2022 14:03:24 +0000
Subject: [PATCH 26/27] [Docs] Test status of adapter

Signed-off-by: l5io <ci@layer5.io>
---
 .../meshery-istio/03-22-2022-14-03-03_1f49c36a.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md

diff --git a/docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md b/docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md
new file mode 100644
index 00000000000..1eccf06e6e6
--- /dev/null
+++ b/docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md
@@ -0,0 +1,15 @@
+---
+timestamp: "2022-03-22 14:03:12 UTC Tue"
+meshery-component: meshery-istio
+meshery-component-version: edge
+meshery-server-version: "v0.6.0-rc-5f"
+k8s-distro: minikube
+k8s-version: "v1.20.1"
+service-mesh: istio
+service-mesh-version: "1.13.2"
+tests:
+  istiod: "Running"
+  istio-egressgateway: "Running"
+  istio-ingressgateway:  "Running"
+overall-status: "passing"
+---

From f9e4b52a172d4652241a48c906c8032d7ca7c18d Mon Sep 17 00:00:00 2001
From: leecalcote <leecalcote@users.noreply.github.com>
Date: Tue, 22 Mar 2022 14:03:49 +0000
Subject: [PATCH 27/27] [Docs] Test status of adapter

Signed-off-by: l5io <ci@layer5.io>
---
 .../meshery-istio/03-22-2022-14-03-03_1f49c36a.md               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md b/docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md
index 1eccf06e6e6..bcf7bd800ee 100644
--- a/docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md
+++ b/docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md
@@ -11,5 +11,7 @@ tests:
   istiod: "Running"
   istio-egressgateway: "Running"
   istio-ingressgateway:  "Running"
+  grafana-addon: "Running"
+  prometheus-addon: "Running"
 overall-status: "passing"
 ---