From e33986768b6198efe1ce6112074ac59c97507de6 Mon Sep 17 00:00:00 2001 From: do Date: Fri, 22 Jan 2021 15:15:44 +0100 Subject: [PATCH] from docker to containerd --- base/init.sls | 1 + base/release.sls | 7 +++++++ k8s/containerd.sls | 21 +++++++++++++++++++++ k8s/cri-tools.sls | 15 +++++++++++++++ k8s/files/containerd-config.toml | 16 ++++++++++++++++ k8s/repo/debian-bullseye.sls | 14 ++++++++++++++ 6 files changed, 74 insertions(+) create mode 100644 base/release.sls create mode 100644 k8s/containerd.sls create mode 100644 k8s/cri-tools.sls create mode 100644 k8s/files/containerd-config.toml create mode 100644 k8s/repo/debian-bullseye.sls diff --git a/base/init.sls b/base/init.sls index a51a003..27138f0 100644 --- a/base/init.sls +++ b/base/init.sls @@ -11,3 +11,4 @@ include: - sudoers - systemd - .timezone + - .release diff --git a/base/release.sls b/base/release.sls new file mode 100644 index 0000000..304a522 --- /dev/null +++ b/base/release.sls @@ -0,0 +1,7 @@ + +etc_apt_release: + file.managed: + - name: /etc/apt/apt.conf.d/01release + - user: root + - mode: 644 + - contents: 'APT::Default-Release "stable";' diff --git a/k8s/containerd.sls b/k8s/containerd.sls new file mode 100644 index 0000000..121ba5f --- /dev/null +++ b/k8s/containerd.sls @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +include: + - .repo.debian-bullseye + - .cri-tools + +containerd_pkgs: + pkg.installed: + - pkgs: + - containerd + - containernetworking-plugins + - require: + - pkgrepo: repo_debian-bullseye + +/etc/containerd/config.toml: + file.managed: + - source: salt://k8s/files/containerd-config.toml + - mode: 644 + - user: root + - group: root diff --git a/k8s/cri-tools.sls b/k8s/cri-tools.sls new file mode 100644 index 0000000..4eb1fb3 --- /dev/null +++ b/k8s/cri-tools.sls @@ -0,0 +1,15 @@ + +cri-tools_pkgs: + pkg.installed: + - pkgs: + - cri-tools + +/etc/crictl.yaml: + file.managed: + - mode: 644 + - user: root + - group: root + - contents: | + #SALT managed + runtime-endpoint: unix:///var/run/containerd/containerd.sock + image-endpoint: unix:///var/run/containerd/containerd.sock diff --git a/k8s/files/containerd-config.toml b/k8s/files/containerd-config.toml new file mode 100644 index 0000000..e522d8c --- /dev/null +++ b/k8s/files/containerd-config.toml @@ -0,0 +1,16 @@ +version = 2 + +[debug] + level = "warn" + +[plugins] + [plugins."io.containerd.grpc.v1.cri"] + [plugins."io.containerd.grpc.v1.cri".cni] + bin_dir = "/opt/cni/bin" + conf_dir = "/etc/cni/net.d" + [plugins."io.containerd.internal.v1.opt"] + path = "/var/lib/containerd/opt" + [plugins."io.containerd.grpc.v1.cri".registry] + [plugins."io.containerd.grpc.v1.cri".registry.configs."docker-registry.lan".tls] + insecure_skip_verify = true + diff --git a/k8s/repo/debian-bullseye.sls b/k8s/repo/debian-bullseye.sls new file mode 100644 index 0000000..2805285 --- /dev/null +++ b/k8s/repo/debian-bullseye.sls @@ -0,0 +1,14 @@ +{%- + set cache_url = salt['pillar.get']( + 'services:apt-cache', + default='' + ) +%} + + +repo_debian-bullseye: + pkgrepo.managed: + - name: 'deb http://{{ cache_url }}deb.debian.org/debian bullseye main contrib' + - file: /etc/apt/sources.list.d/debian-bullseye.list + - clean_file: True +