From 6f44672b4bb47f4ac3340f5b19456fc03d86b28a Mon Sep 17 00:00:00 2001 From: Andrew S Date: Mon, 19 Apr 2021 19:21:37 +0600 Subject: [PATCH 1/6] #36 embedded youtube video and asciinema Embedded link to asciinema cast into README-RU.md and README.md. Embedded youtube video in russian into README-RU.md. Marked as sensitive kubeconfig output. --- README-RU.md | 4 ++++ README.md | 2 ++ terraform/layer1-aws/outputs.tf | 1 + 3 files changed, 7 insertions(+) diff --git a/README-RU.md b/README-RU.md index e8bb80f0..e1af0f70 100644 --- a/README-RU.md +++ b/README-RU.md @@ -3,6 +3,7 @@ [![Developed by Mad Devs](https://maddevs.io/badge-dark.svg)](https://maddevs.io/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) +[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB?speed=2) ## Преимущества этого бойлерплейта @@ -29,6 +30,9 @@ Могут возникнуть справедливые вопросы к количеству `.tf` файлов. Оно конечно просится на рефакторинг и "обмодуливание". Чем мы и займемся в ближайшее время, разбивая этот монолит на микромодули и вводя `terragrunt`, попутно решая озвученные проблемы выше. +Смотрите более подробно о нашем бойлерплейте на видео: +[![boilerplate youtube video](https://img.youtube.com/vi/loqSDGgtmKg/0.jpg)](https://youtu.be/loqSDGgtmKg) + ## Оглавление - [Архитектурная схема](#архитектурная-схема) diff --git a/README.md b/README.md index 9a02a639..9620bfbf 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ [![Developed by Mad Devs](https://maddevs.io/badge-dark.svg)](https://maddevs.io?utm_source=github&utm_medium=madboiler) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) +[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB?speed=2) + ## Advantages of this boilerplate - **Infrastructure as Code (IaC)**: using Terraform, you get an infrastructure that’s smooth and efficient diff --git a/terraform/layer1-aws/outputs.tf b/terraform/layer1-aws/outputs.tf index ddd8d0cd..a5bddbfb 100644 --- a/terraform/layer1-aws/outputs.tf +++ b/terraform/layer1-aws/outputs.tf @@ -92,6 +92,7 @@ output "eks_cluster_security_group_id" { output "eks_kubectl_config" { description = "kubectl config as generated by the module." value = module.eks.kubeconfig + sensitive = true } output "eks_kubectl_console_config" { From 5fb8c423662a3d9690e251a828c270e4f9f63828 Mon Sep 17 00:00:00 2001 From: Andrew S Date: Mon, 19 Apr 2021 19:24:25 +0600 Subject: [PATCH 2/6] #36 added new string to fix youtube video embedding --- README-RU.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README-RU.md b/README-RU.md index e1af0f70..69bfffd9 100644 --- a/README-RU.md +++ b/README-RU.md @@ -31,6 +31,7 @@ Могут возникнуть справедливые вопросы к количеству `.tf` файлов. Оно конечно просится на рефакторинг и "обмодуливание". Чем мы и займемся в ближайшее время, разбивая этот монолит на микромодули и вводя `terragrunt`, попутно решая озвученные проблемы выше. Смотрите более подробно о нашем бойлерплейте на видео: + [![boilerplate youtube video](https://img.youtube.com/vi/loqSDGgtmKg/0.jpg)](https://youtu.be/loqSDGgtmKg) ## Оглавление From e75a889678fb829ff41b60c6b280c4da30051b28 Mon Sep 17 00:00:00 2001 From: Andrew S Date: Mon, 19 Apr 2021 19:31:03 +0600 Subject: [PATCH 3/6] #36 added autoplay for asciinema --- README-RU.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-RU.md b/README-RU.md index 69bfffd9..a92f0432 100644 --- a/README-RU.md +++ b/README-RU.md @@ -3,7 +3,7 @@ [![Developed by Mad Devs](https://maddevs.io/badge-dark.svg)](https://maddevs.io/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB?speed=2) +[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB??autoplay=1&speed=2) ## Преимущества этого бойлерплейта diff --git a/README.md b/README.md index 9620bfbf..073af8a4 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Developed by Mad Devs](https://maddevs.io/badge-dark.svg)](https://maddevs.io?utm_source=github&utm_medium=madboiler) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB?speed=2) +[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB??autoplay=1&speed=2) ## Advantages of this boilerplate From eed815c52748830475044112a59595d74e388c59 Mon Sep 17 00:00:00 2001 From: Andrew S Date: Mon, 19 Apr 2021 19:32:36 +0600 Subject: [PATCH 4/6] #36 fixed ? typo --- README-RU.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-RU.md b/README-RU.md index a92f0432..4e751d42 100644 --- a/README-RU.md +++ b/README-RU.md @@ -3,7 +3,7 @@ [![Developed by Mad Devs](https://maddevs.io/badge-dark.svg)](https://maddevs.io/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB??autoplay=1&speed=2) +[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB?autoplay=1&speed=2) ## Преимущества этого бойлерплейта diff --git a/README.md b/README.md index 073af8a4..181c9070 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Developed by Mad Devs](https://maddevs.io/badge-dark.svg)](https://maddevs.io?utm_source=github&utm_medium=madboiler) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB??autoplay=1&speed=2) +[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB?autoplay=1&speed=2) ## Advantages of this boilerplate From 741f9c7a52e46d331f5b3ff48b2d114859e73f43 Mon Sep 17 00:00:00 2001 From: Andrew S Date: Tue, 20 Apr 2021 16:19:29 +0600 Subject: [PATCH 5/6] #36 changed asciinema position --- README-RU.md | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README-RU.md b/README-RU.md index 4e751d42..33f57775 100644 --- a/README-RU.md +++ b/README-RU.md @@ -3,8 +3,6 @@ [![Developed by Mad Devs](https://maddevs.io/badge-dark.svg)](https://maddevs.io/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB?autoplay=1&speed=2) - ## Преимущества этого бойлерплейта - Инфраструктура как код (IaC): используя Terraform, вы получаете налаженную и продуктивную инфраструктуру @@ -20,6 +18,8 @@ - Экономит время: вы можете потратить недели на собственные поиски и неизбежные ошибки, чтобы построить такую инфраструктуру. Или же вы можете положиться на этот бойлерплейт и поднять нужную инфраструктуру в течение дня - Свободный: мы рады делиться результатами своей работы +[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB?autoplay=1&speed=2) + ## Описание В данном репозитории собраны наработки команды Mad Devs для быстрого развертывания Kubernetes кластера, вспомогательных сервисов и нижележащей инфраструктуры в облаке Amazon. Основным инструментом разработки и поставки является [terraform](https://www.terraform.io/) diff --git a/README.md b/README.md index 181c9070..00a1b4cb 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ [![Developed by Mad Devs](https://maddevs.io/badge-dark.svg)](https://maddevs.io?utm_source=github&utm_medium=madboiler) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB?autoplay=1&speed=2) - ## Advantages of this boilerplate - **Infrastructure as Code (IaC)**: using Terraform, you get an infrastructure that’s smooth and efficient @@ -20,6 +18,8 @@ - **Saves time**: you can spend weeks doing your own research and making the unavoidable mistakes to build an infrastructure like this. Instead, you can rely on this boilerplate and create the infrastructure you need within a day - **It’s free**: we’re happy to share the results of our work +[![boilerplate asciicast](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB.png)](https://asciinema.org/a/wCS0HdC6UViWDKO7GypyIJjaB?autoplay=1&speed=2) + ## Description This repository contains the know-how of the Mad Devs team for the rapid deployment of a Kubernetes cluster, supporting services, and the underlying infrastructure in the Amazon cloud. The main development and delivery tool is [terraform](https://www.terraform.io/) From 19ad99dad6232f59c46e74e6ce61367b435c1436 Mon Sep 17 00:00:00 2001 From: mglotov <37855803+mglotov@users.noreply.github.com> Date: Tue, 20 Apr 2021 16:29:43 +0600 Subject: [PATCH 6/6] Fixed Readme --- README-RU.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-RU.md b/README-RU.md index 33f57775..f47b8568 100644 --- a/README-RU.md +++ b/README-RU.md @@ -30,7 +30,7 @@ Могут возникнуть справедливые вопросы к количеству `.tf` файлов. Оно конечно просится на рефакторинг и "обмодуливание". Чем мы и займемся в ближайшее время, разбивая этот монолит на микромодули и вводя `terragrunt`, попутно решая озвученные проблемы выше. -Смотрите более подробно о нашем бойлерплейте на видео: +Более подробно о нашем бойлерплейте смотрите в видео: [![boilerplate youtube video](https://img.youtube.com/vi/loqSDGgtmKg/0.jpg)](https://youtu.be/loqSDGgtmKg)