Skip to content

Commit

Permalink
Adjust mirror handling for k3s
Browse files Browse the repository at this point in the history
In kubernetes installations we now require the mirror PV to be created
before running mgradm and pass the pv name to --volumes-mirror
  • Loading branch information
cbosdo committed Dec 6, 2024
1 parent d2f822c commit 68cb532
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 1 deletion.
16 changes: 16 additions & 0 deletions salt/server_containerized/install_k3s.sls
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,19 @@ helm_install:
- refresh: True
- name: helm
{% endif %}

{%- set mirror_hostname = grains.get('server_mounted_mirror') if grains.get('server_mounted_mirror') else grains.get('mirror') %}
{% if mirror_hostname %}
mirror_pv_file:
file.managed:
- name: /root/mirror-pv.yaml
- source: salt://server_containerized/mirror-pv.yaml
- template: jinja

mirror_pv_deploy:
cmd.run:
- name: kubectl apply -f /root/mirror-pv.yaml
- unless: kubectl get pv mirror
- require:
- file: mirror_pv_file
{% endif %}
10 changes: 9 additions & 1 deletion salt/server_containerized/mgradm.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% set runtime = grains.get('container_runtime') | default('podman', true) %}
db:
password: spacewalk
reportdb:
Expand All @@ -18,12 +19,19 @@ registry: {{ grains.get('container_repository') }}
tag: {{ grains.get('container_tag') }}
{% endif %}
{%- set mirror_hostname = grains.get('server_mounted_mirror') if grains.get('server_mounted_mirror') else grains.get('mirror') %}
{%- if runtime == 'podman' %}
{%- if mirror_hostname %}
mirror: /srv/mirror
{% endif %}
{%- endif %}
{%- else %}
{%- if mirror_hostname %}
volumes:
mirror: mirror
{%- endif %}
kubernetes:
uyuni:
namespace: uyuni
{%- endif %}
{%- if grains.get("java_debugging") %}
debug:
java: true
Expand Down
22 changes: 22 additions & 0 deletions salt/server_containerized/mirror-pv.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
apiVersion: v1
kind: PersistentVolume
metadata:
name: mirror
spec:
capacity:
storage: 100Gi
volumeMode: Filesystem
accessModes:
- ReadWriteOnce
persistentVolumeReclaimPolicy: Delete
storageClassName: local-storage
local:
path: /srv/mirror
nodeAffinity:
required:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- {{ grains['hostname'] }}

0 comments on commit 68cb532

Please sign in to comment.