Fix #545: Add salt states to install kubelet

scality · Feb 6, 2019 · c43db5a · c43db5a
1 parent 12d64c4
commit c43db5a
Show file tree

Hide file tree

Showing 17 changed files with 159 additions and 0 deletions.
diff --git a/pillar/repositories.sls b/pillar/repositories.sls
@@ -0,0 +1,4 @@
+# Repositories informations
+repo:
+  # Configure online repositories
+  online_mode: True
diff --git a/pillar/top.sls b/pillar/top.sls
@@ -0,0 +1,3 @@
+base:
+  '*':
+    - repositories
diff --git a/salt/containerd/configured.sls b/salt/containerd/configured.sls
@@ -0,0 +1,9 @@
+include:
+  - .installed
+
+Start and enable containerd:
+  service.running:
+    - name: containerd
+    - enable: True
+    - require:
+      - pkg: Install containerd
diff --git a/salt/containerd/init.sls b/salt/containerd/init.sls
@@ -0,0 +1,2 @@
+include:
+  - .configured
diff --git a/salt/containerd/installed.sls b/salt/containerd/installed.sls
@@ -0,0 +1,24 @@
+{%- from "containerd/map.jinja" import containerd with context %}
+{%- from "repo/map.jinja" import repo with context %}
+
+include:
+  - repo
+  - runc
+
+Install containerd:
+  pkg.installed:
+    - name: containerd
+    - version: {{ containerd.version }}
+    - fromrepo: {{ repo.containerd.name }}
+    - require:
+      - pkgrepo: Configure Kubernetes repository
+      - pkg: Install runc
+
+Update container-selinux:
+  pkg.installed:
+    - name: container-selinux
+    - sources:
+      # TODO: Maybe something to specify link/version
+      - container-selinux: https://buildlogs.centos.org/centos/7/virt/x86_64/container/container-selinux-2.77-1.el7.noarch.rpm
+    - require:
+      - pkg: Install containerd
diff --git a/salt/containerd/map.jinja b/salt/containerd/map.jinja
@@ -0,0 +1,5 @@
+{%- set containerd = salt['grains.filter_by']({
+  'Linux': {
+    'version': 'latest'
+  }
+}, grain='kernel', merge=salt['pillar.get']('containerd')) %}
diff --git a/salt/kubelet/init.sls b/salt/kubelet/init.sls
@@ -0,0 +1,2 @@
+include:
+  - .installed
diff --git a/salt/kubelet/installed.sls b/salt/kubelet/installed.sls
@@ -0,0 +1,21 @@
+{%- from "kubelet/map.jinja" import kubelet with context %}
+{%- from "repo/map.jinja" import repo with context %}
+
+include:
+  - repo
+
+# TODO: Maybe not needed in offline because embedded in the kubernetes repository
+Install kubelet dependencies:
+  pkg.installed:
+    - pkgs:
+      - ebtables
+      - socat
+      - conntrack-tools
+
+Install kubelet:
+  pkg.installed:
+    - name: kubelet
+    - version: {{ kubelet.version }}
+    - fromrepo: {{ repo.kubernetes.name }}
+    - require:
+      - pkgrepo: Configure Kubernetes repository
diff --git a/salt/kubelet/map.jinja b/salt/kubelet/map.jinja
@@ -0,0 +1,5 @@
+{%- set kubelet = salt['grains.filter_by']({
+  'Linux': {
+    'version': 'latest'
+  }
+}, grain='kernel', merge=salt['pillar.get']('kubelet')) %}
diff --git a/salt/repo/configured.sls b/salt/repo/configured.sls
@@ -0,0 +1,8 @@
+{%- from "repo/map.jinja" import repo with context %}
+
+include:
+{%- if repo.online_mode %}
+  - .online
+{%- else %}
+  - .offline
+{%- endif %}
diff --git a/salt/repo/init.sls b/salt/repo/init.sls
@@ -0,0 +1,2 @@
+include:
+  - .configured
diff --git a/salt/repo/map.jinja b/salt/repo/map.jinja
@@ -0,0 +1,18 @@
+{%- set defaults = salt['grains.filter_by']({
+  'Linux': {
+    'online_mode': True
+  }
+}, grain='kernel', merge=salt['pillar.get']('repo')) %}
+
+{%- set repo = salt['grains.filter_by']({
+  'RedHat': {
+    'containerd': {
+      'name': 'epel'
+    },
+    'kubernetes': {
+      'name': 'kubernetes'
+    }
+  },
+  'Debian': {
+  }
+}, merge=defaults) %}
diff --git a/salt/repo/offline.sls b/salt/repo/offline.sls
@@ -0,0 +1,3 @@
+offline mode not yet implemented:
+  test.fail_without_changes:
+    - failhard: True
diff --git a/salt/repo/online.sls b/salt/repo/online.sls
@@ -0,0 +1,36 @@
+{%- from "repo/map.jinja" import repo with context %}
+
+{%- if grains["os_family"] == "RedHat" %}
+
+Configure EPEL repository:
+  pkg.installed:
+  {%- if grains["os"] == "CentOs" %}
+    - name: epel-release
+  {%- else %}
+    - sources:
+      - epel-release: https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ grains['osmajorrelease'] }}.noarch.rpm
+  {%- endif %}
+
+  {%- if grains["os"] == "RedHat" %}
+check that the system is registered:
+  cmd.run:
+    - name: subscription-manager status
+  {%- endif %}
+
+Configure Kubernetes repository:
+  pkgrepo.managed:
+    - name: {{ repo.kubernetes.name }}
+    - humanname: Kubernetes
+    - baseurl: "https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64"
+    - gpgcheck: 1
+    - repo_gpg_check: 1
+    - gpgkey: "https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
+    - enabled: 0
+
+{%- else %}
+
+{{ grains["os_family"] }} not supported, only RedHat based supported:
+  test.fail_without_changes:
+    - failhard: True
+
+{%- endif %}
diff --git a/salt/runc/init.sls b/salt/runc/init.sls
@@ -0,0 +1,2 @@
+include:
+  - .installed
diff --git a/salt/runc/installed.sls b/salt/runc/installed.sls
@@ -0,0 +1,10 @@
+{% from "runc/map.jinja" import runc with context %}
+
+include:
+  - repo
+
+# TODO: Add a fromrepo for offline
+Install runc:
+  pkg.installed:
+    - name: runc
+    - version: {{ runc.version }}
diff --git a/salt/runc/map.jinja b/salt/runc/map.jinja
@@ -0,0 +1,5 @@
+{%- set runc = salt['grains.filter_by']({
+  'Linux': {
+    'version': 'latest'
+  }
+}, grain='kernel', merge=salt['pillar.get']('runc')) %}