kubernetes repo and refactoring

k8s/admin.sls

@@ -2,7 +2,7 @@
 # vim: ft=yaml
 ---
 include:
-  - kubernetes.package.repo
+  - .repo.kubernetes
   - .cri-tools
 
 {% set k8s_v = "1.22.2-00" %}
@@ -14,6 +14,8 @@ k8s_pkgs-kubelet:
       - kubectl: {{ k8s_v }}
       - kubeadm: {{ k8s_v }}
       - kubelet: {{ k8s_v }}
+    - require:
+      - pkgrepo: repo_kubernetes.io
 
 k83-additions_pkgs:
   pkg.installed:

k8s/containerd.sls

@@ -2,7 +2,7 @@
 # vim: ft=yaml
 ---
 include:
-  - .repo.debian-bullseye
+  - base.packages.repo.debian-bullseye
   - .cri-tools
 
 containerd_pkgs:

k8s/init.sls

@@ -4,6 +4,7 @@
 include:
   - .admin
   - .containerd
+  - .repo.kubernetes
   #- .docker
   #- .filesystems
 
@@ -24,3 +25,5 @@ k8s_pkgs:
       - kubelet
       - kubetail
       - qemu-utils
+    - require:
+      - pkgrepo: repo_kubernetes.io

k8s/repo/debian-bullseye.sls

@@ -1,14 +0,0 @@
-{%-
- 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
-

k8s/repo/kubernetes.sls

@@ -0,0 +1,8 @@
+
+repo_kubernetes.io:
+  pkgrepo.managed:
+    - name: 'deb https://apt.kubernetes.io kubernetes-xenial main'
+    - file: /etc/apt/sources.list.d/kubernetes.list
+    - key_url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
+    - clean_file: True
+