From 31e23477d64ce96eac24e5efa0fffd376f5979e2 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Fri, 24 May 2019 12:12:54 -0500 Subject: [PATCH] Prepare cards and scripts --- prepare-vms/settings/admin-dmuc.yaml | 28 ---- prepare-vms/settings/admin-kubenet.yaml | 28 ---- prepare-vms/settings/admin-kuberouter.yaml | 28 ---- prepare-vms/settings/admin-test.yaml | 28 ---- .../settings/{fundamentals.yaml => day1.yaml} | 2 +- .../settings/{jerome.yaml => day2.yaml} | 0 prepare-vms/settings/enix.yaml | 29 ---- prepare-vms/settings/example.yaml | 30 ----- prepare-vms/settings/kube101.yaml | 31 ----- prepare-vms/settings/swarm.yaml | 30 ----- prepare-vms/templates/admin.html | 124 ------------------ prepare-vms/templates/cards.html | 106 --------------- prepare-vms/templates/enix.html | 121 ----------------- prepare-vms/templates/jerome.html | 29 +--- prepare-vms/templates/kube101.html | 106 --------------- 15 files changed, 5 insertions(+), 715 deletions(-) delete mode 100644 prepare-vms/settings/admin-dmuc.yaml delete mode 100644 prepare-vms/settings/admin-kubenet.yaml delete mode 100644 prepare-vms/settings/admin-kuberouter.yaml delete mode 100644 prepare-vms/settings/admin-test.yaml rename prepare-vms/settings/{fundamentals.yaml => day1.yaml} (96%) rename prepare-vms/settings/{jerome.yaml => day2.yaml} (100%) delete mode 100644 prepare-vms/settings/enix.yaml delete mode 100644 prepare-vms/settings/example.yaml delete mode 100644 prepare-vms/settings/kube101.yaml delete mode 100644 prepare-vms/settings/swarm.yaml delete mode 100644 prepare-vms/templates/admin.html delete mode 100644 prepare-vms/templates/cards.html delete mode 100644 prepare-vms/templates/enix.html delete mode 100644 prepare-vms/templates/kube101.html diff --git a/prepare-vms/settings/admin-dmuc.yaml b/prepare-vms/settings/admin-dmuc.yaml deleted file mode 100644 index 70ac6ec6..00000000 --- a/prepare-vms/settings/admin-dmuc.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Number of VMs per cluster -clustersize: 1 - -# The hostname of each node will be clusterprefix + a number -clusterprefix: dmuc - -# Jinja2 template to use to generate ready-to-cut cards -cards_template: admin.html - -# Use "Letter" in the US, and "A4" everywhere else -paper_size: A4 - -# Feel free to reduce this if your printer can handle it -paper_margin: 0.2in - -# Note: paper_size and paper_margin only apply to PDF generated with pdfkit. -# If you print (or generate a PDF) using ips.html, they will be ignored. -# (The equivalent parameters must be set from the browser's print dialog.) - -# This can be "test" or "stable" -engine_version: stable - -# These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 -machine_version: 0.14.0 - -# Password used to connect with the "docker user" -docker_user_password: training diff --git a/prepare-vms/settings/admin-kubenet.yaml b/prepare-vms/settings/admin-kubenet.yaml deleted file mode 100644 index 8256fc65..00000000 --- a/prepare-vms/settings/admin-kubenet.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Number of VMs per cluster -clustersize: 3 - -# The hostname of each node will be clusterprefix + a number -clusterprefix: kubenet - -# Jinja2 template to use to generate ready-to-cut cards -cards_template: admin.html - -# Use "Letter" in the US, and "A4" everywhere else -paper_size: A4 - -# Feel free to reduce this if your printer can handle it -paper_margin: 0.2in - -# Note: paper_size and paper_margin only apply to PDF generated with pdfkit. -# If you print (or generate a PDF) using ips.html, they will be ignored. -# (The equivalent parameters must be set from the browser's print dialog.) - -# This can be "test" or "stable" -engine_version: stable - -# These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 -machine_version: 0.14.0 - -# Password used to connect with the "docker user" -docker_user_password: training diff --git a/prepare-vms/settings/admin-kuberouter.yaml b/prepare-vms/settings/admin-kuberouter.yaml deleted file mode 100644 index 3f903065..00000000 --- a/prepare-vms/settings/admin-kuberouter.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Number of VMs per cluster -clustersize: 3 - -# The hostname of each node will be clusterprefix + a number -clusterprefix: kuberouter - -# Jinja2 template to use to generate ready-to-cut cards -cards_template: admin.html - -# Use "Letter" in the US, and "A4" everywhere else -paper_size: A4 - -# Feel free to reduce this if your printer can handle it -paper_margin: 0.2in - -# Note: paper_size and paper_margin only apply to PDF generated with pdfkit. -# If you print (or generate a PDF) using ips.html, they will be ignored. -# (The equivalent parameters must be set from the browser's print dialog.) - -# This can be "test" or "stable" -engine_version: stable - -# These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 -machine_version: 0.14.0 - -# Password used to connect with the "docker user" -docker_user_password: training diff --git a/prepare-vms/settings/admin-test.yaml b/prepare-vms/settings/admin-test.yaml deleted file mode 100644 index ac9679be..00000000 --- a/prepare-vms/settings/admin-test.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# Number of VMs per cluster -clustersize: 3 - -# The hostname of each node will be clusterprefix + a number -clusterprefix: test - -# Jinja2 template to use to generate ready-to-cut cards -cards_template: admin.html - -# Use "Letter" in the US, and "A4" everywhere else -paper_size: A4 - -# Feel free to reduce this if your printer can handle it -paper_margin: 0.2in - -# Note: paper_size and paper_margin only apply to PDF generated with pdfkit. -# If you print (or generate a PDF) using ips.html, they will be ignored. -# (The equivalent parameters must be set from the browser's print dialog.) - -# This can be "test" or "stable" -engine_version: stable - -# These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 -machine_version: 0.14.0 - -# Password used to connect with the "docker user" -docker_user_password: training diff --git a/prepare-vms/settings/fundamentals.yaml b/prepare-vms/settings/day1.yaml similarity index 96% rename from prepare-vms/settings/fundamentals.yaml rename to prepare-vms/settings/day1.yaml index 48a1d95e..5215679b 100644 --- a/prepare-vms/settings/fundamentals.yaml +++ b/prepare-vms/settings/day1.yaml @@ -7,7 +7,7 @@ clustersize: 1 clusterprefix: node # Jinja2 template to use to generate ready-to-cut cards -cards_template: cards.html +cards_template: jerome.html # Use "Letter" in the US, and "A4" everywhere else paper_size: Letter diff --git a/prepare-vms/settings/jerome.yaml b/prepare-vms/settings/day2.yaml similarity index 100% rename from prepare-vms/settings/jerome.yaml rename to prepare-vms/settings/day2.yaml diff --git a/prepare-vms/settings/enix.yaml b/prepare-vms/settings/enix.yaml deleted file mode 100644 index 075efb34..00000000 --- a/prepare-vms/settings/enix.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# Number of VMs per cluster -clustersize: 1 - -# The hostname of each node will be clusterprefix + a number -clusterprefix: node - -# Jinja2 template to use to generate ready-to-cut cards -cards_template: enix.html - -# Use "Letter" in the US, and "A4" everywhere else -paper_size: A4 - -# Feel free to reduce this if your printer can handle it -paper_margin: 0.2in - -# Note: paper_size and paper_margin only apply to PDF generated with pdfkit. -# If you print (or generate a PDF) using ips.html, they will be ignored. -# (The equivalent parameters must be set from the browser's print dialog.) - -# This can be "test" or "stable" -engine_version: stable - -# These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 -machine_version: 0.14.0 - -# Password used to connect with the "docker user" -docker_user_password: training - diff --git a/prepare-vms/settings/example.yaml b/prepare-vms/settings/example.yaml deleted file mode 100644 index 5f814c9d..00000000 --- a/prepare-vms/settings/example.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# customize your cluster size, your cards template, and the versions - -# Number of VMs per cluster -clustersize: 5 - -# The hostname of each node will be clusterprefix + a number -clusterprefix: node - -# Jinja2 template to use to generate ready-to-cut cards -cards_template: cards.html - -# Use "Letter" in the US, and "A4" everywhere else -paper_size: Letter - -# Feel free to reduce this if your printer can handle it -paper_margin: 0.2in - -# Note: paper_size and paper_margin only apply to PDF generated with pdfkit. -# If you print (or generate a PDF) using ips.html, they will be ignored. -# (The equivalent parameters must be set from the browser's print dialog.) - -# This can be "test" or "stable" -engine_version: test - -# These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.18.0 -machine_version: 0.13.0 - -# Password used to connect with the "docker user" -docker_user_password: training diff --git a/prepare-vms/settings/kube101.yaml b/prepare-vms/settings/kube101.yaml deleted file mode 100644 index 8f742e54..00000000 --- a/prepare-vms/settings/kube101.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 3 nodes for k8s 101 workshops - -# Number of VMs per cluster -clustersize: 3 - -# The hostname of each node will be clusterprefix + a number -clusterprefix: node - -# Jinja2 template to use to generate ready-to-cut cards -cards_template: kube101.html - -# Use "Letter" in the US, and "A4" everywhere else -paper_size: Letter - -# Feel free to reduce this if your printer can handle it -paper_margin: 0.2in - -# Note: paper_size and paper_margin only apply to PDF generated with pdfkit. -# If you print (or generate a PDF) using ips.html, they will be ignored. -# (The equivalent parameters must be set from the browser's print dialog.) - -# This can be "test" or "stable" -engine_version: stable - -# These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.21.1 -machine_version: 0.14.0 - -# Password used to connect with the "docker user" -docker_user_password: training - diff --git a/prepare-vms/settings/swarm.yaml b/prepare-vms/settings/swarm.yaml deleted file mode 100644 index 67512cba..00000000 --- a/prepare-vms/settings/swarm.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# This file is passed by trainer-cli to scripts/ips-txt-to-html.py - -# Number of VMs per cluster -clustersize: 3 - -# The hostname of each node will be clusterprefix + a number -clusterprefix: node - -# Jinja2 template to use to generate ready-to-cut cards -cards_template: cards.html - -# Use "Letter" in the US, and "A4" everywhere else -paper_size: Letter - -# Feel free to reduce this if your printer can handle it -paper_margin: 0.2in - -# Note: paper_size and paper_margin only apply to PDF generated with pdfkit. -# If you print (or generate a PDF) using ips.html, they will be ignored. -# (The equivalent parameters must be set from the browser's print dialog.) - -# This can be "test" or "stable" -engine_version: stable - -# These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.22.0 -machine_version: 0.15.0 - -# Password used to connect with the "docker user" -docker_user_password: training diff --git a/prepare-vms/templates/admin.html b/prepare-vms/templates/admin.html deleted file mode 100644 index 9684a55c..00000000 --- a/prepare-vms/templates/admin.html +++ /dev/null @@ -1,124 +0,0 @@ -{# Feel free to customize or override anything in there! #} -{%- set url = "http://FIXME.container.training" -%} -{%- set pagesize = 9 -%} -{%- if clustersize == 1 -%} - {%- set workshop_name = "Docker workshop" -%} - {%- set cluster_or_machine = "machine virtuelle" -%} - {%- set this_or_each = "cette" -%} - {%- set plural = "" -%} - {%- set image_src = "https://s3-us-west-2.amazonaws.com/www.breadware.com/integrations/docker.png" -%} -{%- else -%} - {%- set workshop_name = "Kubernetes workshop" -%} - {%- set cluster_or_machine = "cluster" -%} - {%- set this_or_each = "chaque" -%} - {%- set plural = "s" -%} - {%- set image_src_swarm = "https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png" -%} - {%- set image_src_kube = "https://avatars1.githubusercontent.com/u/13629408" -%} - {%- set image_src = image_src_kube -%} -{%- endif -%} - - - - -{% for cluster in clusters %} - {% if loop.index0>0 and loop.index0%pagesize==0 %} - - {% endif %} -
- -

