Merge branch 'cherry-pick-0a282f06' into 'cusprod'

Merge branch 'nsodev' into 'cusqa'

See merge request smardigo-hetzner/mobene/prodwork01-mobene-deployment!98
cherry-pick-20afe452
Michael Hähnel 2 years ago
commit 175c278d85

@ -94,7 +94,7 @@ smardigo-connect:
restart: 20230703-1609
domain: connect-cusprod-prodwork01.smardigo.digital
ingress:
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,92.42.192.9/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
image:
version: 10.5.48
oidc:
@ -164,7 +164,7 @@ smardigo-wordpress:
secretName: "thgquotenservice-de-wildcard-tls"
annotations:
nginx.ingress.kubernetes.io/whitelist-source-range: "0.0.0.0/0"
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,92.42.192.9/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
commonLabels:
app: wordpress
project: thgquotenservice
@ -191,7 +191,7 @@ egeld24-wordpress:
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod-http
nginx.ingress.kubernetes.io/whitelist-source-range: "0.0.0.0/0"
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32,157.90.234.149/32"
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,92.42.192.9/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32,157.90.234.149/32"
commonLabels:
app: wordpress
project: egeld24

@ -71,8 +71,7 @@ smardigo-connect:
volume:
size: 25Gi
additionalVolumes:
-
name: backup-monitoring-script
- name: backup-monitoring-script
mountPath: /nso_scripts
volumeSource:
configMap:
@ -80,8 +79,7 @@ smardigo-connect:
defaultMode: 0777
targetContainers:
- postgres
-
name: pg-backup-script
- name: pg-backup-script
mountPath: /scripts/postgres_backup.sh
subPath: postgres_backup.sh
volumeSource:
@ -90,8 +88,7 @@ smardigo-connect:
defaultMode: 0777
targetContainers:
- postgres
-
name: pg-reschedulebackup-script
- name: pg-reschedulebackup-script
mountPath: /scripts/backup_retry.sh
subPath: backup_retry.sh
volumeSource:
@ -111,7 +108,7 @@ smardigo-connect:
restart: 20230217-1145
domain: connect-cusqa-prodwork01.smardigo.digital
ingress:
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,92.42.192.9/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
image:
version: 10.5.48
oidc:
@ -159,12 +156,12 @@ smardigo-wordpress:
- name: "*.connect-wordpress-cusqa-prodwork01.smardigo.digital"
path: /
extraTls:
- hosts:
- "*.connect-wordpress-cusqa-prodwork01.smardigo.digital"
secretName: "connect-wordpress-cusqa-prodwork01.smardigo.digital-wildcard-tls"
- hosts:
- "*.connect-wordpress-cusqa-prodwork01.smardigo.digital"
secretName: "connect-wordpress-cusqa-prodwork01.smardigo.digital-wildcard-tls"
annotations:
nginx.ingress.kubernetes.io/whitelist-source-range: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
nginx.ingress.kubernetes.io/whitelist-source-range: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,92.42.192.9/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,92.42.192.9/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
commonLabels:
app: wordpress
project: thgquotenservice
@ -183,8 +180,8 @@ egeld24-wordpress:
hostname: egeld24-wordpress-cusqa-prodwork01.smardigo.digital
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod-http
nginx.ingress.kubernetes.io/whitelist-source-range: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
nginx.ingress.kubernetes.io/whitelist-source-range: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,92.42.192.9/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
customIpWhitelist: "212.121.131.106/32,149.233.6.129/32,46.245.219.98/32,164.138.195.162/32,10.0.0.0/16,167.235.150.133/32,167.235.150.197/32,23.88.53.161/32,195.201.113.110/32,5.75.184.216/32,92.42.192.157/32,92.42.192.9/32,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32"
commonLabels:
app: wordpress
project: egeld24

Loading…
Cancel
Save