From c0159c3f7b78e488f18dd2f3168152abeb181dff Mon Sep 17 00:00:00 2001 From: N Date: Tue, 7 Jul 2020 00:07:28 +0100 Subject: [PATCH] feat(kubecli): add kubeadm/kubelet support --- docs/README.rst | 22 ++++++ kubernetes/clean.sls | 2 + kubernetes/defaults.yaml | 49 ++++++------- kubernetes/devspace/binary/install.sls | 2 +- kubernetes/init.sls | 2 + kubernetes/k3s/binary/install.sls | 2 +- kubernetes/k3s/script/install.sls | 4 +- kubernetes/kubeadm/clean.sls | 5 ++ kubernetes/kubeadm/init.sls | 5 ++ kubernetes/kubeadm/package/clean.sls | 31 +++++++++ .../package/repo => kubeadm/package}/init.sls | 0 kubernetes/kubeadm/package/install.sls | 36 ++++++++++ kubernetes/kubectl/binary/install.sls | 2 +- kubernetes/kubectl/package/clean.sls | 5 +- kubernetes/kubectl/package/install.sls | 9 +-- kubernetes/kubelet/clean.sls | 5 ++ kubernetes/kubelet/init.sls | 5 ++ kubernetes/kubelet/package/clean.sls | 31 +++++++++ .../package/repo => kubelet/package}/init.sls | 0 kubernetes/kubelet/package/install.sls | 36 ++++++++++ kubernetes/kudo/binary/install.sls | 2 +- kubernetes/minikube/binary/install.sls | 2 +- kubernetes/minikube/package/clean.sls | 5 +- kubernetes/minikube/package/install.sls | 7 +- kubernetes/minikube/package/repo/clean.sls | 11 --- kubernetes/minikube/package/repo/install.sls | 13 ---- kubernetes/osfamilymap.yaml | 69 ++++++++++--------- kubernetes/osfingermap.yaml | 22 +++--- kubernetes/osmap.yaml | 7 +- .../{kubectl => }/package/repo/clean.sls | 6 +- kubernetes/package/repo/init.sls | 5 ++ .../{kubectl => }/package/repo/install.sls | 6 +- 32 files changed, 282 insertions(+), 126 deletions(-) create mode 100644 kubernetes/kubeadm/clean.sls create mode 100644 kubernetes/kubeadm/init.sls create mode 100644 kubernetes/kubeadm/package/clean.sls rename kubernetes/{kubectl/package/repo => kubeadm/package}/init.sls (100%) create mode 100644 kubernetes/kubeadm/package/install.sls create mode 100644 kubernetes/kubelet/clean.sls create mode 100644 kubernetes/kubelet/init.sls create mode 100644 kubernetes/kubelet/package/clean.sls rename kubernetes/{minikube/package/repo => kubelet/package}/init.sls (100%) create mode 100644 kubernetes/kubelet/package/install.sls delete mode 100644 kubernetes/minikube/package/repo/clean.sls delete mode 100644 kubernetes/minikube/package/repo/install.sls rename kubernetes/{kubectl => }/package/repo/clean.sls (61%) create mode 100644 kubernetes/package/repo/init.sls rename kubernetes/{kubectl => }/package/repo/install.sls (60%) diff --git a/docs/README.rst b/docs/README.rst index eec1bf8d..f4b0bccd 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -8,6 +8,8 @@ Formula to manage kubernetes on MacOS and GNU/Linux. Currently supports: * `devspace` * `k3s` * `kubectl` +* `kubeadm` +* `kubelet` * `minikube` * `kudo` @@ -72,6 +74,26 @@ This state installs kubernetes-cli only. This state uninstalls kubernetes-cli only. +``kubernetes.kubeadm`` +^^^^^^^^^^^^^^^^^^^^^^ + +This state installs kubeadm on supported GNU/Linux only. + +``kubernetes.kubeadm.clean`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This state uninstalls kubeadm on supported GNU/Linux only. + +``kubernetes.kubelet`` +^^^^^^^^^^^^^^^^^^^^^^ + +This state installs kubelet on supported GNU/Linux only. + +``kubernetes.kubelet.clean`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This state uninstalls kublet on supported GNU/Linux only. + ``kubernetes.minikube`` ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/kubernetes/clean.sls b/kubernetes/clean.sls index b4c4a859..719114b7 100644 --- a/kubernetes/clean.sls +++ b/kubernetes/clean.sls @@ -5,5 +5,7 @@ include: - .minikube.clean - .devspace.clean - .kubectl.clean + - .kubeadm.clean + - .kubelet.clean - .k3s.clean - .kudo.clean diff --git a/kubernetes/defaults.yaml b/kubernetes/defaults.yaml index 9671ed2c..06a12bbf 100644 --- a/kubernetes/defaults.yaml +++ b/kubernetes/defaults.yaml @@ -4,11 +4,13 @@ kubernetes: formula: kubernetes supported: - - kubectl - - minikube - devspace + - kubeadm + - kubectl + - kubelet - k3s - kudo + - minikube identity: rootuser: root rootgroup: root @@ -16,6 +18,16 @@ kubernetes: dir: binary: /usr/local tmp: /tmp/kubernetes-tmp + pkg: + deps: + - curl + repo: + humanname: kubernetes + name: kubernetes + comments: + - installed by salt + enabled: 1 + gpgcheck: 1 kubectl: version: 1.18.2 @@ -28,22 +40,20 @@ kubernetes: name: kubectl use_upstream_repo: false use_upstream_binary: true - deps: - - curl - repo: - humanname: kubernetes - name: kubernetes - comments: - - installed by salt - enabled: 1 - gpgcheck: 1 binary: uri: https://storage.googleapis.com/kubernetes-release/release name: kubectl source: null # set in map.jinja source_hash: 6ea8261b503c6c63d616878837dc70b758d4a3aeb9996ade8e83b51aedac9698 trim_output: true - + kubeadm: + pkg: + name: kubeadm + use_upstream_repo: true + kubelet: + pkg: + name: kubelet + use_upstream_repo: true minikube: version: 1.9.2 config_file: /etc/default/minikube.ini @@ -57,15 +67,6 @@ kubernetes: name: minikube use_upstream_repo: false use_upstream_binary: true - deps: - - curl - repo: - humanname: kubernetes - name: kubernetes - comments: - - installed by salt - enabled: 1 - gpgcheck: 1 binary: name: minikube uri: https://github.com/kubernetes/minikube/releases/download @@ -84,8 +85,6 @@ kubernetes: name: devspace use_upstream_repo: false use_upstream_binary: true - deps: - - curl binary: uri: https://github.com/devspace-cloud/devspace/releases/download name: devspace @@ -98,8 +97,6 @@ kubernetes: pkg: use_upstream_binary: false use_upstream_script: true - deps: - - curl binary: uri: https://github.com/rancher/k3s/releases/download name: k3s @@ -146,8 +143,6 @@ kubernetes: name: kubectl-kudo use_upstream_binary: true use_upstream_package: false - deps: - - curl binary: uri: https://github.com/kudobuilder/kudo/releases/download name: kubectl-kudo diff --git a/kubernetes/devspace/binary/install.sls b/kubernetes/devspace/binary/install.sls index b2b82e72..a39be9ef 100644 --- a/kubernetes/devspace/binary/install.sls +++ b/kubernetes/devspace/binary/install.sls @@ -7,7 +7,7 @@ {{ formula }}-devspace-binary-install: pkg.installed: - - names: {{ d.devspace.pkg.deps|json }} + - names: {{ d.pkg.deps|json }} file.directory: - name: {{ d.devspace.pkg.binary.name }}/bin - user: {{ d.identity.rootuser }} diff --git a/kubernetes/init.sls b/kubernetes/init.sls index a5f59fee..05a847ba 100644 --- a/kubernetes/init.sls +++ b/kubernetes/init.sls @@ -3,6 +3,8 @@ include: - .kubectl + - .kubeadm + - .kubelet - .minikube - .devspace - .k3s diff --git a/kubernetes/k3s/binary/install.sls b/kubernetes/k3s/binary/install.sls index f0dd7a3f..6d076a7a 100644 --- a/kubernetes/k3s/binary/install.sls +++ b/kubernetes/k3s/binary/install.sls @@ -7,7 +7,7 @@ {{ formula }}-k3s-binary-prerequisites: pkg.installed: - - names: {{ d.k3s.pkg.deps|json }} + - names: {{ d.pkg.deps|json }} file.directory: - name: {{ d.k3s.pkg.binary.name }}/bin - user: {{ d.identity.rootuser }} diff --git a/kubernetes/k3s/script/install.sls b/kubernetes/k3s/script/install.sls index 34b6ddf3..8316557a 100644 --- a/kubernetes/k3s/script/install.sls +++ b/kubernetes/k3s/script/install.sls @@ -7,11 +7,11 @@ {{ formula }}-k3s-script-install-prerequisites: pkg.installed: - - names: {{ d.k3s.pkg.deps|json }} + - names: {{ d.pkg.deps|json }} {%- if grains.os_family in ('CentOS',) and d.k3s.pkg.deps_url %} cmd.run: - names: - {%- for pkg in d.k3s.pkg.deps_url %} + {%- for pkg in d.pkg.deps_url %} - yum install -y {{ pkg }} {%- endfor %} - require_in: diff --git a/kubernetes/kubeadm/clean.sls b/kubernetes/kubeadm/clean.sls new file mode 100644 index 00000000..f77852d5 --- /dev/null +++ b/kubernetes/kubeadm/clean.sls @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +include: + - .package.clean diff --git a/kubernetes/kubeadm/init.sls b/kubernetes/kubeadm/init.sls new file mode 100644 index 00000000..18fd41cc --- /dev/null +++ b/kubernetes/kubeadm/init.sls @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +include: + - .package diff --git a/kubernetes/kubeadm/package/clean.sls b/kubernetes/kubeadm/package/clean.sls new file mode 100644 index 00000000..4719a562 --- /dev/null +++ b/kubernetes/kubeadm/package/clean.sls @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +{%- set tplroot = tpldir.split('/')[0] %} +{%- from tplroot ~ "/map.jinja" import data as d with context %} +{%- set formula = d.formula %} + + {%- if grains.kernel|lower in ('linux',) %} + {%- if d.kubeadm.pkg.use_upstream_repo %} + {%- set sls_repo_clean = tplroot ~ '.package.repo.clean' %} +include: + - {{ sls_repo_clean }} + {%- endif %} + +{{ formula }}-kubeadm-package-clean-pkg: + pkg.removed: + - name: {{ d.kubeadm.pkg.name }} + - reload_modules: true + {%- if d.kubeadm.pkg.use_upstream_repo %} + - require: + - pkgrepo: {{ formula }}-package-repo-absent + {%- endif %} + + {%- else %} + +{{ formula }}-kubeadm-package-clean-other: + test.show_notification: + - text: | + The kubeadm package is unavailable for {{ salt['grains.get']('finger', grains.os_family) }} + + {%- endif %} diff --git a/kubernetes/kubectl/package/repo/init.sls b/kubernetes/kubeadm/package/init.sls similarity index 100% rename from kubernetes/kubectl/package/repo/init.sls rename to kubernetes/kubeadm/package/init.sls diff --git a/kubernetes/kubeadm/package/install.sls b/kubernetes/kubeadm/package/install.sls new file mode 100644 index 00000000..ef3039bc --- /dev/null +++ b/kubernetes/kubeadm/package/install.sls @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +{%- set tplroot = tpldir.split('/')[0] %} +{%- from tplroot ~ "/map.jinja" import data as d with context %} +{%- set formula = d.formula %} + + {%- if grains.kernel|lower in ('linux',) %} + {%- if d.kubeadm.pkg.use_upstream_repo %} + {%- set sls_repo_install = tplroot ~ '.package.repo.install' %} +include: + - {{ sls_repo_install }} + {%- endif %} + +{{ formula }}-kubeadm-package-install-deps: + pkg.installed: + - names: {{ d.pkg.deps|json }} + +{{ formula }}-kubeadm-package-install-pkg: + pkg.installed: + - name: {{ d.kubeadm.pkg.name }} + - runas: {{ d.identity.rootuser }} + - reload_modules: true + {%- if d.kubeadm.pkg.use_upstream_repo %} + - require: + - pkgrepo: {{ formula }}-package-repo-managed + {%- endif %} + + {%- else %} + +{{ formula }}-kubeadm-package-install-other: + test.show_notification: + - text: | + The kubeadm package is unavailable for {{ salt['grains.get']('finger', grains.os_family) }} + + {%- endif %} diff --git a/kubernetes/kubectl/binary/install.sls b/kubernetes/kubectl/binary/install.sls index 95291ce3..9ff585ac 100644 --- a/kubernetes/kubectl/binary/install.sls +++ b/kubernetes/kubectl/binary/install.sls @@ -7,7 +7,7 @@ {{ formula }}-kubectl-binary-install: pkg.installed: - - names: {{ d.kubectl.pkg.deps|json }} + - names: {{ d.pkg.deps|json }} file.directory: - name: {{ d.kubectl.pkg.binary.name }}/bin - user: {{ d.identity.rootuser }} diff --git a/kubernetes/kubectl/package/clean.sls b/kubernetes/kubectl/package/clean.sls index 6314168d..2ed5dd6f 100644 --- a/kubernetes/kubectl/package/clean.sls +++ b/kubernetes/kubectl/package/clean.sls @@ -7,8 +7,9 @@ {%- if grains.kernel|lower in ('linux',) %} {%- if d.kubectl.pkg.use_upstream_repo %} + {%- set sls_repo_clean = tplroot ~ '.package.repo.clean' %} include: - - .repo.clean + - {{ sls_repo_clean }} {%- endif %} {{ formula }}-kubectl-package-clean-pkg: @@ -17,7 +18,7 @@ include: - reload_modules: true {%- if d.kubectl.pkg.use_upstream_repo %} - require: - - pkgrepo: {{ formula }}-kubectl-package-repo-absent + - pkgrepo: {{ formula }}-package-repo-absent {%- endif %} {%- elif grains.os_family == 'MacOS' %} diff --git a/kubernetes/kubectl/package/install.sls b/kubernetes/kubectl/package/install.sls index c8fd731b..a2b66ba3 100644 --- a/kubernetes/kubectl/package/install.sls +++ b/kubernetes/kubectl/package/install.sls @@ -7,13 +7,14 @@ {%- if grains.kernel|lower in ('linux',) %} {%- if d.kubectl.pkg.use_upstream_repo %} + {%- set sls_repo_install = tplroot ~ '.package.repo.install' %} include: - - .repo + - {{ sls_repo_install }} {%- endif %} {{ formula }}-kubectl-package-install-deps: pkg.installed: - - names: {{ d.kubectl.pkg.deps|json }} + - names: {{ d.pkg.deps|json }} {{ formula }}-kubectl-package-install-pkg: pkg.installed: @@ -22,7 +23,7 @@ include: - reload_modules: true {%- if d.kubectl.pkg.use_upstream_repo %} - require: - - pkgrepo: {{ formula }}-kubectl-package-repo-managed + - pkgrepo: {{ formula }}-package-repo-managed {%- endif %} {%- elif grains.os_family == 'MacOS' %} @@ -50,6 +51,6 @@ include: - name: snap install {{ d.kubectl.pkg.name }} --classic - onlyif: test -x /usr/bin/snap || test -x /usr/local/bin/snap - require: - - service: d.kubectl-package-install-cmd-run-snap + - service: {{ formula }}-kubectl-package-install-snap {%- endif %} diff --git a/kubernetes/kubelet/clean.sls b/kubernetes/kubelet/clean.sls new file mode 100644 index 00000000..f77852d5 --- /dev/null +++ b/kubernetes/kubelet/clean.sls @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +include: + - .package.clean diff --git a/kubernetes/kubelet/init.sls b/kubernetes/kubelet/init.sls new file mode 100644 index 00000000..18fd41cc --- /dev/null +++ b/kubernetes/kubelet/init.sls @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +include: + - .package diff --git a/kubernetes/kubelet/package/clean.sls b/kubernetes/kubelet/package/clean.sls new file mode 100644 index 00000000..69578d2c --- /dev/null +++ b/kubernetes/kubelet/package/clean.sls @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +{%- set tplroot = tpldir.split('/')[0] %} +{%- from tplroot ~ "/map.jinja" import data as d with context %} +{%- set formula = d.formula %} + + {%- if grains.kernel|lower in ('linux',) %} + {%- if d.kubelet.pkg.use_upstream_repo %} + {%- set sls_repo_clean = tplroot ~ '.package.repo.clean' %} +include: + - {{ sls_repo_clean }} + {%- endif %} + +{{ formula }}-kubelet-package-clean-pkg: + pkg.removed: + - name: {{ d.kubelet.pkg.name }} + - reload_modules: true + {%- if d.kubelet.pkg.use_upstream_repo %} + - require: + - pkgrepo: {{ formula }}-package-repo-absent + {%- endif %} + + {%- else %} + +{{ formula }}-kubelet-package-clean-other: + test.show_notification: + - text: | + The kubelet package is unavailable for {{ salt['grains.get']('finger', grains.os_family) }} + + {%- endif %} diff --git a/kubernetes/minikube/package/repo/init.sls b/kubernetes/kubelet/package/init.sls similarity index 100% rename from kubernetes/minikube/package/repo/init.sls rename to kubernetes/kubelet/package/init.sls diff --git a/kubernetes/kubelet/package/install.sls b/kubernetes/kubelet/package/install.sls new file mode 100644 index 00000000..3c9089fd --- /dev/null +++ b/kubernetes/kubelet/package/install.sls @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +{%- set tplroot = tpldir.split('/')[0] %} +{%- from tplroot ~ "/map.jinja" import data as d with context %} +{%- set formula = d.formula %} + + {%- if grains.kernel|lower in ('linux',) %} + {%- if d.kubelet.pkg.use_upstream_repo %} + {%- set sls_repo_install = tplroot ~ '.package.repo.install' %} +include: + - {{ sls_repo_install }} + {%- endif %} + +{{ formula }}-kubelet-package-install-deps: + pkg.installed: + - names: {{ d.pkg.deps|json }} + +{{ formula }}-kubelet-package-install-pkg: + pkg.installed: + - name: {{ d.kubelet.pkg.name }} + - runas: {{ d.identity.rootuser }} + - reload_modules: true + {%- if d.kubelet.pkg.use_upstream_repo %} + - require: + - pkgrepo: {{ formula }}-package-repo-managed + {%- endif %} + + {%- else %} + +{{ formula }}-kubelet-package-install-other: + test.show_notification: + - text: | + The kubelet package is unavailable for {{ salt['grains.get']('finger', grains.os_family) }} + + {%- endif %} diff --git a/kubernetes/kudo/binary/install.sls b/kubernetes/kudo/binary/install.sls index 2f3cab0f..a79e1157 100644 --- a/kubernetes/kudo/binary/install.sls +++ b/kubernetes/kudo/binary/install.sls @@ -7,7 +7,7 @@ {{ formula }}-kudo-binary-install: pkg.installed: - - names: {{ d.kudo.pkg.deps|json }} + - names: {{ d.pkg.deps|json }} file.directory: - name: {{ d.kudo.pkg.binary.name }}/bin - user: {{ d.identity.rootuser }} diff --git a/kubernetes/minikube/binary/install.sls b/kubernetes/minikube/binary/install.sls index a0599fb6..b0e9e69a 100644 --- a/kubernetes/minikube/binary/install.sls +++ b/kubernetes/minikube/binary/install.sls @@ -7,7 +7,7 @@ {{ formula }}-minikube-binary-install: pkg.installed: - - names: {{ d.minikube.pkg.deps|json }} + - names: {{ d.pkg.deps|json }} file.directory: - name: {{ d.minikube.pkg.binary.name }}/bin - user: {{ d.identity.rootuser }} diff --git a/kubernetes/minikube/package/clean.sls b/kubernetes/minikube/package/clean.sls index 75520ea7..0d05059e 100644 --- a/kubernetes/minikube/package/clean.sls +++ b/kubernetes/minikube/package/clean.sls @@ -7,8 +7,9 @@ {%- if grains.kernel|lower in ('linux',) %} {%- if d.minikube.pkg.use_upstream_repo %} + {%- set sls_repo_clean = tplroot ~ '.package.repo.clean' %} include: - - .repo.clean + - {{ sls_repo_clean }} {%- endif %} {{ formula }}-minikube-package-clean-pkg: @@ -17,7 +18,7 @@ include: - reload_modules: true {%- if d.minikube.pkg.use_upstream_repo %} - require: - - pkgrepo: {{ formula }}-minikube-package-repo-absent + - pkgrepo: {{ formula }}-package-repo-absent {%- endif %} {%- elif grains.os_family == 'MacOS' %} diff --git a/kubernetes/minikube/package/install.sls b/kubernetes/minikube/package/install.sls index e19f44be..f2ff3dda 100644 --- a/kubernetes/minikube/package/install.sls +++ b/kubernetes/minikube/package/install.sls @@ -7,13 +7,14 @@ {%- if grains.kernel|lower in ('linux',) %} {%- if d.minikube.pkg.use_upstream_repo %} + {%- set sls_repo_install = tplroot ~ '.package.repo.install' %} include: - - .repo + - {{ sls_repo_install }} {%- endif %} {{ formula }}-minikube-package-install-deps: pkg.installed: - - names: {{ d.minikube.pkg.deps|json }} + - names: {{ d.pkg.deps|json }} {{ formula }}-minikube-package-installed: pkg.installed: @@ -21,7 +22,7 @@ include: - reload_modules: true {%- if d.minikube.pkg.use_upstream_repo %} - require: - - pkgrepo: {{ formula }}-minikube-package-repo-managed + - pkgrepo: {{ formula }}-package-repo-managed {%- endif %} {%- elif grains.os_family == 'MacOS' %} diff --git a/kubernetes/minikube/package/repo/clean.sls b/kubernetes/minikube/package/repo/clean.sls deleted file mode 100644 index d486e46c..00000000 --- a/kubernetes/minikube/package/repo/clean.sls +++ /dev/null @@ -1,11 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls - -{%- set tplroot = tpldir.split('/')[0] %} -{%- from tplroot ~ "/map.jinja" import data as d with context %} -{%- set formula = d.formula %} - -{{ formula }}-minikube-package-repo-absent: - pkgrepo.absent: - - name: {{ d.minikube.pkg.repo.name }} - - onlyif: {{ d.minikube.pkg.repo and d.minikube.pkg.use_upstream_repo }} diff --git a/kubernetes/minikube/package/repo/install.sls b/kubernetes/minikube/package/repo/install.sls deleted file mode 100644 index 9d5251b6..00000000 --- a/kubernetes/minikube/package/repo/install.sls +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls - -{%- set tplroot = tpldir.split('/')[0] %} -{%- from tplroot ~ "/map.jinja" import data as d with context %} -{%- set formula = d.formula %} - -{%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %} - -{{ formula }}-minikube-package-repo-managed: - pkgrepo.managed: - {{- format_kwargs(d.minikube.pkg.repo) }} - - onlyif: {{ d.minikube.pkg.repo and d.minikube.pkg.use_upstream_repo }} diff --git a/kubernetes/osfamilymap.yaml b/kubernetes/osfamilymap.yaml index 71f9ee0e..1029e2e3 100644 --- a/kubernetes/osfamilymap.yaml +++ b/kubernetes/osfamilymap.yaml @@ -16,63 +16,63 @@ {%- endif %} Debian: + pkg: + repo: + 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 + kubelet: + pkg: + use_upstream_repo: true + kubeadm: + pkg: + use_upstream_repo: true kubectl: pkg: use_upstream_repo: true use_upstream_binary: false - repo: - 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 minikube: pkg: use_upstream_binary: true - repo: - 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 RedHat: + pkg: + deps: + - container-selinux + deps_url: + - https://rpm.rancher.io/k3s-selinux-0.1.1-rc1.el7.noarch.rpm + repo: + baseurl: 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64' + gpgkey: 'https://packages.cloud.google.com/yum/doc/yum-key.gpg gpgkey2=https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg' + repo_gpgcheck: 1 + kubelet: + pkg: + use_upstream_repo: true + kubeadm: + pkg: + use_upstream_repo: true kubectl: pkg: use_upstream_repo: true use_upstream_binary: false - repo: - baseurl: 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64' - gpgkey: 'https://packages.cloud.google.com/yum/doc/yum-key.gpg gpgkey2=https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg' - repo_gpgcheck: 1 - k3s: - pkg: - deps: - - container-selinux - deps_url: - - https://rpm.rancher.io/k3s-selinux-0.1.1-rc1.el7.noarch.rpm Suse: {} Gentoo: {} Arch: - kubectl: - pkg: - deps: - - tar - - gzip - minikube: - pkg: - deps: - - tar - - gzip - k3s: - pkg: - deps: - - which + pkg: + deps: + - tar + - gzip + - which linux: altpriority: 0 Alpine: {} FreeBSD: - rootgroup: wheel + identity: + rootgroup: wheel kubectl: pkg: use_upstream_repo: false @@ -83,7 +83,8 @@ FreeBSD: use_upstream_binary: false OpenBSD: - rootgroup: wheel + identity: + rootgroup: wheel kubectl: pkg: use_upstream_repo: false diff --git a/kubernetes/osfingermap.yaml b/kubernetes/osfingermap.yaml index ac824d44..220683f0 100644 --- a/kubernetes/osfingermap.yaml +++ b/kubernetes/osfingermap.yaml @@ -11,18 +11,14 @@ # osfingermap: {} --- CentOS Linux-8: - k3s: - pkg: - deps: - - selinux-policy - + pkg: + deps: + - selinux-policy CentOS Linux-7: - k3s: - pkg: - deps: - - selinux-policy-base + pkg: + deps: + - selinux-policy-base CentOS-6: - k3s: - pkg: - deps: - - selinux-policy-base + pkg: + deps: + - selinux-policy-base diff --git a/kubernetes/osmap.yaml b/kubernetes/osmap.yaml index cd9dced4..6f0f8966 100644 --- a/kubernetes/osmap.yaml +++ b/kubernetes/osmap.yaml @@ -11,7 +11,6 @@ # osmap: {} --- Fedora: - k3s: - pkg: - deps: - - selinux-policy + pkg: + deps: + - selinux-policy diff --git a/kubernetes/kubectl/package/repo/clean.sls b/kubernetes/package/repo/clean.sls similarity index 61% rename from kubernetes/kubectl/package/repo/clean.sls rename to kubernetes/package/repo/clean.sls index be77bb29..4fd102a2 100644 --- a/kubernetes/kubectl/package/repo/clean.sls +++ b/kubernetes/package/repo/clean.sls @@ -5,7 +5,7 @@ {%- from tplroot ~ "/map.jinja" import data as d with context %} {%- set formula = d.formula %} -{{ formula }}-kubectl-package-repo-absent: +{{ formula }}-package-repo-absent: pkgrepo.absent: - - name: {{ d.kubectl.pkg.repo.name }} - - onlyif: {{ d.kubectl.pkg.repo }} + - name: {{ d.pkg.repo.name }} + - onlyif: {{ d.pkg.repo }} diff --git a/kubernetes/package/repo/init.sls b/kubernetes/package/repo/init.sls new file mode 100644 index 00000000..d3e55181 --- /dev/null +++ b/kubernetes/package/repo/init.sls @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +include: + - .install diff --git a/kubernetes/kubectl/package/repo/install.sls b/kubernetes/package/repo/install.sls similarity index 60% rename from kubernetes/kubectl/package/repo/install.sls rename to kubernetes/package/repo/install.sls index 16404110..feb48eaa 100644 --- a/kubernetes/kubectl/package/repo/install.sls +++ b/kubernetes/package/repo/install.sls @@ -5,7 +5,7 @@ {%- from tplroot ~ "/map.jinja" import data as d with context %} {%- set formula = d.formula %} -{{ formula }}-kubectl-package-repo-managed: +{{ formula }}-package-repo-managed: pkgrepo.managed: - {{- format_kwargs(k8s.kubectl.pkg.repo) }} - - onlyif: {{ d.kubectl.pkg.repo }} + {{- format_kwargs(k8s.pkg.repo) }} + - onlyif: {{ d.pkg.repo }}