From 82b7b7ba882b4f1babe11e4f0f099c9f4cb42c48 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Wed, 18 Sep 2019 13:08:54 -0500 Subject: [PATCH 1/5] Add slides for ENIX training --- slides/index.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/slides/index.yaml b/slides/index.yaml index 3e1ea465..b7150f4a 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -31,6 +31,7 @@ title: Déployer ses applications avec Kubernetes (in French) lang: fr attend: https://enix.io/fr/services/formation/deployer-ses-applications-avec-kubernetes/ + slides: https://kube-2019-09.container.training/ - date: 2019-08-27 country: tr From 5a5a08cf25c29d23f167c8c1125e58715d3f5f1b Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Thu, 19 Sep 2019 13:22:59 -0500 Subject: [PATCH 2/5] Add CLT training --- slides/index.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/slides/index.yaml b/slides/index.yaml index b7150f4a..aac47fa3 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -14,6 +14,22 @@ title: Déployer ses applications avec Kubernetes (in French) lang: fr attend: http://2019.devops-dday.com/Workshop.html + +- date: [2019-10-22, 2019-10-24] + country: us + city: Charlotte, NC + event: Ardan Labs + speaker: jpetazzo + title: Kubernetes Training + attend: https://www.eventbrite.com/e/containers-docker-and-kubernetes-training-for-devs-and-ops-charlotte-nc-november-2019-tickets-73296659281 + +- date: 2019-10-22 + country: us + city: Charlotte, NC + event: Ardan Labs + speaker: jpetazzo + title: Docker & Containers Training + attend: https://www.eventbrite.com/e/containers-docker-and-kubernetes-training-for-devs-and-ops-charlotte-nc-november-2019-tickets-73296659281 - date: 2019-10-22 country: de From 96104193baf40684e962a26583acd3c44c1dbc42 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Fri, 20 Sep 2019 09:57:27 -0500 Subject: [PATCH 3/5] Add LISA tutorial --- slides/index.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/slides/index.yaml b/slides/index.yaml index aac47fa3..c98a0d1a 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -15,6 +15,14 @@ lang: fr attend: http://2019.devops-dday.com/Workshop.html +- date: 2019-10-30 + country: us + city: Portland, OR + event: LISA + speaker: jpetazzo + title: Deep Dive into Kubernetes Internals for Builders and Operators + attend: https://www.usenix.org/conference/lisa19/presentation/petazzoni-tutorial + - date: [2019-10-22, 2019-10-24] country: us city: Charlotte, NC From 169d850fc7d2182c1cf5c6005a3f01feedb36b4f Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Mon, 23 Sep 2019 08:30:16 -0500 Subject: [PATCH 4/5] bump apiversion for 1.16 --- k8s/metrics-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/metrics-server.yaml b/k8s/metrics-server.yaml index 5864e25d..ddb2998d 100644 --- a/k8s/metrics-server.yaml +++ b/k8s/metrics-server.yaml @@ -58,7 +58,7 @@ metadata: name: metrics-server namespace: kube-system --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: metrics-server From eb2e74f236b56cbe39c89614fb47889902e8b7ca Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Mon, 23 Sep 2019 08:53:38 -0500 Subject: [PATCH 5/5] Adjust apiVersion for k8s 1.16 --- k8s/efk.yaml | 9 ++++++--- k8s/ingress.yaml | 8 ++++---- k8s/insecure-dashboard.yaml | 2 +- k8s/local-path-storage.yaml | 2 +- k8s/traefik.yaml | 7 +++++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/k8s/efk.yaml b/k8s/efk.yaml index 48d6c1ce..f2c9ea84 100644 --- a/k8s/efk.yaml +++ b/k8s/efk.yaml @@ -32,13 +32,16 @@ subjects: name: fluentd namespace: default --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: fluentd labels: app: fluentd spec: + selector: + matchLabels: + app: fluentd template: metadata: labels: @@ -86,7 +89,7 @@ spec: hostPath: path: /var/lib/docker/containers --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -128,7 +131,7 @@ spec: app: elasticsearch type: ClusterIP --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: labels: diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml index 09445e1e..a40f3dff 100644 --- a/k8s/ingress.yaml +++ b/k8s/ingress.yaml @@ -1,13 +1,13 @@ apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: - name: cheddar + name: kibana spec: rules: - - host: cheddar.A.B.C.D.nip.io + - host: kibana.185.145.251.54.nip.io http: paths: - path: / backend: - serviceName: cheddar - servicePort: 80 + serviceName: kibana + servicePort: 5601 diff --git a/k8s/insecure-dashboard.yaml b/k8s/insecure-dashboard.yaml index 44ec1d65..43ea51fa 100644 --- a/k8s/insecure-dashboard.yaml +++ b/k8s/insecure-dashboard.yaml @@ -162,7 +162,7 @@ spec: selector: k8s-app: kubernetes-dashboard --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: labels: diff --git a/k8s/local-path-storage.yaml b/k8s/local-path-storage.yaml index 7374a02a..b163792a 100644 --- a/k8s/local-path-storage.yaml +++ b/k8s/local-path-storage.yaml @@ -45,7 +45,7 @@ subjects: name: local-path-provisioner-service-account namespace: local-path-storage --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: local-path-provisioner diff --git a/k8s/traefik.yaml b/k8s/traefik.yaml index 72b4173b..959ea198 100644 --- a/k8s/traefik.yaml +++ b/k8s/traefik.yaml @@ -6,13 +6,16 @@ metadata: namespace: kube-system --- kind: DaemonSet -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 metadata: name: traefik-ingress-controller namespace: kube-system labels: k8s-app: traefik-ingress-lb spec: + selector: + matchLabels: + k8s-app: traefik-ingress-lb template: metadata: labels: @@ -26,7 +29,7 @@ spec: serviceAccountName: traefik-ingress-controller terminationGracePeriodSeconds: 60 containers: - - image: traefik + - image: traefik:1.7 name: traefik-ingress-lb ports: - name: http