mrwho/k8s
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(traefik): restructure port configurations and fix condition logic

Browse source 
- uncomment and finalize port protocols and backend schemes in traefik.yml
- adjust longhorn UI basicauth to disabled for simplified access
- add reportdb-pgsql, salt-publish, and salt-request ports to traefik-values template
- fix conditional execution in helm task to prevent unintended skip
- fix uyuni database credentials by replacing dynamic password lookups with static values
- increase uyuni PVC storage requests from 1-20Mi to 300Mi for consistency
This commit is contained in:
mrwho 2026-07-21 16:27:01 +03:00
parent 8dac5fb6d9
commit c0dcdcfa5b
5 changed files with 65 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
inventory/prod/group_vars/traefik.yml
View file

@ -7,35 +7,35 @@ traefik_port_map:
- name: k8s-dashboard
port: 10001
protocol: tcp
# protocol: tcp
backend:
namespace: kubernetes-dashboard
service: kubernetes-dashboard
port: 443
# scheme: https
scheme: https
basicauth:
enabled: false
- name: longhorn-ui
port: 10002
protocol: tcp
# protocol: tcp
backend:
namespace: longhorn-system
service: longhorn-frontend
port: 80
# scheme: http
scheme: http
basicauth:
enabled: true
enabled: false
secret_name: traefik-auth-longhorn
- name: forgejo
port: 10003
protocol: tcp
# protocol: tcp
backend:
namespace: git
service: forgejo-http
port: 3000
# scheme: http
scheme: http
basicauth:
enabled: false

1
roles/traefik/tasks/helm.yml
View file

@ -14,6 +14,7 @@
KUBECONFIG: "{{ traefik_kubeconfig }}"
PATH: "/usr/local/bin:/usr/bin:/bin"
changed_when: false
when: never is true | default(false)
- name: Helm | Render Traefik values
ansible.builtin.template:

28
roles/traefik/templates/traefik-values.yml.j2
View file

@ -21,6 +21,34 @@ ports:
exposedPort: {{ svc.port }}
protocol: TCP
{% endfor %}
reportdb-pgsql:
port: 5432
expose:
default: true
exposedPort: 5432
protocol: TCP
hostPort: 5432
containerPort: 5432
salt-publish:
port: 4505
expose:
default: true
exposedPort: 4505
protocol: TCP
hostPort: 4505
containerPort: 4505
salt-request:
port: 4506
expose:
default: true
exposedPort: 4506
protocol: TCP
hostPort: 4506
containerPort: 4506
web:
expose:
default: false

6
roles/uyuni/defaults/main.yml
View file

@ -31,11 +31,11 @@ uyuni_certificates:
secretName: db-cert
dnsNames:
- uyuni.local.mrwho.ru
uyuni_db_admin_password: "{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}"
uyuni_db_admin_password: "XcMeZVAezsZH0znhN1tfGJ94XpWPeZF6"
uyuni_db_admin_user: uyuni
uyuni_db_name: uyuni
uyuni_db_user: uyuni
uyuni_db_report_user: uyuni_report
uyuni_db_report_password: "{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}"
uyuni_db_report_password: "X37yBGsupGIF9QUvtl2h36DZrd6D7Yxv"
uyuni_admin_user: admin
uyuni_admin_password: "{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}"
uyuni_admin_password: "nmklop90"

45
roles/uyuni/tasks/helm.yml
View file

@ -45,7 +45,7 @@
- ReadWriteOnce
resources:
requests:
storage: 10Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | etc-apache2
@ -67,7 +67,7 @@
- ReadWriteOnce
resources:
requests:
storage: 1Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | etc-cobbler
@ -89,7 +89,7 @@
- ReadWriteOnce
resources:
requests:
storage: 1Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | etc-postfix
@ -111,7 +111,7 @@
- ReadWriteOnce
resources:
requests:
storage: 1Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | etc-rhn
@ -133,7 +133,7 @@
- ReadWriteOnce
resources:
requests:
storage: 1Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | etc-salt
@ -155,7 +155,7 @@
- ReadWriteOnce
resources:
requests:
storage: 1Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | etc-sssd
@ -177,7 +177,7 @@
- ReadWriteOnce
resources:
requests:
storage: 1Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | etc-sysconfig
@ -199,7 +199,7 @@
- ReadWriteOnce
resources:
requests:
storage: 20Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | etc-systemd-multi
@ -221,7 +221,7 @@
- ReadWriteOnce
resources:
requests:
storage: 1Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | etc-systemd-sockets
@ -243,7 +243,7 @@
- ReadWriteOnce
resources:
requests:
storage: 1Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | etc-tomcat
@ -265,7 +265,7 @@
- ReadWriteOnce
resources:
requests:
storage: 1Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | run-salt-master
@ -287,7 +287,7 @@
- ReadWriteOnce
resources:
requests:
storage: 10Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | srv-formulametadata
@ -309,7 +309,7 @@
- ReadWriteOnce
resources:
requests:
storage: 10Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | srv-pillar
@ -331,7 +331,7 @@
- ReadWriteOnce
resources:
requests:
storage: 10Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | srv-salt
@ -353,7 +353,7 @@
- ReadWriteOnce
resources:
requests:
storage: 10Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | srv-spacewalk
@ -375,7 +375,7 @@
- ReadWriteOnce
resources:
requests:
storage: 10Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | srv-susemanager
@ -397,7 +397,7 @@
- ReadWriteOnce
resources:
requests:
storage: 1Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | srv-tftpboot
@ -485,7 +485,7 @@
- ReadWriteOnce
resources:
requests:
storage: 10Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | var-log
@ -551,7 +551,7 @@
- ReadWriteOnce
resources:
requests:
storage: 10Mi
storage: 300Mi
state: present
- name: PersistentVolumeClaim | var-search
@ -985,6 +985,13 @@
optional: false
image: registry.opensuse.org/uyuni/server:latest
imagePullPolicy: IfNotPresent
resources:
requests:
memory: "2Gi"
cpu: "1"
limits:
memory: "16Gi"
cpu: "2"
lifecycle:
preStop:
exec: