From 8f7ca0d261fa7a56fe5e207a66a753bfaed628df Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Mon, 17 Jun 2019 20:55:57 -0500 Subject: [PATCH 1/5] Bump k8s version --- slides/k8s/versions-k8s.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/k8s/versions-k8s.md b/slides/k8s/versions-k8s.md index 937ccb02..285d008e 100644 --- a/slides/k8s/versions-k8s.md +++ b/slides/k8s/versions-k8s.md @@ -1,6 +1,6 @@ ## Versions installed -- Kubernetes 1.14.2 +- Kubernetes 1.14.3 - Docker Engine 18.09.6 - Docker Compose 1.21.1 From ad4c86b3f4b6f6dd8d5ba0ed540635fdfcc51d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Thu, 20 Jun 2019 01:47:48 +0000 Subject: [PATCH 2/5] Show instance type when provisioning; change it to t3.medium by default --- prepare-vms/lib/infra/aws.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/prepare-vms/lib/infra/aws.sh b/prepare-vms/lib/infra/aws.sh index cb5f8fd0..f7721003 100644 --- a/prepare-vms/lib/infra/aws.sh +++ b/prepare-vms/lib/infra/aws.sh @@ -31,6 +31,7 @@ infra_start() { die "I could not find which AMI to use in this region. Try another region?" fi AWS_KEY_NAME=$(make_key_name) + AWS_INSTANCE_TYPE=${AWS_INSTANCE_TYPE-t3a.medium} sep "Starting instances" info " Count: $COUNT" @@ -38,10 +39,11 @@ infra_start() { info " Token/tag: $TAG" info " AMI: $AMI" info " Key name: $AWS_KEY_NAME" + info " Instance type: $AWS_INSTANCE_TYPE" result=$(aws ec2 run-instances \ --key-name $AWS_KEY_NAME \ --count $COUNT \ - --instance-type ${AWS_INSTANCE_TYPE-t2.medium} \ + --instance-type $AWS_INSTANCE_TYPE \ --client-token $TAG \ --block-device-mapping 'DeviceName=/dev/sda1,Ebs={VolumeSize=20}' \ --image-id $AMI) @@ -97,7 +99,7 @@ infra_disableaddrchecks() { } wait_until_tag_is_running() { - max_retry=50 + max_retry=100 i=0 done_count=0 while [[ $done_count -lt $COUNT ]]; do From 860907ccf0c93f23740e5272db878bcd510b2cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Thu, 20 Jun 2019 01:50:01 +0000 Subject: [PATCH 3/5] Optimize admin clusters --- prepare-vms/setup-admin-clusters.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/prepare-vms/setup-admin-clusters.sh b/prepare-vms/setup-admin-clusters.sh index a4719d7a..75717e52 100755 --- a/prepare-vms/setup-admin-clusters.sh +++ b/prepare-vms/setup-admin-clusters.sh @@ -30,9 +30,9 @@ TAG=$PREFIX-$SETTINGS --settings settings/$SETTINGS.yaml \ --count $((3*$STUDENTS)) +./workshopctl disableaddrchecks $TAG ./workshopctl deploy $TAG ./workshopctl kubebins $TAG -./workshopctl disableaddrchecks $TAG ./workshopctl cards $TAG SETTINGS=admin-kuberouter @@ -43,11 +43,15 @@ TAG=$PREFIX-$SETTINGS --settings settings/$SETTINGS.yaml \ --count $((3*$STUDENTS)) +./workshopctl disableaddrchecks $TAG ./workshopctl deploy $TAG ./workshopctl kubebins $TAG -./workshopctl disableaddrchecks $TAG ./workshopctl cards $TAG +#INFRA=infra/aws-us-west-1 + +export AWS_INSTANCE_TYPE=t3a.medium + SETTINGS=admin-test TAG=$PREFIX-$SETTINGS ./workshopctl start \ @@ -59,3 +63,4 @@ TAG=$PREFIX-$SETTINGS ./workshopctl deploy $TAG ./workshopctl kube $TAG 1.13.5 ./workshopctl cards $TAG + From ab1a360cdcb677756bebe56d36c74bd671540ba3 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Wed, 19 Jun 2019 21:45:59 -0500 Subject: [PATCH 4/5] Add link to Velocity Berlin --- slides/index.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/slides/index.yaml b/slides/index.yaml index 668fdbe2..3a9b8517 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -1,3 +1,11 @@ +- date: [2019-11-04, 2019-11-05] + country: de + city: Berlin + event: Velocity + speaker: jpetazzo + title: Deploying and scaling applications with Kubernetes + attend: https://conferences.oreilly.com/velocity/vl-eu/public/schedule/detail/79109 + - date: 2019-11-13 country: fr city: Marseille From 9f1d2581fce73de039bf6d6d3437f6a066dafed8 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Fri, 21 Jun 2019 07:49:01 -0500 Subject: [PATCH 5/5] Bump k8s version --- slides/k8s/versions-k8s.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/k8s/versions-k8s.md b/slides/k8s/versions-k8s.md index 285d008e..b12c45af 100644 --- a/slides/k8s/versions-k8s.md +++ b/slides/k8s/versions-k8s.md @@ -1,6 +1,6 @@ ## Versions installed -- Kubernetes 1.14.3 +- Kubernetes 1.15.0 - Docker Engine 18.09.6 - Docker Compose 1.21.1 @@ -23,7 +23,7 @@ class: extra-details ## Kubernetes and Docker compatibility -- Kubernetes 1.14 validates Docker Engine versions [up to 18.09](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md#external-dependencies) +- Kubernetes 1.15 validates Docker Engine versions [up to 18.09](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.15.md#dependencies)
(the latest version when Kubernetes 1.14 was released)