From 4fe7627ab722c8cde68bd28527756e6f107326e4 Mon Sep 17 00:00:00 2001 From: Michael Haehnel Date: Mon, 27 Mar 2023 20:48:12 +0200 Subject: [PATCH] NOTICKET: Added custom ip whitelist for connect app --- Chart.yaml | 2 +- values_cusprod.yaml | 8 +++++--- values_cusqa.yaml | 6 ++++-- values_nsodev.yaml | 2 ++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 1401bff..606a73a 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -31,7 +31,7 @@ dependencies: version: 4.2.1 repository: oci://prodnso-harbor-01.smardigo.digital/infrastructure - name: smardigo-connect - version: 0.1.27 + version: 0.1.30 repository: oci://prodnso-harbor-01.smardigo.digital/smardigo - name: smardigo-worker version: 0.1.13 diff --git a/values_cusprod.yaml b/values_cusprod.yaml index 76f6158..5a3d388 100644 --- a/values_cusprod.yaml +++ b/values_cusprod.yaml @@ -93,6 +93,8 @@ smardigo-connect: additional_labels: restart: 20230131-1854 domain: connect-cusprod-prodwork01.smardigo.digital + ingress: + customIpWhitelist: &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" image: version: 10.4.10 oidc: @@ -140,8 +142,8 @@ smardigo-wordpress: - "*.connect-wordpress-cusprod-prodwork01.smardigo.digital" secretName: "connect-wordpress-cusprod-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,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,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,164.92.251.253/32,91.107.228.133/32,167.235.25.0/32" + customIpWhitelist: *customIpWhitelist commonLabels: app: wordpress project: thgquotenservice @@ -161,7 +163,7 @@ egeld24-wordpress: 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" + customIpWhitelist: *customIpWhitelist commonLabels: app: wordpress project: egeld24 diff --git a/values_cusqa.yaml b/values_cusqa.yaml index fb25f3b..deece91 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -80,6 +80,8 @@ smardigo-connect: additional_labels: restart: 20230217-1145 domain: connect-cusqa-prodwork01.smardigo.digital + ingress: + customIpWhitelist: &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" image: version: 10.4.13 oidc: @@ -128,7 +130,7 @@ smardigo-wordpress: 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" + customIpWhitelist: *customIpWhitelist commonLabels: app: wordpress project: thgquotenservice @@ -148,7 +150,7 @@ egeld24-wordpress: 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" + customIpWhitelist: *customIpWhitelist commonLabels: app: wordpress project: egeld24 diff --git a/values_nsodev.yaml b/values_nsodev.yaml index cbb65a0..36dc5e2 100644 --- a/values_nsodev.yaml +++ b/values_nsodev.yaml @@ -80,6 +80,8 @@ smardigo-connect: additional_labels: restart: 20230217-1145 domain: connect-nsodev-prodwork01.smardigo.digital + ingress: + customIpWhitelist: &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" image: version: 10.4.13 oidc: