diff --git a/base/packages/init.sls b/base/packages/init.sls index e00e864..3413a74 100644 --- a/base/packages/init.sls +++ b/base/packages/init.sls @@ -7,3 +7,4 @@ include: - .repo.debian - .repo.maketank - .prometheus + - .salt.minion diff --git a/k8s/admin.sls b/k8s/admin.sls index 1590819..5f7f803 100644 --- a/k8s/admin.sls +++ b/k8s/admin.sls @@ -3,6 +3,7 @@ --- include: - kubernetes.package.repo + - .cri-tools {% set k8s_v = "1.20.2-00" %} diff --git a/k8s/cri-tools.sls b/k8s/cri-tools.sls index 4eb1fb3..eba0262 100644 --- a/k8s/cri-tools.sls +++ b/k8s/cri-tools.sls @@ -1,3 +1,5 @@ +include: + - kubernetes.package.repo cri-tools_pkgs: pkg.installed: diff --git a/k8s/files/podman-policy.json b/k8s/files/podman-policy.json new file mode 100644 index 0000000..bdc833a --- /dev/null +++ b/k8s/files/podman-policy.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "type": "insecureAcceptAnything" + } + ] +} + diff --git a/k8s/podman.sls b/k8s/podman.sls new file mode 100644 index 0000000..994c156 --- /dev/null +++ b/k8s/podman.sls @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +include: + - .repo.debian-bullseye + +podman_pkgs: + pkg.installed: + - pkgs: + - podman + - require: + - pkgrepo: repo_debian-bullseye + +/etc/containers/policy.json: + file.managed: + - source: salt://k8s/files/podman-policy.json + - mode: 644 + - user: root + - group: root diff --git a/top.sls b/top.sls index 283bcd3..7c0d77e 100644 --- a/top.sls +++ b/top.sls @@ -12,10 +12,12 @@ base: 'G@osarch:arm64 or G@osarch:armhf or G@osarch:armel': - match: compound - base.packages.arch.arm - 'auto*': + 'auto01*': - base.packages.openhab #- base.packages.openhab.ser2net_server #- base.packages.openhab.ser2net_client + 'auto02*': + - k8s.podman 'pine*': - k8s 'lenny*':