diff --git a/docs/index.md b/docs/index.md
index 76274df8..6ea1fd8b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -29,7 +29,7 @@ Microservices architectures rely on DevOps practices, automation, CI/CD (continu
- [API Landscape](https://www.apidays.co/api-landscape)
- [From Java EE To Cloud Native](javaee-to-cloud-native.md)
- [Microservices FAQ & Kubernetes Native](faq.md)
- - [Serverless with OpenFaaS & Knative](serverless.md)
+ - [Serverless with OpenFaaS, Knative & Kubeless](serverless.md)
2. [DevOps](devops.md)
3. [CI/CD - Continuous Integration & Continuous Delivery](cicd.md)
- [Git & Git Patterns. Git Flow & Trunk. CI/CD BOTs π](git.md)
@@ -99,8 +99,8 @@ Microservices architectures rely on DevOps practices, automation, CI/CD (continu
- [Java - Spring Cloud](SpringCloud.md)
- [Java - Jakarta EE](https://jakarta.ee/)
- [Java - Quarkus](quarkus.md)
- - [Python](python.md)
- - [Serverless](https://www.serverless.com/)
+ - [Python - Django & Flask](python.md)
+ - [Serverless Architectures & Frameworks](serverless.md)
- [Xamarin](xamarin.md)
19. [APIs and RESTful Architecture](apis-and-restful-architecture.md)
- [API Marketplaces and Developer Portalsπ](developerportals.md)
diff --git a/docs/python.md b/docs/python.md
index 93f878e5..14588322 100644
--- a/docs/python.md
+++ b/docs/python.md
@@ -1,21 +1,20 @@
-- [Python](#python)
- - [Python Blogs and Forums](#python-blogs-and-forums)
- - [Python docs](#python-docs)
- - [Python Django](#python-django)
- - [Python Flask](#python-flask)
- - [Python pip and pip's wheel](#python-pip-and-pips-wheel)
- - [Python Feature Flags](#python-feature-flags)
- - [Python testing](#python-testing)
- - [Data Science. Python Pandas and pivot tables](#data-science-python-pandas-and-pivot-tables)
- - [PandasDatabase](#pandasdatabase)
- - [Python standard library Modules and Code](#python-standard-library-modules-and-code)
- - [Python and AWS](#python-and-aws)
- - [Python Tools](#python-tools)
- - [Web Scraping with Python](#web-scraping-with-python)
- - [Jython](#jython)
- - [Eclipse IDE](#eclipse-ide)
+- [Python Blogs and Forums](#python-blogs-and-forums)
+- [Python docs](#python-docs)
+- [Python Django Framework](#python-django-framework)
+- [Python Flask Lightweight Framework (microframework)](#python-flask-lightweight-framework-microframework)
+- [Python pip and pip's wheel](#python-pip-and-pips-wheel)
+- [Python Feature Flags](#python-feature-flags)
+- [Python testing](#python-testing)
+- [Data Science. Python Pandas and pivot tables](#data-science-python-pandas-and-pivot-tables)
+ - [PandasDatabase](#pandasdatabase)
+- [Python standard library Modules and Code](#python-standard-library-modules-and-code)
+- [Python and AWS](#python-and-aws)
+- [Python Tools](#python-tools)
+ - [Web Scraping with Python](#web-scraping-with-python)
+- [Jython](#jython)
+- [Eclipse IDE](#eclipse-ide)
@@ -95,7 +94,7 @@
-## Python Django
+## Python Django Framework
- [gettopical.com: Get Django Latest News](http://gettopical.com/djangoframework)
- [Learn Python Django in 4 Hours](https://dzone.com/articles/learn-python-django-in-4-hours)
- [realpython.com: Django Development With Docker Compose and Machine](https://realpython.com/blog/python/django-development-with-docker-compose-and-machine/)
@@ -115,7 +114,9 @@
- [Part 2 Supplementary Code](https://github.com/TrackMaven/getting-started-with-drf-angular/tree/part-2)
- [webcodegeeks.com: Python Django Tutorial](http://www.webcodegeeks.com/python/python-django-tutorial/)
-## Python Flask
+## Python Flask Lightweight Framework (microframework)
+- Flask is a Python lightweight web application development framework with simplicity and extensibility. Flask is called **βmicroframeworkβ** because of using a simple core and extensions are used to add other functions.
+- [Flask Documentation πππ](https://flask.palletsprojects.com/)
- [The Flask Mega-Tutorial: Now with Python 3 Support](http://blog.miguelgrinberg.com/post/the-flask-mega-tutorial-now-with-python-3-support)
- [realpython.com: Discover Flask, Part 1 - Setting Up a Static Site ](https://realpython.com/blog/python/introduction-to-flask-part-1-setting-up-a-static-site/)
- [Two-Factor Authentication with Authy](https://www.twilio.com/docs/tutorials/walkthrough/two-factor-authentication/python/flask)
diff --git a/docs/serverless.md b/docs/serverless.md
index 6342744a..0bb646f2 100644
--- a/docs/serverless.md
+++ b/docs/serverless.md
@@ -1,23 +1,55 @@
-# Serverless Architectures
+# Serverless Architectures and Frameworks
+- [Serverless Architectures](#serverless-architectures)
+ - [FaaS: Function as a Service](#faas-function-as-a-service)
+ - [Serverless Ecosystems Comparison](#serverless-ecosystems-comparison)
+- [Serverless Framework (the most popular serverless ecosystem)](#serverless-framework-the-most-popular-serverless-ecosystem)
+- [Orchestrators of Functions on Kubernetes (aka Kubernetes Native Serverless Frameworks or FaaS Providers)](#orchestrators-of-functions-on-kubernetes-aka-kubernetes-native-serverless-frameworks-or-faas-providers)
+ - [OpenFaaS](#openfaas)
+ - [Knative](#knative)
+ - [Kubeless](#kubeless)
+ - [OpenWhisk](#openwhisk)
+- [Popular Deployment Frameworks for AWS Lambda](#popular-deployment-frameworks-for-aws-lambda)
+
+## Serverless Architectures
* [martinfowler.com: Serverless Architectures](https://martinfowler.com/articles/serverless.html)
-
-## Serverless Frameworks
-* [epsagon.com: Serverless Open-Source Frameworks: **OpenFaaS**, **Knative**, & More πππ](https://epsagon.com/blog/serverless-open-source-frameworks-openfaas-knative-more/)
* [itnext.io: Scaling My App: Serverless vs Kubernetes πππ](https://itnext.io/scaling-my-app-serverless-vs-kubernetes-cdb8adf446e1)
+* [serverless.com: Comparisons - Serverless vs. other tools](https://www.serverless.com/learn/comparisons/)
-## FaaS: Function as a Service
+### FaaS: Function as a Service
* [wikipedia: FaaS Function as a Service](https://en.wikipedia.org/wiki/Function_as_a_service)
* [redhat.com: What is Function-as-a-Service (FaaS)?](https://www.redhat.com/en/topics/cloud-native-apps/what-is-faas)
* [stackify.com: What Is Function-as-a-Service? Serverless Architectures Are Here!](https://stackify.com/function-as-a-service-serverless-architecture/)
-## OpenFaaS
+### Serverless Ecosystems Comparison
+* [fauna.com: How does FaaS compare to PaaS and CaaS. A Comparison of Serverless Function (FaaS) Providers](https://fauna.com/blog/comparison-faas-providers)
+* [techbeacon.com: An essential guide to the 2019 serverless ecosystem](https://techbeacon.com/enterprise-it/essential-guide-2019-serverless-ecosystem) The Serverless Framework, the most popular option, offers integrations with all major platform providers. Others to consider include (in alphabetical order): Architect (Node, AWS), Chalice (Python, AWS), Claudia.js (Node, AWS), Dawson (Node, AWS), DEEP (Node, AWS), Flogo (Go, AWS), Lambada Framework (Java, AWS), Python-Lambda (Python, AWS), Pulumi (Node/Python/Go, AWS/Azure/GCP/Kubernetes), Shep (Node, AWS), Sparta (Go, AWS), Spring Cloud Function (Java, AWS/Azure/OpenWhisk), and Zappa (Python, AWS).
+
+## Serverless Framework (the most popular serverless ecosystem)
+* [serverless.com: Serverless Framework](https://www.serverless.com/)
+
+## Orchestrators of Functions on Kubernetes (aka Kubernetes Native Serverless Frameworks or FaaS Providers)
+* [epsagon.com: Serverless Open-Source Frameworks: **OpenFaaS**, **Knative**, & More πππ](https://epsagon.com/blog/serverless-open-source-frameworks-openfaas-knative-more/)
+* [winderresearch.com: A Comparison of Serverless Frameworks for Kubernetes: OpenFaas, OpenWhisk, Fission, Kubeless and more](https://winderresearch.com/a-comparison-of-serverless-frameworks-for-kubernetes-openfaas-openwhisk-fission-kubeless-and-more/)
+* [vshn.ch: A (Very!) Quick Comparison of Kubernetes Serverless Frameworks](https://vshn.ch/en/blog/a-very-quick-comparison-of-kubernetes-serverless-frameworks/)
+
+### OpenFaaS
* [OpenFaaS](https://www.openfaas.com/)
* [itnext.io: Deploy your first Serverless Function to Kubernetes](https://itnext.io/deploy-your-first-serverless-function-to-kubernetes-232307f7b0a9)
* [magalix.com: Implementing FaaS in Kubernetes Using Kubeless](https://www.magalix.com/blog/implementing-faas-in-kubernetes-using-kubeless)
* [itnext.io: **arkade** by example β Kubernetes apps, the easy way π](https://itnext.io/kubernetes-apps-the-easy-way-f06d9e5cad3c)
* [xenonstack.com: Serverless Architecture with OpenFaaS and Java](https://www.xenonstack.com/blog/serverless-openfaas-java/)
-## Knative
+### Knative
* [knative.dev](https://knative.dev/)
+### Kubeless
+* [kubeless.io](https://kubeless.io/)
+* [medium.com: Serverless - Build a Serverless Simple Flask Application with Kubeless on top of Kubernetes](https://medium.com/@peiruwang/serverless-build-a-serverless-simple-flask-application-with-kubeless-on-top-of-kubernetes-95c6682c3750)
+
+### OpenWhisk
+* [openwhisk.apache.org](https://openwhisk.apache.org/)
+
+## Popular Deployment Frameworks for AWS Lambda
+* [lumigo.io: AWS Lambda Deployment Frameworks Compared](https://lumigo.io/blog/comparison-of-lambda-deployment-frameworks/)
+
[](https://www.xenonstack.com/blog/serverless-openfaas-java/)
diff --git a/mkdocs.yml b/mkdocs.yml
index e172c5b8..2f3f69ae 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -25,7 +25,7 @@ pages:
- Openshift VS Kubernetes: introduction.md
- From Java EE To Cloud Native: javaee-to-cloud-native.md
- Microservices FAQ & Kubernetes Native: faq.md
- - Serverless with OpenFaaS & Knative: serverless.md
+ - Serverless with OpenFaaS, Knative & Kubeless: serverless.md
- DevOps: devops.md
- CI/CD:
- CI/CD - Continuous Integration & Continuous Delivery: cicd.md
@@ -91,7 +91,8 @@ pages:
- Java - SpringBoot: SpringBoot.md
- Java - Spring Cloud: SpringCloud.md
- Java - Quarkus: quarkus.md
- - Python: python.md
+ - Python - Django & Flask: python.md
+ - Serverless Architectures & Frameworks: serverless.md
- Xamarin: xamarin.md
- APIs:
- APIs and RESTful Architecture: apis-and-restful-architecture.md