refactor(traefik): update uyuni-ingress-nossl service to web on port 80
- Change backend service from uyuni-ingress-nossl to web - Update port from 8080 to 80 to align with standard HTTP This adjustment corrects the Traefik ingress routing to use the standard web service endpoint instead of a custom nossl variant, ensuring compatibility with the updated Uyuni Helm deployment where the primary service exposes HTTP on port 80.
This commit is contained in:
parent
8b3e235f57
commit
6f1c59cb66
3 changed files with 89 additions and 15 deletions
18
.gigacode_vsc/plans/1784667306792-gentle-lagoon.md
Normal file
18
.gigacode_vsc/plans/1784667306792-gentle-lagoon.md
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
# Plan: Fix YAML Indentation in roles/uyuni/tasks/helm.yml
|
||||
|
||||
## Summary
|
||||
Fix indentation issues in `roles/uyuni/tasks/helm.yml` to ensure YAML syntax is correct.
|
||||
|
||||
## Issues Found
|
||||
1. Incorrect indentation in `initContainers` section for `init-volumes` command block
|
||||
2. Incorrect indentation in `initContainers` section for `db-waiter` command block
|
||||
3. The multi-line command strings with `\` continuation characters should use YAML literal block scalar `|` syntax for better readability and correctness
|
||||
|
||||
## Steps
|
||||
1. Read `roles/uyuni/tasks/helm.yml` to understand the current structure
|
||||
2. Fix indentation in the `initContainers` sections for both `init-volumes` and `db-waiter` containers
|
||||
3. Convert multi-line command strings to use YAML literal block scalar `|` syntax
|
||||
4. Ensure all command arguments have proper indentation (2 spaces per level)
|
||||
|
||||
## Expected Outcome
|
||||
YAML file with correct indentation and formatting that will parse without errors.
|
||||
|
|
@ -44,8 +44,8 @@ traefik_port_map:
|
|||
# protocol: tcp
|
||||
backend:
|
||||
namespace: uyuni-server
|
||||
service: uyuni-ingress-nossl
|
||||
port: 8080
|
||||
service: web
|
||||
port: 80
|
||||
scheme: http
|
||||
basicauth:
|
||||
enabled: false
|
||||
|
|
|
|||
|
|
@ -985,6 +985,8 @@
|
|||
optional: false
|
||||
image: registry.opensuse.org/uyuni/server:latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
command: ["/bin/bash"]
|
||||
args: ["-c", "/docker-entrypoint.sh || true; sleep infinity"]
|
||||
# resources:
|
||||
# requests:
|
||||
# memory: "2Gi"
|
||||
|
|
@ -1113,18 +1115,44 @@
|
|||
- mountPath: /sys/fs/cgroup
|
||||
name: sys-fs-cgroup
|
||||
initContainers:
|
||||
- command:
|
||||
- name: init-volumes
|
||||
image: registry.opensuse.org/uyuni/server:latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- sh
|
||||
- -x
|
||||
- -c
|
||||
- "# Fill the empty volumes\nfor vol in /var/lib/cobbler \\\n /var/lib/rhn/search \\\n /var/lib/salt \\\n /var/cache \\\n /var/log \\\n /srv/salt \\\n /srv/www\
|
||||
\ \\\n /srv/tftpboot \\\n /srv/formula_metadata \\\n /srv/pillar \\\n /srv/susemanager \\\n /srv/spacewalk \\\n /etc/apache2 \\\n /etc/rhn \\\n \
|
||||
\ /etc/systemd/system/multi-user.target.wants \\\n /etc/systemd/system/sockets.target.wants \\\n /etc/salt \\\n /etc/tomcat \\\n /etc/cobbler \\\n /etc/sysconfig\
|
||||
\ \\\n /etc/postfix \\\n /etc/sssd\ndo\n chown --reference=$vol /mnt$vol;\n chmod --reference=$vol /mnt$vol;\n if [ -z \"$(ls -A /mnt$vol)\" ]; then\n cp -a $vol/. /mnt$vol;\n\
|
||||
\ fi\ndone\n"
|
||||
image: registry.opensuse.org/uyuni/server:latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
name: init-volumes
|
||||
- |
|
||||
# Fill the empty volumes
|
||||
for vol in /var/lib/cobbler \
|
||||
/var/lib/rhn/search \
|
||||
/var/lib/salt \
|
||||
/var/cache \
|
||||
/var/log \
|
||||
/srv/salt \
|
||||
/srv/www \
|
||||
/srv/tftpboot \
|
||||
/srv/formula_metadata \
|
||||
/srv/pillar \
|
||||
/srv/susemanager \
|
||||
/srv/spacewalk \
|
||||
/etc/apache2 \
|
||||
/etc/rhn \
|
||||
/etc/systemd/system/multi-user.target.wants \
|
||||
/etc/systemd/system/sockets.target.wants \
|
||||
/etc/salt \
|
||||
/etc/tomcat \
|
||||
/etc/cobbler \
|
||||
/etc/sysconfig \
|
||||
/etc/postfix \
|
||||
/etc/sssd
|
||||
do
|
||||
chown --reference=$vol /mnt$vol;
|
||||
chmod --reference=$vol /mnt$vol;
|
||||
if [ -z "$(ls -A /mnt$vol)" ]; then
|
||||
cp -a $vol/. /mnt$vol;
|
||||
fi
|
||||
done
|
||||
securityContext:
|
||||
seLinuxOptions:
|
||||
level: s0
|
||||
|
|
@ -1179,11 +1207,40 @@
|
|||
name: etc-sssd
|
||||
- mountPath: /mnt/etc/rhn
|
||||
name: etc-rhn
|
||||
- command:
|
||||
- mountPath: /etc/pki/trust/anchors/LOCAL-RHN-ORG-TRUSTED-SSL-CERT
|
||||
name: ca-cert
|
||||
readOnly: true
|
||||
subPath: ca.crt
|
||||
- mountPath: /usr/share/susemanager/salt/certs/RHN-ORG-TRUSTED-SSL-CERT
|
||||
name: ca-cert
|
||||
readOnly: true
|
||||
subPath: ca.crt
|
||||
- mountPath: /srv/www/htdocs/pub/RHN-ORG-TRUSTED-SSL-CERT
|
||||
name: ca-cert
|
||||
readOnly: true
|
||||
subPath: ca.crt
|
||||
- mountPath: /etc/pki/trust/anchors/DB-RHN-ORG-TRUSTED-SSL-CERT
|
||||
name: db-ca-cert
|
||||
readOnly: true
|
||||
subPath: ca.crt
|
||||
- mountPath: /etc/pki/
|
||||
name: tls
|
||||
- mountPath: /run
|
||||
name: run
|
||||
- mountPath: /sys/fs/cgroup
|
||||
name: sys-fs-cgroup
|
||||
- name: db-waiter
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- "until pg_isready -U $MANAGER_USER -h $MANAGER_DB_HOST -p $MANAGER_DB_PORT -d $MANAGER_DB_NAME; do\n sleep 60\ndone\n\nuntil pg_isready -U $REPORT_DB_USER -h $REPORT_DB_HOST -p $REPORT_DB_PORT\
|
||||
\ -d $REPORT_DB_NAME; do\n sleep 60\ndone\n"
|
||||
- |
|
||||
until pg_isready -U $MANAGER_USER -h $MANAGER_DB_HOST -p $MANAGER_DB_PORT -d $MANAGER_DB_NAME; do
|
||||
sleep 60
|
||||
done
|
||||
|
||||
until pg_isready -U $REPORT_DB_USER -h $REPORT_DB_HOST -p $REPORT_DB_PORT -d $REPORT_DB_NAME; do
|
||||
sleep 60
|
||||
done
|
||||
env:
|
||||
- name: MANAGER_DB_HOST
|
||||
valueFrom:
|
||||
|
|
@ -1235,7 +1292,6 @@
|
|||
optional: false
|
||||
image: registry.opensuse.org/uyuni/server:latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
name: db-waiter
|
||||
volumes:
|
||||
- name: var-cobbler
|
||||
persistentVolumeClaim:
|
||||
|
|
|
|||
Loading…
Reference in a new issue