bunch of fixes

kiemlicz · Dec 30, 2024 · c6f327c · c6f327c
1 parent 2ef6f4c
commit c6f327c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/salt/kubernetes/cni/cilium.sls b/salt/kubernetes/cni/cilium.sls
@@ -10,6 +10,8 @@ kubernetes_cni_repo:
     - present:
         - name: {{ kubernetes.cni.config.helm.repo }}
           url: https://helm.cilium.io/
+
+{% if kubernetes.cni.install %}
 kubernetes_cni_release:
   helm.release_present:
     - name: {{ kubernetes.cni.config.helm.name }}
@@ -25,3 +27,4 @@ kubernetes_cni_release:
     - require:
       - helm: kubernetes_cni_repo
       - sls: kubernetes.helm
+{% endif %}
diff --git a/salt/kubernetes/cni/map.jinja b/salt/kubernetes/cni/map.jinja
@@ -7,7 +7,7 @@
     'helm': {
         'name': "cilium",
         'namespace': "cilium",
-        'version': "1.15.5",
+        'version': "1.16.4",
         'repo': "cilium",
         'chart': "cilium",
         'set': [],
@@ -26,7 +26,8 @@
   'default': {
     'cni': {
       'provider': default_network_provider,
-      'config': network_provider[default_network_provider]
+      'config': network_provider[default_network_provider],
+      'install': True
     },
     'nodes': {
       'cidr': "192.168.0.0/16",

diff --git a/salt/kubernetes/distro/k3s/config.sls b/salt/kubernetes/distro/k3s/config.sls
@@ -10,7 +10,7 @@ k3s_config:
     - name: {{ k3s.distro_config.installer_file }}
     - contents: {{ k3s.distro_config.installer_config|yaml_encode }}
     - makedirs: True
-    - replace: False
+    - replace: True
     - user: {{ k3s.user }}
     - group: {{ k3s.group|default(k3s.user) }}
     - require:

diff --git a/salt/os/lvm/init.sls b/salt/os/lvm/init.sls
@@ -12,12 +12,14 @@ lvm_pkgs:
     lvm.pv_present:
       - require:
         - pkg: lvm_pkgs
-      - require_in:
-        - lvm: vg_{{ vg }}
 {%- endfor %}
 
+{% set exists = salt['lvm.vgdisplay'](vg) %}
+{% if not exists %}
 vg_{{ vg }}:
   lvm.vg_present:
     - name: {{ vg }}
     - devices: {{ pvs|tojson }}
+{%- endif %}
+
 {%- endfor %}