refactor(traefik): restructure port configurations and fix condition logic
- 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:
parent
8dac5fb6d9
commit
c0dcdcfa5b
5 changed files with 65 additions and 29 deletions
|
|
@ -7,35 +7,35 @@ traefik_port_map:
|
||||||
|
|
||||||
- name: k8s-dashboard
|
- name: k8s-dashboard
|
||||||
port: 10001
|
port: 10001
|
||||||
protocol: tcp
|
# protocol: tcp
|
||||||
backend:
|
backend:
|
||||||
namespace: kubernetes-dashboard
|
namespace: kubernetes-dashboard
|
||||||
service: kubernetes-dashboard
|
service: kubernetes-dashboard
|
||||||
port: 443
|
port: 443
|
||||||
# scheme: https
|
scheme: https
|
||||||
basicauth:
|
basicauth:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
||||||
- name: longhorn-ui
|
- name: longhorn-ui
|
||||||
port: 10002
|
port: 10002
|
||||||
protocol: tcp
|
# protocol: tcp
|
||||||
backend:
|
backend:
|
||||||
namespace: longhorn-system
|
namespace: longhorn-system
|
||||||
service: longhorn-frontend
|
service: longhorn-frontend
|
||||||
port: 80
|
port: 80
|
||||||
# scheme: http
|
scheme: http
|
||||||
basicauth:
|
basicauth:
|
||||||
enabled: true
|
enabled: false
|
||||||
secret_name: traefik-auth-longhorn
|
secret_name: traefik-auth-longhorn
|
||||||
|
|
||||||
- name: forgejo
|
- name: forgejo
|
||||||
port: 10003
|
port: 10003
|
||||||
protocol: tcp
|
# protocol: tcp
|
||||||
backend:
|
backend:
|
||||||
namespace: git
|
namespace: git
|
||||||
service: forgejo-http
|
service: forgejo-http
|
||||||
port: 3000
|
port: 3000
|
||||||
# scheme: http
|
scheme: http
|
||||||
basicauth:
|
basicauth:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
KUBECONFIG: "{{ traefik_kubeconfig }}"
|
KUBECONFIG: "{{ traefik_kubeconfig }}"
|
||||||
PATH: "/usr/local/bin:/usr/bin:/bin"
|
PATH: "/usr/local/bin:/usr/bin:/bin"
|
||||||
changed_when: false
|
changed_when: false
|
||||||
|
when: never is true | default(false)
|
||||||
|
|
||||||
- name: Helm | Render Traefik values
|
- name: Helm | Render Traefik values
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,34 @@ ports:
|
||||||
exposedPort: {{ svc.port }}
|
exposedPort: {{ svc.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
{% endfor %}
|
{% 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:
|
web:
|
||||||
expose:
|
expose:
|
||||||
default: false
|
default: false
|
||||||
|
|
|
||||||
|
|
@ -31,11 +31,11 @@ uyuni_certificates:
|
||||||
secretName: db-cert
|
secretName: db-cert
|
||||||
dnsNames:
|
dnsNames:
|
||||||
- uyuni.local.mrwho.ru
|
- 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_admin_user: uyuni
|
||||||
uyuni_db_name: uyuni
|
uyuni_db_name: uyuni
|
||||||
uyuni_db_user: uyuni
|
uyuni_db_user: uyuni
|
||||||
uyuni_db_report_user: uyuni_report
|
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_user: admin
|
||||||
uyuni_admin_password: "{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}"
|
uyuni_admin_password: "nmklop90"
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 10Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | etc-apache2
|
- name: PersistentVolumeClaim | etc-apache2
|
||||||
|
|
@ -67,7 +67,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | etc-cobbler
|
- name: PersistentVolumeClaim | etc-cobbler
|
||||||
|
|
@ -89,7 +89,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | etc-postfix
|
- name: PersistentVolumeClaim | etc-postfix
|
||||||
|
|
@ -111,7 +111,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | etc-rhn
|
- name: PersistentVolumeClaim | etc-rhn
|
||||||
|
|
@ -133,7 +133,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | etc-salt
|
- name: PersistentVolumeClaim | etc-salt
|
||||||
|
|
@ -155,7 +155,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | etc-sssd
|
- name: PersistentVolumeClaim | etc-sssd
|
||||||
|
|
@ -177,7 +177,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | etc-sysconfig
|
- name: PersistentVolumeClaim | etc-sysconfig
|
||||||
|
|
@ -199,7 +199,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 20Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | etc-systemd-multi
|
- name: PersistentVolumeClaim | etc-systemd-multi
|
||||||
|
|
@ -221,7 +221,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | etc-systemd-sockets
|
- name: PersistentVolumeClaim | etc-systemd-sockets
|
||||||
|
|
@ -243,7 +243,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | etc-tomcat
|
- name: PersistentVolumeClaim | etc-tomcat
|
||||||
|
|
@ -265,7 +265,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | run-salt-master
|
- name: PersistentVolumeClaim | run-salt-master
|
||||||
|
|
@ -287,7 +287,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 10Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | srv-formulametadata
|
- name: PersistentVolumeClaim | srv-formulametadata
|
||||||
|
|
@ -309,7 +309,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 10Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | srv-pillar
|
- name: PersistentVolumeClaim | srv-pillar
|
||||||
|
|
@ -331,7 +331,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 10Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | srv-salt
|
- name: PersistentVolumeClaim | srv-salt
|
||||||
|
|
@ -353,7 +353,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 10Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | srv-spacewalk
|
- name: PersistentVolumeClaim | srv-spacewalk
|
||||||
|
|
@ -375,7 +375,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 10Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | srv-susemanager
|
- name: PersistentVolumeClaim | srv-susemanager
|
||||||
|
|
@ -397,7 +397,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 1Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | srv-tftpboot
|
- name: PersistentVolumeClaim | srv-tftpboot
|
||||||
|
|
@ -485,7 +485,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 10Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | var-log
|
- name: PersistentVolumeClaim | var-log
|
||||||
|
|
@ -551,7 +551,7 @@
|
||||||
- ReadWriteOnce
|
- ReadWriteOnce
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 10Mi
|
storage: 300Mi
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
- name: PersistentVolumeClaim | var-search
|
- name: PersistentVolumeClaim | var-search
|
||||||
|
|
@ -985,6 +985,13 @@
|
||||||
optional: false
|
optional: false
|
||||||
image: registry.opensuse.org/uyuni/server:latest
|
image: registry.opensuse.org/uyuni/server:latest
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
memory: "2Gi"
|
||||||
|
cpu: "1"
|
||||||
|
limits:
|
||||||
|
memory: "16Gi"
|
||||||
|
cpu: "2"
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
exec:
|
exec:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue