From 0b653934cfdb5e890667ec57931dc3834ec181df Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Wed, 1 Mar 2023 13:04:34 +0100
Subject: [PATCH] stuff

---
 base/packages/common.sls          |  2 +-
 base/packages/repo/debian-sid.sls | 22 ++++++++++++++++++++++
 base/release.sls                  |  9 +++++----
 k8s/admin.sls                     |  2 +-
 k8s/containerd.sls                |  6 ++++--
 k8s/files/containerd-config.toml  | 21 +++++++++++----------
 os/armbian/init.sls               |  1 +
 os/armbian/systemd.sls            |  0
 8 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100644 base/packages/repo/debian-sid.sls
 create mode 100644 os/armbian/systemd.sls

diff --git a/base/packages/common.sls b/base/packages/common.sls
index ab7af83..44e68ad 100644
--- a/base/packages/common.sls
+++ b/base/packages/common.sls
@@ -33,7 +33,7 @@ common-installed:
      - python3-pip
      - python3-dev
      - python3-pyinotify
-     - python3-m2crypto
+     - python-m2crypto
      - python3-apt
      - lockfile-progs
      - virt-what
diff --git a/base/packages/repo/debian-sid.sls b/base/packages/repo/debian-sid.sls
new file mode 100644
index 0000000..c919bb4
--- /dev/null
+++ b/base/packages/repo/debian-sid.sls
@@ -0,0 +1,22 @@
+{%-
+ set cache_url = salt['pillar.get'](
+      'services:apt-cache',
+      default=''
+      )
+%}
+
+#{% if salt['pillar.get']('os:release', default = 'buster') != 'bullseye' %}
+
+repo_debian-sid:
+  pkgrepo.managed:
+    - name: 'deb http://{{ cache_url }}deb.debian.org/debian sid main contrib'
+    - file: /etc/apt/sources.list.d/debian-sid.list
+    - clean_file: True
+
+#{% else %}
+
+#repo_debian-sid-absent:
+#  file.absent:
+#    - name: /etc/apt/sources.list.d/debian-sid.list
+
+#{% endif %}
\ No newline at end of file
diff --git a/base/release.sls b/base/release.sls
index ee18981..827b52d 100644
--- a/base/release.sls
+++ b/base/release.sls
@@ -1,7 +1,8 @@
-{% set def_rel = 'bullseye' %}
-{% if grains['oscodename'] != 'bullseye' and salt['pillar.get']('os:release', default = False) != 'bullseye' %} 
-{%    set def_rel = 'buster' %}
-{% endif %}
+
+{%- set def_rel = 'bullseye' %}
+{%- if salt['pillar.get']('os:release', default = False) %}
+{%-    def_rel = salt['pillar.get']('os:release', default = False) %}
+{%- endif %}
 
 etc_apt_release:
   file.managed:
diff --git a/k8s/admin.sls b/k8s/admin.sls
index 2e9d3cb..0d0d338 100644
--- a/k8s/admin.sls
+++ b/k8s/admin.sls
@@ -5,7 +5,7 @@ include:
   - .repo.kubernetes
   - .cri-tools
 
-{% set k8s_v = "1.23.14-00" %}
+{% set k8s_v = "1.26.00-00" %}
 
 k8s_pkgs-kubelet:
   pkg.installed:
diff --git a/k8s/containerd.sls b/k8s/containerd.sls
index d6cf4c6..9026fb3 100644
--- a/k8s/containerd.sls
+++ b/k8s/containerd.sls
@@ -2,7 +2,7 @@
 # vim: ft=yaml
 ---
 include:
-  - base.packages.repo.debian-bullseye
+  - base.packages.repo.debian-sid
   - .cri-tools
 
 containerd_pkgs:
@@ -10,8 +10,10 @@ containerd_pkgs:
     - pkgs:
       - containerd 
       - containernetworking-plugins 
+      - crun
+      - runc
     - require:
-      - pkgrepo: repo_debian-bullseye
+      - pkgrepo: repo_debian-sid
 
 /etc/containerd/config.toml:
   file.managed:
diff --git a/k8s/files/containerd-config.toml b/k8s/files/containerd-config.toml
index 7fcb35d..63ce926 100644
--- a/k8s/files/containerd-config.toml
+++ b/k8s/files/containerd-config.toml
@@ -4,14 +4,15 @@ version = 2
   level = "warn"
 
 [plugins]
-  [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
-    [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
-      systemdCgroup = true
-      systemd_cgroup = true
+  
   [plugins."io.containerd.grpc.v1.cri"]
     [plugins."io.containerd.grpc.v1.cri".containerd]
-      [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime]
-        runtime_type = "io.containerd.runc.v2"
+      snapshoter = "overlayfs"
+      default_runtime_name = "runc"
+    [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+      runtime_type = "io.containerd.runc.v2"
+      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+        SystemdCgroup = true
     [plugins."io.containerd.grpc.v1.cri".cni]
       bin_dir = "/opt/cni/bin"
       conf_dir = "/etc/cni/net.d"
@@ -21,10 +22,10 @@ version = 2
     [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
         [plugins."io.containerd.grpc.v1.cri".registry.mirrors."cr.lan"]
             endpoint = ["http://cr.lan"]
-        [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
-            endpoint = [ "http://dr-mirror.lan", "https://registry-1.docker.io"]
+        #[plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
+        #    endpoint = [ "http://dr-mirror.lan", "https://registry-1.docker.io"]
         [plugins."io.containerd.grpc.v1.cri".registry.configs]
             [plugins."io.containerd.grpc.v1.cri".registry.configs."cr.lan".tls]
                 insecure_skip_verify = true
-            [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls]
-                insecure_skip_verify = true
+           # [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls]
+           #     insecure_skip_verify = true
diff --git a/os/armbian/init.sls b/os/armbian/init.sls
index b313013..f749cc8 100644
--- a/os/armbian/init.sls
+++ b/os/armbian/init.sls
@@ -2,4 +2,5 @@ include:
   - .repo
   - .packages
   - .cron
+  - .systemd
 
diff --git a/os/armbian/systemd.sls b/os/armbian/systemd.sls
new file mode 100644
index 0000000..e69de29