From 219c3ae54eff6591c0dbbb6aa70d859fdabd92f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20H=C3=A4hnel?= Date: Fri, 13 Oct 2023 15:00:35 +0000 Subject: [PATCH] Merge branch 'nsodev' into 'cusqa' HOTFIX: New customer ip address See merge request smardigo-hetzner/mobene/prodwork01-mobene-deployment!97 (cherry picked from commit 0a282f06c8dfb1f65f3c1e7ad8d65e68ac4db1a4) 0066ba54 HOTFIX: New customer ip address --- values_cusprod.yaml | 6 +++--- values_cusqa.yaml | 25 +++++++++++-------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/values_cusprod.yaml b/values_cusprod.yaml index 39c12d6..afdcbc9 100644 --- a/values_cusprod.yaml +++ b/values_cusprod.yaml @@ -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 diff --git a/values_cusqa.yaml b/values_cusqa.yaml index f408f42..b6dfbe6 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -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