From e6d48721852b16e69d0d566598042b71b785fd51 Mon Sep 17 00:00:00 2001 From: kiemlicz Date: Fri, 23 Feb 2024 21:15:58 +0100 Subject: [PATCH] kubevirt and flux cli --- salt/kubernetes/fluxcd/init.sls | 10 ++++++++++ salt/kubernetes/fluxcd/map.jinja | 9 +++++++++ salt/kubernetes/kubevirt/init.sls | 22 ++++++++++++++++++++++ salt/kubernetes/kubevirt/map.jinja | 13 +++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 salt/kubernetes/fluxcd/init.sls create mode 100644 salt/kubernetes/fluxcd/map.jinja create mode 100644 salt/kubernetes/kubevirt/init.sls create mode 100644 salt/kubernetes/kubevirt/map.jinja diff --git a/salt/kubernetes/fluxcd/init.sls b/salt/kubernetes/fluxcd/init.sls new file mode 100644 index 0000000..9b09d4b --- /dev/null +++ b/salt/kubernetes/fluxcd/init.sls @@ -0,0 +1,10 @@ +{%- from "kubernetes/fluxcd/map.jinja" import kubernetes with context %} + +include: + - kubernetes.master + +fluxcd_cli: + cmd.script: + - name: {{ kubernetes.fluxcd.cli_url }} + - require: + - sls: kubernetes.master diff --git a/salt/kubernetes/fluxcd/map.jinja b/salt/kubernetes/fluxcd/map.jinja new file mode 100644 index 0000000..4c8585b --- /dev/null +++ b/salt/kubernetes/fluxcd/map.jinja @@ -0,0 +1,9 @@ +{%- from "kubernetes/map.jinja" import kubernetes as kubernetes_defaults with context %} + +{% set kubernetes = salt['grains.filter_by']({ + 'default': { + 'fluxcd': { + 'cli_url': "https://fluxcd.io/install.sh", + } + }, +}, merge=kubernetes_defaults) %} diff --git a/salt/kubernetes/kubevirt/init.sls b/salt/kubernetes/kubevirt/init.sls new file mode 100644 index 0000000..28fc1cd --- /dev/null +++ b/salt/kubernetes/kubevirt/init.sls @@ -0,0 +1,22 @@ +{%- from "kubernetes/kubevirt/map.jinja" import kubernetes with context %} +{%- from "_common/util.jinja" import retry with context %} + +include: + - kubernetes.master + +kubevirt_operator_apply: + cmd.run: + - name: kubectl apply -f {{ kubernetes.kubevirt.operator }} + - env: + - KUBECONFIG: {{ kubernetes.config.locations|join(':') }} + {{ retry(attempts=3)| indent(4) }} + - require: + - sls: kubernetes.master +kubevirt_cr_apply: + cmd.run: + - name: kubectl apply -f {{ kubernetes.kubevirt.cr }} + - env: + - KUBECONFIG: {{ kubernetes.config.locations|join(':') }} + {{ retry(attempts=3)| indent(4) }} + - require: + - cmd: kubevirt_operator_apply diff --git a/salt/kubernetes/kubevirt/map.jinja b/salt/kubernetes/kubevirt/map.jinja new file mode 100644 index 0000000..eff9fa3 --- /dev/null +++ b/salt/kubernetes/kubevirt/map.jinja @@ -0,0 +1,13 @@ +{%- from "kubernetes/map.jinja" import kubernetes as kubernetes_defaults with context %} + +{%- set kubevirt_version = "v1.1.1" %} + +{% set kubernetes = salt['grains.filter_by']({ + 'default': { + 'kubevirt': { + 'version': kubevirt_version, + 'operator': "https://github.com/kubevirt/kubevirt/releases/download/" ~ kubevirt_version ~ "/kubevirt-operator.yaml", + 'cr': "https://github.com/kubevirt/kubevirt/releases/download/" ~ kubevirt_version ~ "/kubevirt-cr.yaml" + } + }, +}, merge=kubernetes_defaults) %}