Adapt for 2022 demo

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Hetzner Cloud GmbH
+Copyright (c) 2022 Hetzner Cloud GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,8 +1,8 @@
-# KubeCon Europe 2021
+# KubeCon Europe 2022
 
-This repository is part of a live demo at KubeCon Europe 2021 that shows how different official integrations can be used to deploy a Kubernetes (k3s) cluster at Hetzner Cloud.
+This repository is part of a live demo at KubeCon Europe 2022 that shows how different official integrations can be used to deploy a Kubernetes (k3s) cluster at Hetzner Cloud.
 
-The code in this repository creates chargeable resources (three servers and a load balancer) in your hcloud account. Please make sure to delete the resources afterwards to avoid unintended costs. If you attended KubeCon you received a coupon for some cloud credits which you can use to cover the costs to get started.
+The code in this repository creates chargeable resources (three servers, a volume and a load balancer) in your hcloud account. Please make sure to delete the resources afterwards to avoid unintended costs. If you attended KubeCon you received a coupon for some cloud credits which you can use to cover the costs to get started.
 
 After the KubeCon this repository will not be updated or officially supported. If you think there is a bug with one of the integrations please feel free to open an issue in the corresponding GitHub repository or a customer ticket.
 
@@ -19,8 +19,8 @@ After the KubeCon this repository will not be updated or officially supported. I
 7. Clone the repository
 
 ```
-git clone https://github.com/hetznercloud/kubecon-europe-2021.git
-cd kubecon-europe-2021
+git clone https://github.com/hetznercloud/kubecon-europe-2022.git
+cd kubecon-europe-2022
 ```
 
 ### 2. Terraform

ansible/inventory/group_vars/all.yml

@@ -1 +1 @@
-ansible_ssh_private_key_file: "~/.ssh/kubecon"
+ansible_ssh_private_key_file: "~/.ssh/kubecon-2022"

ansible/requirements.yml

@@ -1,4 +1,4 @@
 ---
 collections:
   - name: hetzner.hcloud
-    version: "1.4.3"
+    version: "1.6.0"

ansible/roles/k3s/defaults/main.yml

@@ -1,2 +1,2 @@
-k3s_version: v1.21.0+k3s1
+k3s_version: v1.23.6+k3s1
 k3s_cluster_cidr: 10.92.0.0/16

ansible/roles/k3s/templates/demo.yaml

@@ -16,12 +16,12 @@ spec:
     spec:
       containers:
         - name: hello-kubernetes
-          image: paulbouwer/hello-kubernetes:1.10.0
+          image: paulbouwer/hello-kubernetes:1.10.1
           ports:
             - containerPort: 8080
           env:
             - name: MESSAGE
-              value: "Hetzner Cloud says hello from KubeCon 2021"
+              value: "Hetzner Cloud says hello from KubeCon 2022"
             - name: KUBERNETES_NAMESPACE
               valueFrom:
                 fieldRef:

ansible/roles/k3s/templates/hcloud-ccm.yaml.j2

@@ -49,11 +49,15 @@ spec:
         # cloud controller manages should be able to run on masters
         - key: "node-role.kubernetes.io/master"
           effect: NoSchedule
+          operator: Exists
+        - key: "node-role.kubernetes.io/control-plane"
+          effect: NoSchedule
+          operator: Exists
         - key: "node.kubernetes.io/not-ready"
           effect: "NoSchedule"
       hostNetwork: true
       containers:
-        - image: hetznercloud/hcloud-cloud-controller-manager:v1.9.1
+        - image: hetznercloud/hcloud-cloud-controller-manager:v1.12.1
           name: hcloud-cloud-controller-manager
           command:
             - "/bin/hcloud-cloud-controller-manager"