- Voici les informations permettant de se connecter à un - des environnements utilisés pour cette formation. - Vous pouvez vous connecter à {{ this_or_each }} machine - virtuelle avec n'importe quel client SSH. -

- -

- - - - - - - - -
cluster:
{{ clusterprefix }}
identifiant:
docker
mot de passe:
{{ docker_user_password }}
-

- -

- Adresse{{ plural }} IP : - - - {% for node in cluster %} - - {% endfor %} -
{{ clusterprefix }}{{ loop.index }}:{{ node }}
-

-

Le support de formation est à l'adresse suivante : -

{{ url }}
-

-
-{% endfor %} - - diff --git a/prepare-vms/templates/cards.html b/prepare-vms/templates/cards.html deleted file mode 100644 index dc977b65..00000000 --- a/prepare-vms/templates/cards.html +++ /dev/null @@ -1,106 +0,0 @@ -{# Feel free to customize or override anything in there! #} -{%- set url = "http://container.training/" -%} -{%- set pagesize = 12 -%} -{%- if clustersize == 1 -%} - {%- set workshop_name = "Docker workshop" -%} - {%- set cluster_or_machine = "machine" -%} - {%- set this_or_each = "this" -%} - {%- set machine_is_or_machines_are = "machine is" -%} - {%- set image_src = "https://s3-us-west-2.amazonaws.com/www.breadware.com/integrations/docker.png" -%} -{%- else -%} - {%- set workshop_name = "orchestration workshop" -%} - {%- set cluster_or_machine = "cluster" -%} - {%- set this_or_each = "each" -%} - {%- set machine_is_or_machines_are = "machines are" -%} - {%- set image_src_swarm = "https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png" -%} - {%- set image_src_kube = "https://avatars1.githubusercontent.com/u/13629408" -%} - {%- set image_src = image_src_swarm -%} -{%- endif -%} - - - - -{% for cluster in clusters %} - {% if loop.index0>0 and loop.index0%pagesize==0 %} - - {% endif %} -
- -

- Here is the connection information to your very own - {{ cluster_or_machine }} for this {{ workshop_name }}. - You can connect to {{ this_or_each }} VM with any SSH client. -

-

- - - - - - -
login:
docker
password:
{{ docker_user_password }}
- -

-

- Your {{ machine_is_or_machines_are }}: - - {% for node in cluster %} - - {% endfor %} -
node{{ loop.index }}:{{ node }}
-

-

You can find the slides at: -

{{ url }}
-

-
-{% endfor %} - - diff --git a/prepare-vms/templates/enix.html b/prepare-vms/templates/enix.html deleted file mode 100644 index e84c0d7c..00000000 --- a/prepare-vms/templates/enix.html +++ /dev/null @@ -1,121 +0,0 @@ -{# Feel free to customize or override anything in there! #} -{%- set url = "http://FIXME.container.training" -%} -{%- set pagesize = 9 -%} -{%- if clustersize == 1 -%} - {%- set workshop_name = "Docker workshop" -%} - {%- set cluster_or_machine = "machine virtuelle" -%} - {%- set this_or_each = "cette" -%} - {%- set plural = "" -%} - {%- set image_src = "https://s3-us-west-2.amazonaws.com/www.breadware.com/integrations/docker.png" -%} -{%- else -%} - {%- set workshop_name = "Kubernetes workshop" -%} - {%- set cluster_or_machine = "cluster" -%} - {%- set this_or_each = "chaque" -%} - {%- set plural = "s" -%} - {%- set image_src_swarm = "https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png" -%} - {%- set image_src_kube = "https://avatars1.githubusercontent.com/u/13629408" -%} - {%- set image_src = image_src_kube -%} -{%- endif -%} - - - - -{% for cluster in clusters %} - {% if loop.index0>0 and loop.index0%pagesize==0 %} - - {% endif %} -
- -

- Voici les informations permettant de se connecter à votre - {{ cluster_or_machine }} pour cette formation. - Vous pouvez vous connecter à {{ this_or_each }} machine virtuelle - avec n'importe quel client SSH. -

-

- - - - - - -
identifiant:
docker
mot de passe:
{{ docker_user_password }}
- -

-

- Adresse{{ plural }} IP : - - - {% for node in cluster %} - - {% endfor %} -
node{{ loop.index }}:{{ node }}
-

-

Le support de formation est à l'adresse suivante : -

{{ url }}
-

-
-{% endfor %} - - diff --git a/prepare-vms/templates/jerome.html b/prepare-vms/templates/jerome.html index 9f0263b8..7791d801 100644 --- a/prepare-vms/templates/jerome.html +++ b/prepare-vms/templates/jerome.html @@ -1,15 +1,14 @@ {# Feel free to customize or override anything in there! #} -{%- set url = "http://qconuk2019.container.training/" -%} +{%- set url = "http://wwrk-2019-05.container.training/" -%} {%- set pagesize = 9 -%} +{%- set workshop_name = "training session" -%} {%- if clustersize == 1 -%} - {%- set workshop_name = "Docker workshop" -%} - {%- set cluster_or_machine = "machine" -%} + {%- set cluster_or_machine = "Docker machine" -%} {%- set this_or_each = "this" -%} {%- set machine_is_or_machines_are = "machine is" -%} {%- set image_src = "https://s3-us-west-2.amazonaws.com/www.breadware.com/integrations/docker.png" -%} {%- else -%} - {%- set workshop_name = "Kubernetes workshop" -%} - {%- set cluster_or_machine = "cluster" -%} + {%- set cluster_or_machine = "Kubernetes cluster" -%} {%- set this_or_each = "each" -%} {%- set machine_is_or_machines_are = "machines are" -%} {%- set image_src_swarm = "https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png" -%} @@ -109,26 +108,6 @@ img {
{{ url }}

- {% if loop.index%pagesize==0 or loop.last %} - - {% for x in range(pagesize) %} -
-
-

You got this at the workshop - "Getting Started With Kubernetes and Container Orchestration" - during QCON London (March 2019).

-

If you liked that workshop, - I can train your team or organization - on Docker, container, and Kubernetes, - with curriculums of 1 to 5 days. -

-

Interested? Contact me at:

-

jerome.petazzoni@gmail.com

-

Thank you!

-
- {% endfor %} - - {% endif %} {% endfor %} diff --git a/prepare-vms/templates/kube101.html b/prepare-vms/templates/kube101.html deleted file mode 100644 index 1a937818..00000000 --- a/prepare-vms/templates/kube101.html +++ /dev/null @@ -1,106 +0,0 @@ -{# Feel free to customize or override anything in there! #} -{%- set url = "http://container.training/" -%} -{%- set pagesize = 12 -%} -{%- if clustersize == 1 -%} - {%- set workshop_name = "Docker workshop" -%} - {%- set cluster_or_machine = "machine" -%} - {%- set this_or_each = "this" -%} - {%- set machine_is_or_machines_are = "machine is" -%} - {%- set image_src = "https://s3-us-west-2.amazonaws.com/www.breadware.com/integrations/docker.png" -%} -{%- else -%} - {%- set workshop_name = "Kubernetes workshop" -%} - {%- set cluster_or_machine = "cluster" -%} - {%- set this_or_each = "each" -%} - {%- set machine_is_or_machines_are = "machines are" -%} - {%- set image_src_swarm = "https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png" -%} - {%- set image_src_kube = "https://avatars1.githubusercontent.com/u/13629408" -%} - {%- set image_src = image_src_kube -%} -{%- endif -%} - - - - -{% for cluster in clusters %} - {% if loop.index0>0 and loop.index0%pagesize==0 %} - - {% endif %} -
- -

- Here is the connection information to your very own - {{ cluster_or_machine }} for this {{ workshop_name }}. - You can connect to {{ this_or_each }} VM with any SSH client. -

-

- - - - - - -
login:
docker
password:
{{ docker_user_password }}
- -

-

- Your {{ machine_is_or_machines_are }}: - - {% for node in cluster %} - - {% endfor %} -
node{{ loop.index }}:{{ node }}
-

-

You can find the slides at: -

{{ url }}
-

-
-{% endfor %} - -