From ee7a4c3c4d8ba2b73bba7ae359e7f856bcd1407f Mon Sep 17 00:00:00 2001
From: Alexey Shabalin <shaba@altlinux.org>
Date: Thu, 17 Sep 2020 19:22:38 +0300
Subject: [PATCH] server-v: update kubernetes package lists

---
 conf.d/server-v.mk                                 | 2 +-
 pkg.in/groups/server-v/kubernetes-master.directory | 9 +++++++++
 pkg.in/groups/server-v/kubernetes-node.directory   | 9 +++++++++
 pkg.in/groups/server-v/kubernetes.directory        | 8 --------
 pkg.in/lists/container/kubernetes-master           | 3 +++
 pkg.in/lists/container/kubernetes-node             | 4 +---
 6 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 pkg.in/groups/server-v/kubernetes-master.directory
 create mode 100644 pkg.in/groups/server-v/kubernetes-node.directory
 delete mode 100644 pkg.in/groups/server-v/kubernetes.directory
 create mode 100644 pkg.in/lists/container/kubernetes-master

diff --git a/conf.d/server-v.mk b/conf.d/server-v.mk
index 43b3dc47..384d1c1e 100644
--- a/conf.d/server-v.mk
+++ b/conf.d/server-v.mk
@@ -33,7 +33,7 @@ distro/server-v: openstack = $(addprefix server-v/openstack/,\
 # storage
 
 distro/server-v: container = $(addprefix server-v/,\
-	docker kubernetes podman lxd)
+	docker kubernetes-master kubernetes-node podman lxd)
 
 distro/server-v: network = $(addprefix server-v/,\
 	apache2 nginx bird dhcp dns haproxy keepalived openvswitch freeipa-client)
diff --git a/pkg.in/groups/server-v/kubernetes-master.directory b/pkg.in/groups/server-v/kubernetes-master.directory
new file mode 100644
index 00000000..f5495675
--- /dev/null
+++ b/pkg.in/groups/server-v/kubernetes-master.directory
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Kubernetes services for master host
+Name[ru_RU]=Сервисы Kubernetes для управляющего хоста
+X-Alterator-PackageList=container/kubernetes-master
+X-Alterator-Required=no
+X-Alterator-Depends=server-v/docker
+X-Alterator-Parent=server-v/200-container
diff --git a/pkg.in/groups/server-v/kubernetes-node.directory b/pkg.in/groups/server-v/kubernetes-node.directory
new file mode 100644
index 00000000..4b6d8f1f
--- /dev/null
+++ b/pkg.in/groups/server-v/kubernetes-node.directory
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Kubernetes services for node host
+Name[ru_RU]=Сервисы Kubernetes для вычислительного хоста
+X-Alterator-PackageList=container/kubernetes-node
+X-Alterator-Required=no
+X-Alterator-Depends=server-v/docker
+X-Alterator-Parent=server-v/200-container
diff --git a/pkg.in/groups/server-v/kubernetes.directory b/pkg.in/groups/server-v/kubernetes.directory
deleted file mode 100644
index d9298f73..00000000
--- a/pkg.in/groups/server-v/kubernetes.directory
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=Kubernetes management of containerized applications
-Name[ru_RU]=Оркестратор Kubernetes
-X-Alterator-PackageList=container/kubernetes
-X-Alterator-Required=no
-X-Alterator-Parent=server-v/200-container
diff --git a/pkg.in/lists/container/kubernetes-master b/pkg.in/lists/container/kubernetes-master
new file mode 100644
index 00000000..02a3a2c7
--- /dev/null
+++ b/pkg.in/lists/container/kubernetes-master
@@ -0,0 +1,3 @@
+kubernetes-kubeadm
+kubernetes-master
+cri-tools
diff --git a/pkg.in/lists/container/kubernetes-node b/pkg.in/lists/container/kubernetes-node
index 21333ce9..23c1e605 100644
--- a/pkg.in/lists/container/kubernetes-node
+++ b/pkg.in/lists/container/kubernetes-node
@@ -1,5 +1,3 @@
-docker-ce
-cni-plugins
 kubernetes-kubeadm
-kubernetes-kubelet
+kubernetes-node
 cri-tools