argocd
/
prodwork01-mobene-deployment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'nsodev' into 'cusqa'

Browse Source 
HOTFIX: New customer ip address

See merge request smardigo-hetzner/mobene/prodwork01-mobene-deployment!97
cherry-pick-20afe452
Michael Hähnel 2 years ago
parent 51d0f55f99 0066ba5454
commit 0a282f06c8
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File

6
values_cusprod.yaml
Unescape Escape View File

@ -96,7 +96,7 @@ smardigo-connect:
restart: 20230703-1609 restart: 20230703-1609
domain: connect-cusprod-prodwork01.smardigo.digital domain: connect-cusprod-prodwork01.smardigo.digital
ingress: 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: image:
version: 10.5.48 version: 10.5.48
oidc: oidc:
@ -166,7 +166,7 @@ smardigo-wordpress:
secretName: "thgquotenservice-de-wildcard-tls" secretName: "thgquotenservice-de-wildcard-tls"
annotations: annotations:
nginx.ingress.kubernetes.io/whitelist-source-range: "0.0.0.0/0" 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: commonLabels:
app: wordpress app: wordpress
project: thgquotenservice project: thgquotenservice
@ -193,7 +193,7 @@ egeld24-wordpress:
annotations: annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod-http cert-manager.io/cluster-issuer: letsencrypt-prod-http
nginx.ingress.kubernetes.io/whitelist-source-range: "0.0.0.0/0" 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: commonLabels:
app: wordpress app: wordpress
project: egeld24 project: egeld24

19
values_cusqa.yaml
Unescape Escape View File

@ -99,8 +99,7 @@ smardigo-connect:
volume: volume:
size: 25Gi size: 25Gi
additionalVolumes: additionalVolumes:
- - name: backup-monitoring-script
name: backup-monitoring-script
mountPath: /nso_scripts mountPath: /nso_scripts
volumeSource: volumeSource:
configMap: configMap:
@ -108,8 +107,7 @@ smardigo-connect:
defaultMode: 0777 defaultMode: 0777
targetContainers: targetContainers:
- postgres - postgres
- - name: pg-backup-script
name: pg-backup-script
mountPath: /scripts/postgres_backup.sh mountPath: /scripts/postgres_backup.sh
subPath: postgres_backup.sh subPath: postgres_backup.sh
volumeSource: volumeSource:
@ -118,8 +116,7 @@ smardigo-connect:
defaultMode: 0777 defaultMode: 0777
targetContainers: targetContainers:
- postgres - postgres
- - name: pg-reschedulebackup-script
name: pg-reschedulebackup-script
mountPath: /scripts/backup_retry.sh mountPath: /scripts/backup_retry.sh
subPath: backup_retry.sh subPath: backup_retry.sh
volumeSource: volumeSource:
@ -139,7 +136,7 @@ smardigo-connect:
restart: 20230217-1145 restart: 20230217-1145
domain: connect-cusqa-prodwork01.smardigo.digital domain: connect-cusqa-prodwork01.smardigo.digital
ingress: 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: image:
version: 11.1.24 version: 11.1.24
envvars: envvars:
@ -201,8 +198,8 @@ smardigo-wordpress:
- "*.connect-wordpress-cusqa-prodwork01.smardigo.digital" - "*.connect-wordpress-cusqa-prodwork01.smardigo.digital"
secretName: "connect-wordpress-cusqa-prodwork01.smardigo.digital-wildcard-tls" secretName: "connect-wordpress-cusqa-prodwork01.smardigo.digital-wildcard-tls"
annotations: 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" 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,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: commonLabels:
app: wordpress app: wordpress
project: thgquotenservice project: thgquotenservice
@ -221,8 +218,8 @@ egeld24-wordpress:
hostname: egeld24-wordpress-cusqa-prodwork01.smardigo.digital hostname: egeld24-wordpress-cusqa-prodwork01.smardigo.digital
annotations: annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod-http 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" 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,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: commonLabels:
app: wordpress app: wordpress
project: egeld24 project: egeld24

Write Preview
Loading…
Cancel
Save