From 0babd1c540bf77f0caeebe9e7e05cdfc34e2b27b Mon Sep 17 00:00:00 2001 From: jlstephen Date: Fri, 15 Jul 2022 15:11:29 -0500 Subject: [PATCH 01/40] Add uct2-int.mwt2.org to monitoring ip list --- atlas-squid-uchicago-prod-3/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-uchicago-prod-3/values.yaml b/atlas-squid-uchicago-prod-3/values.yaml index ced12c5..beac72d 100644 --- a/atlas-squid-uchicago-prod-3/values.yaml +++ b/atlas-squid-uchicago-prod-3/values.yaml @@ -20,7 +20,7 @@ SquidConf: DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 - MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 + MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 192.170.240.10/32 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 CleanLog: False From fca54d5e28eff4c90e33775e2a5b5cedcd0d02a3 Mon Sep 17 00:00:00 2001 From: Adam Griffith <94396076+adamhgriffith-uofu@users.noreply.github.com> Date: Wed, 20 Jul 2022 15:34:42 -0600 Subject: [PATCH 02/40] Now using tags for reusable github workflow calls. (#14) --- .github/workflows/slate-deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slate-deployment.yml b/.github/workflows/slate-deployment.yml index bef48cd..2c05b2c 100644 --- a/.github/workflows/slate-deployment.yml +++ b/.github/workflows/slate-deployment.yml @@ -8,9 +8,9 @@ on: jobs: deploy: name: Deploy - uses: slateci/github-actions/.github/workflows/slate-deployment.yml@master + uses: slateci/github-actions/.github/workflows/slate-deployment.yml@v1 with: mailgun_send_to: "lincolnb@uchicago.edu, ssthapa@uchicago.edu, usatlas-federatedops-l@lists.bnl.gov" secrets: mailgun_api_key: "${{ secrets.MAILGUN_API_KEY }}" - slate_api_token: "${{ secrets.SLATE_API_TOKEN }}" \ No newline at end of file + slate_api_token: "${{ secrets.SLATE_API_TOKEN }}" From fa951ab027ee3ab3077b736cd0456808092ed62c Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Thu, 18 Aug 2022 14:21:07 -0400 Subject: [PATCH 03/40] Fix up NET2 configuration. --- atlas-squid-net2-1/values.yaml | 41 ++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index 24aa59b..f335b3f 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -1,27 +1,30 @@ +Instance: "net2-1" + +NodeSelection: + OpenDefaultMonPort: True + Hostname: atlas-slate01.bu.edu + Service: Port: 3128 MonitoringPort: 3401 NodePort: 32200 ExternalVisibility: NodePort -Instance: ! "" + +ImageTag: 3.6-testing + SquidConf: - IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 192.5.207.199/32 192.170.227.128/32 - Logfile_Rotate: ! 50 - #MaximumObjectSizeInMemory: ! 1048704 - RequestEphemeralSize: 100 - CPU: 2 - DisableDiskCache: False + CPU: 4 + CacheMem: "32768" + CacheSize: "25000" CacheDirOnHost: True - CacheSize: "100000" - CleanLog: False - CacheMem: "16384" - LogToStdout: True + DisableDiskCache: False + MaximumObjectSizeInMemory: "1048704" + IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 192.5.207.199/32 192.170.227.128/32 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 - MaxAccessLog: ! 20M - LimitEphemeralSize: 200 - DisableLogging: True - UseHostpathLogDir: False -NodeSelection: - OpenDefaultMonPort: True - Hostname: atlas-slate01 -ImageTag: 3.6-testing + RequestEphemeralSize: 1024 + LimitEphemeralSize: 2048 + CleanLog: False + LogToStdout: False + UseHostpathLogDir: True + Logfile_Rotate: "5" + MaxAccessLog: "1000M" From d1b0088e63e110a6a0981446b180863124bac7a5 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Thu, 18 Aug 2022 14:37:21 -0400 Subject: [PATCH 04/40] Ignore ..DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index eac5b2f..3c1a697 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *~ mailbody +.DS_Store From 065ab5799d5d592a23682ad02112e527b6eacdae Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 11:56:31 -0400 Subject: [PATCH 05/40] Fix up NET2 configuration. Take 2 with service up this time. Add squid downtime alarm. --- atlas-squid-net2-1/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index f335b3f..cb2edff 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -28,3 +28,7 @@ SquidConf: UseHostpathLogDir: True Logfile_Rotate: "5" MaxAccessLog: "1000M" + +Alarm: + Site: "MWT2" + AaasServer: aaas.atlas-ml.org From 9d1a280428672499cec57c2b6b1642c5169b420b Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 12:19:18 -0400 Subject: [PATCH 06/40] NET2: reduce epheral size and make very small log file size. --- atlas-squid-net2-1/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index cb2edff..ae33a2a 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -21,13 +21,13 @@ SquidConf: MaximumObjectSizeInMemory: "1048704" IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 192.5.207.199/32 192.170.227.128/32 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 - RequestEphemeralSize: 1024 - LimitEphemeralSize: 2048 + RequestEphemeralSize: 128 + LimitEphemeralSize: 256 CleanLog: False LogToStdout: False UseHostpathLogDir: True Logfile_Rotate: "5" - MaxAccessLog: "1000M" + MaxAccessLog: "50M" Alarm: Site: "MWT2" From b277bb0e9ca8a7f4ebc920da1d55805cac0628a3 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 12:26:54 -0400 Subject: [PATCH 07/40] NET2: Reduce memory cache size. --- atlas-squid-net2-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index ae33a2a..d19ddb1 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -14,7 +14,7 @@ ImageTag: 3.6-testing SquidConf: CPU: 4 - CacheMem: "32768" + CacheMem: "16384" CacheSize: "25000" CacheDirOnHost: True DisableDiskCache: False From c07bb92e665a8c6f5c82b2d03f53e50f749cdb99 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 12:29:11 -0400 Subject: [PATCH 08/40] NET2: fix alarm site to be NET2 instead MWT2. --- atlas-squid-net2-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index d19ddb1..6a920ba 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -30,5 +30,5 @@ SquidConf: MaxAccessLog: "50M" Alarm: - Site: "MWT2" + Site: "NET2" AaasServer: aaas.atlas-ml.org From 65eee0b24709748cdddaeb16b662247c35c7b377 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 14:28:24 -0400 Subject: [PATCH 09/40] NET2: Reduce number of CPUs. --- atlas-squid-net2-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index 6a920ba..0d23c58 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -13,7 +13,7 @@ Service: ImageTag: 3.6-testing SquidConf: - CPU: 4 + CPU: 2 CacheMem: "16384" CacheSize: "25000" CacheDirOnHost: True From af648826b577430c44cc36cf07b639096dbdfd01 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 15:59:07 -0400 Subject: [PATCH 10/40] NET2: Correct node name. --- atlas-squid-net2-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index 0d23c58..612a13b 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -2,7 +2,7 @@ Instance: "net2-1" NodeSelection: OpenDefaultMonPort: True - Hostname: atlas-slate01.bu.edu + Hostname: atlas-slate01 Service: Port: 3128 From a017578f2ec564906722f8ffa4338d24035fcc9e Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 16:08:43 -0400 Subject: [PATCH 11/40] NET2: Go to 4 CPUs an 32 GB of memory to make a more failover resistant configuration.. --- atlas-squid-net2-1/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index 612a13b..27a95d6 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -13,8 +13,8 @@ Service: ImageTag: 3.6-testing SquidConf: - CPU: 2 - CacheMem: "16384" + CPU: 4 + CacheMem: "32768" CacheSize: "25000" CacheDirOnHost: True DisableDiskCache: False @@ -27,7 +27,7 @@ SquidConf: LogToStdout: False UseHostpathLogDir: True Logfile_Rotate: "5" - MaxAccessLog: "50M" + MaxAccessLog: "500M" Alarm: Site: "NET2" From bacb23d25efc3ef768e19888b76a3840ae9904a0 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 16:16:22 -0400 Subject: [PATCH 12/40] NET2: Turn off logging because path is not defined. --- atlas-squid-net2-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index 27a95d6..6d9c403 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -25,7 +25,7 @@ SquidConf: LimitEphemeralSize: 256 CleanLog: False LogToStdout: False - UseHostpathLogDir: True + UseHostpathLogDir: False Logfile_Rotate: "5" MaxAccessLog: "500M" From 73c05615df6b0c426507cd448b0f3bfccf543694 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 16:25:16 -0400 Subject: [PATCH 13/40] NET2: Increase ephemeral space. --- atlas-squid-net2-1/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index 6d9c403..bf929d0 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -21,8 +21,8 @@ SquidConf: MaximumObjectSizeInMemory: "1048704" IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 192.5.207.199/32 192.170.227.128/32 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 - RequestEphemeralSize: 128 - LimitEphemeralSize: 256 + RequestEphemeralSize: 256 + LimitEphemeralSize: 512 CleanLog: False LogToStdout: False UseHostpathLogDir: False From 7f0193f3cbe9cf5b5aa519540b88ce7eeb0342ec Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 16:29:03 -0400 Subject: [PATCH 14/40] NET2: Increase ephemeral space 2. --- atlas-squid-net2-1/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index bf929d0..e4d6195 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -21,8 +21,8 @@ SquidConf: MaximumObjectSizeInMemory: "1048704" IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 192.5.207.199/32 192.170.227.128/32 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 - RequestEphemeralSize: 256 - LimitEphemeralSize: 512 + RequestEphemeralSize: 512 + LimitEphemeralSize: 1024 CleanLog: False LogToStdout: False UseHostpathLogDir: False From c80f34bd86ae62325ac310f5ae6a47d9254ce72b Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 16:32:18 -0400 Subject: [PATCH 15/40] NET2: Increase ephemeral space 3. --- atlas-squid-net2-1/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml index e4d6195..b08ab21 100644 --- a/atlas-squid-net2-1/values.yaml +++ b/atlas-squid-net2-1/values.yaml @@ -21,13 +21,13 @@ SquidConf: MaximumObjectSizeInMemory: "1048704" IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 192.5.207.199/32 192.170.227.128/32 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 - RequestEphemeralSize: 512 - LimitEphemeralSize: 1024 + RequestEphemeralSize: 1024 + LimitEphemeralSize: 2048 CleanLog: False LogToStdout: False UseHostpathLogDir: False Logfile_Rotate: "5" - MaxAccessLog: "500M" + MaxAccessLog: "5000M" Alarm: Site: "NET2" From d5f1e0a914926bf1e5ffa3278a3204e2aaabaa98 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 31 Aug 2022 16:39:48 -0400 Subject: [PATCH 16/40] MWT2 IU: Turn alarms back on. --- atlas-squid-mwt2-iu-1/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/atlas-squid-mwt2-iu-1/values.yaml b/atlas-squid-mwt2-iu-1/values.yaml index a97d554..5dedc59 100644 --- a/atlas-squid-mwt2-iu-1/values.yaml +++ b/atlas-squid-mwt2-iu-1/values.yaml @@ -29,6 +29,6 @@ SquidConf: Logfile_Rotate: "5" MaxAccessLog: "5000M" -#Alarm: -# Site: "MWT2" -# AaasServer: aaas.atlas-ml.org +Alarm: + Site: "MWT2" + AaasServer: aaas.atlas-ml.org From def39af3158d9e1b4e4863c5e754d43f64d28601 Mon Sep 17 00:00:00 2001 From: Fengping Hu <39425436+fengpinghu@users.noreply.github.com> Date: Fri, 9 Sep 2022 15:16:09 -0500 Subject: [PATCH 17/40] Update values.yaml --- atlas-squid-uchicago-af-1/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atlas-squid-uchicago-af-1/values.yaml b/atlas-squid-uchicago-af-1/values.yaml index d83f49a..07eb4af 100644 --- a/atlas-squid-uchicago-af-1/values.yaml +++ b/atlas-squid-uchicago-af-1/values.yaml @@ -23,7 +23,7 @@ Service: # - ClusterIP - Your service will only be accessible on the cluster's internal # kubernetes network. Use this if you only want to connect to # your service from other services running on the same cluster. - ExternalVisibility: ClusterIP + ExternalVisibility: NodePort # External port on which the service will be accessible when using NodePort # visibility. The default behavior, if this value is not set, is for # Kubernetes to select a port randomly from within its NodePort range. Note @@ -68,7 +68,7 @@ SquidConf: # Use 0.0.0.0/0 for open access. # The default set of ranges are those defined in RFC 1918 and typically used # within kubernetes clusters. - IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 192.170.240.0/23 + IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 192.170.240.0/23 23.134.232.48/28 # The regular expressiion to restrict outbound traffic #RESTRICT_DEST: "^(((cms|atlas).*frontier.*)\\.cern\\.ch)|frontier.*\\.racf\\.bnl\\.gov$" From c94d5c583dd8eb8ca17c133be32d8c6371981ff2 Mon Sep 17 00:00:00 2001 From: Lincoln Bryant Date: Fri, 9 Sep 2022 15:24:02 -0500 Subject: [PATCH 18/40] Update instance.yaml --- atlas-squid-uchicago-af-1/instance.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/atlas-squid-uchicago-af-1/instance.yaml b/atlas-squid-uchicago-af-1/instance.yaml index 0979722..e48b596 100644 --- a/atlas-squid-uchicago-af-1/instance.yaml +++ b/atlas-squid-uchicago-af-1/instance.yaml @@ -1,3 +1,5 @@ cluster: uchicago-af group: atlas-af-ops app: osg-frontier-squid + +instance: instance_JuVpDGq3enQ From 2666c416061135c21b998ea0de3526467b311ee4 Mon Sep 17 00:00:00 2001 From: Lincoln Bryant Date: Fri, 9 Sep 2022 15:24:46 -0500 Subject: [PATCH 19/40] Update values.yaml Make a trivial change to fire off GH Actions --- atlas-squid-uchicago-af-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-uchicago-af-1/values.yaml b/atlas-squid-uchicago-af-1/values.yaml index 07eb4af..bbbd72a 100644 --- a/atlas-squid-uchicago-af-1/values.yaml +++ b/atlas-squid-uchicago-af-1/values.yaml @@ -8,7 +8,7 @@ Instance: "af-01" # Supported values are e.g. 'release' or 'testing' or 'development'. Default is # 'release'. Consult the opensciencegrid/frontier-squid docker image for other # tags. -#ImageTag: release +ImageTag: release Service: # Port that the service will utilize. From ed45ed93ba5c2f5b3f708ea2b5c61d40b48bf9d5 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Thu, 13 Oct 2022 15:59:27 -0400 Subject: [PATCH 20/40] Restart IU squid test instance. --- atlas-squid-mwt2-iu-test-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-mwt2-iu-test-1/values.yaml b/atlas-squid-mwt2-iu-test-1/values.yaml index 31cdfef..c70148b 100644 --- a/atlas-squid-mwt2-iu-test-1/values.yaml +++ b/atlas-squid-mwt2-iu-test-1/values.yaml @@ -27,7 +27,7 @@ SquidConf: LogToStdout: False UseHostpathLogDir: True Logfile_Rotate: "5" - MaxAccessLog: "5000M" + MaxAccessLog: "1000M" Alarm: Site: "MWT2" From ccb21c95112bcdb496a98564def89382e38482cc Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Thu, 13 Oct 2022 16:11:48 -0400 Subject: [PATCH 21/40] Restart IU squid test instance. --- atlas-squid-mwt2-iu-test-1/instance.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/atlas-squid-mwt2-iu-test-1/instance.yaml b/atlas-squid-mwt2-iu-test-1/instance.yaml index e7f9acd..b29214c 100644 --- a/atlas-squid-mwt2-iu-test-1/instance.yaml +++ b/atlas-squid-mwt2-iu-test-1/instance.yaml @@ -1,5 +1,3 @@ cluster: mwt2-iu-test group: atlas-squid app: osg-frontier-squid - -instance: instance_JMJ1OIEF17c \ No newline at end of file From 4dd985b0ad151012ac06943a1fc58d29f9ffdb41 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Thu, 13 Oct 2022 17:35:35 -0400 Subject: [PATCH 22/40] Redoing IU test instance. --- atlas-squid-mwt2-iu-test-1/instance.yaml | 3 --- atlas-squid-mwt2-iu-test-1/values.yaml | 34 ------------------------ 2 files changed, 37 deletions(-) delete mode 100644 atlas-squid-mwt2-iu-test-1/instance.yaml delete mode 100644 atlas-squid-mwt2-iu-test-1/values.yaml diff --git a/atlas-squid-mwt2-iu-test-1/instance.yaml b/atlas-squid-mwt2-iu-test-1/instance.yaml deleted file mode 100644 index b29214c..0000000 --- a/atlas-squid-mwt2-iu-test-1/instance.yaml +++ /dev/null @@ -1,3 +0,0 @@ -cluster: mwt2-iu-test -group: atlas-squid -app: osg-frontier-squid diff --git a/atlas-squid-mwt2-iu-test-1/values.yaml b/atlas-squid-mwt2-iu-test-1/values.yaml deleted file mode 100644 index c70148b..0000000 --- a/atlas-squid-mwt2-iu-test-1/values.yaml +++ /dev/null @@ -1,34 +0,0 @@ -Instance: "mwt2-iu-2" - -NodeSelection: - OpenDefaultMonPort: True - Hostname: iut2-slate01.iu.edu - -Service: - Port: 3128 - MonitoringPort: 3401 - NodePort: 32200 - ExternalVisibility: NodePort - -ImageTag: 3.6-testing - -SquidConf: - CPU: 4 - CacheMem: "4096" - CacheSize: "25000" - CacheDirOnHost: True - DisableDiskCache: False - MaximumObjectSizeInMemory: "1048704" - IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 - MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 - RequestEphemeralSize: 1024 - LimitEphemeralSize: 2048 - CleanLog: False - LogToStdout: False - UseHostpathLogDir: True - Logfile_Rotate: "5" - MaxAccessLog: "1000M" - -Alarm: - Site: "MWT2" - AaasServer: aaas.atlas-ml.org From ce4b08f9aa8cb19b4a26c6793556aac5e448d949 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Thu, 13 Oct 2022 17:42:49 -0400 Subject: [PATCH 23/40] New IU test instance. --- atlas-squid-mwt2-iu-test-1/instance.yaml | 3 +++ atlas-squid-mwt2-iu-test-1/values.yaml | 34 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 atlas-squid-mwt2-iu-test-1/instance.yaml create mode 100644 atlas-squid-mwt2-iu-test-1/values.yaml diff --git a/atlas-squid-mwt2-iu-test-1/instance.yaml b/atlas-squid-mwt2-iu-test-1/instance.yaml new file mode 100644 index 0000000..b29214c --- /dev/null +++ b/atlas-squid-mwt2-iu-test-1/instance.yaml @@ -0,0 +1,3 @@ +cluster: mwt2-iu-test +group: atlas-squid +app: osg-frontier-squid diff --git a/atlas-squid-mwt2-iu-test-1/values.yaml b/atlas-squid-mwt2-iu-test-1/values.yaml new file mode 100644 index 0000000..c70148b --- /dev/null +++ b/atlas-squid-mwt2-iu-test-1/values.yaml @@ -0,0 +1,34 @@ +Instance: "mwt2-iu-2" + +NodeSelection: + OpenDefaultMonPort: True + Hostname: iut2-slate01.iu.edu + +Service: + Port: 3128 + MonitoringPort: 3401 + NodePort: 32200 + ExternalVisibility: NodePort + +ImageTag: 3.6-testing + +SquidConf: + CPU: 4 + CacheMem: "4096" + CacheSize: "25000" + CacheDirOnHost: True + DisableDiskCache: False + MaximumObjectSizeInMemory: "1048704" + IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 + MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 + RequestEphemeralSize: 1024 + LimitEphemeralSize: 2048 + CleanLog: False + LogToStdout: False + UseHostpathLogDir: True + Logfile_Rotate: "5" + MaxAccessLog: "1000M" + +Alarm: + Site: "MWT2" + AaasServer: aaas.atlas-ml.org From 1349fb2232d278e644a446e3b817159db1b675c9 Mon Sep 17 00:00:00 2001 From: luehring Date: Thu, 13 Oct 2022 21:43:36 +0000 Subject: [PATCH 24/40] append new SLATE instance ID --- atlas-squid-mwt2-iu-test-1/instance.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/atlas-squid-mwt2-iu-test-1/instance.yaml b/atlas-squid-mwt2-iu-test-1/instance.yaml index b29214c..ef0cecf 100644 --- a/atlas-squid-mwt2-iu-test-1/instance.yaml +++ b/atlas-squid-mwt2-iu-test-1/instance.yaml @@ -1,3 +1,5 @@ cluster: mwt2-iu-test group: atlas-squid app: osg-frontier-squid + +instance: instance_Xz3eWqiI3qY \ No newline at end of file From c7e6a0e733b4ef9af9911a503fb79ad51e5be1b0 Mon Sep 17 00:00:00 2001 From: jlstephen Date: Thu, 19 Jan 2023 10:35:03 -0600 Subject: [PATCH 25/40] Add iut2-mon to monitoring ip range --- atlas-squid-uchicago-prod-3/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-uchicago-prod-3/values.yaml b/atlas-squid-uchicago-prod-3/values.yaml index beac72d..04d26c0 100644 --- a/atlas-squid-uchicago-prod-3/values.yaml +++ b/atlas-squid-uchicago-prod-3/values.yaml @@ -20,7 +20,7 @@ SquidConf: DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 - MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 192.170.240.10/32 + MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 192.170.240.10/32 149.165.224.253/32 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 CleanLog: False From 4bb3708ba2ba1046302010bbc33f3e73363f6a17 Mon Sep 17 00:00:00 2001 From: Adam Griffith <94396076+adamhgriffith-uofu@users.noreply.github.com> Date: Fri, 3 Mar 2023 13:16:25 -0700 Subject: [PATCH 26/40] Bumped slateci/github-actions ref to master. (#17) --- .github/workflows/slate-deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/slate-deployment.yml b/.github/workflows/slate-deployment.yml index 2c05b2c..60f20f4 100644 --- a/.github/workflows/slate-deployment.yml +++ b/.github/workflows/slate-deployment.yml @@ -8,7 +8,7 @@ on: jobs: deploy: name: Deploy - uses: slateci/github-actions/.github/workflows/slate-deployment.yml@v1 + uses: slateci/github-actions/.github/workflows/slate-deployment.yml@master with: mailgun_send_to: "lincolnb@uchicago.edu, ssthapa@uchicago.edu, usatlas-federatedops-l@lists.bnl.gov" secrets: From be5e9f695bfd16741c44e93a109cb3dcc1657709 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 15 Mar 2023 10:12:48 -0400 Subject: [PATCH 27/40] Add IU Physics Dept subnet to the allow list. --- atlas-squid-mwt2-iu-test-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-mwt2-iu-test-1/values.yaml b/atlas-squid-mwt2-iu-test-1/values.yaml index c70148b..eacfa44 100644 --- a/atlas-squid-mwt2-iu-test-1/values.yaml +++ b/atlas-squid-mwt2-iu-test-1/values.yaml @@ -19,7 +19,7 @@ SquidConf: CacheDirOnHost: True DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" - IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 + IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.159.40/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 From 2f1c05eb3ad3bed41567d341d78377235b67895b Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 15 Mar 2023 12:21:30 -0400 Subject: [PATCH 28/40] Add IU Physics Dept IP range to allowed list for production IU squid. --- atlas-squid-mwt2-iu-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-mwt2-iu-1/values.yaml b/atlas-squid-mwt2-iu-1/values.yaml index 5dedc59..40580c5 100644 --- a/atlas-squid-mwt2-iu-1/values.yaml +++ b/atlas-squid-mwt2-iu-1/values.yaml @@ -19,7 +19,7 @@ SquidConf: CacheDirOnHost: True DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" - IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 + IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.159.40 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 From c887c5bf27bdd2930a71f025d1fca73b9879d72a Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 15 Mar 2023 12:26:37 -0400 Subject: [PATCH 29/40] Add IU Physics Dept IP range to allowed list for production UC squid. --- atlas-squid-uchicago-prod-3/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-uchicago-prod-3/values.yaml b/atlas-squid-uchicago-prod-3/values.yaml index 04d26c0..0b45adf 100644 --- a/atlas-squid-uchicago-prod-3/values.yaml +++ b/atlas-squid-uchicago-prod-3/values.yaml @@ -19,7 +19,7 @@ SquidConf: CacheDirOnHost: True DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" - IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 + IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.159.00/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 192.170.240.10/32 149.165.224.253/32 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 From 5f18926a009eb1ebd9792a36509e5e139e449153 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 15 Mar 2023 12:34:57 -0400 Subject: [PATCH 30/40] Correct typo in IU values.yaml. --- atlas-squid-mwt2-iu-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-mwt2-iu-1/values.yaml b/atlas-squid-mwt2-iu-1/values.yaml index 40580c5..244d5d1 100644 --- a/atlas-squid-mwt2-iu-1/values.yaml +++ b/atlas-squid-mwt2-iu-1/values.yaml @@ -19,7 +19,7 @@ SquidConf: CacheDirOnHost: True DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" - IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.159.40 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 + IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.159.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 From b7811cc573ebe61692ef50d64efd27a1724abebc Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 15 Mar 2023 12:36:35 -0400 Subject: [PATCH 31/40] Clean up syntax on UC squid configuration. --- atlas-squid-uchicago-prod-3/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-uchicago-prod-3/values.yaml b/atlas-squid-uchicago-prod-3/values.yaml index 0b45adf..4ea7378 100644 --- a/atlas-squid-uchicago-prod-3/values.yaml +++ b/atlas-squid-uchicago-prod-3/values.yaml @@ -19,7 +19,7 @@ SquidConf: CacheDirOnHost: True DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" - IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.159.00/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 + IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.159.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 192.170.240.10/32 149.165.224.253/32 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 From 54e90012fa7f140572ddf45afaaf3a94524a624c Mon Sep 17 00:00:00 2001 From: Lincoln Bryant Date: Wed, 15 Mar 2023 15:17:21 -0500 Subject: [PATCH 32/40] Update values.yaml Adding a small cosmetic comment for testing --- atlas-squid-uchicago-prod-3/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/atlas-squid-uchicago-prod-3/values.yaml b/atlas-squid-uchicago-prod-3/values.yaml index 4ea7378..18a3e9f 100644 --- a/atlas-squid-uchicago-prod-3/values.yaml +++ b/atlas-squid-uchicago-prod-3/values.yaml @@ -10,6 +10,7 @@ Service: NodePort: 32200 ExternalVisibility: NodePort +# Should we change this to just 3.6 ? ImageTag: 3.6-testing SquidConf: From 9e06a35b7cbde52781848129439f35222c10fb90 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 22 Mar 2023 15:57:37 -0400 Subject: [PATCH 33/40] Remove 149.165.159.0/24 from the allow list. This IP range belongs to the the JetStream project. --- atlas-squid-mwt2-iu-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-mwt2-iu-1/values.yaml b/atlas-squid-mwt2-iu-1/values.yaml index 244d5d1..5dedc59 100644 --- a/atlas-squid-mwt2-iu-1/values.yaml +++ b/atlas-squid-mwt2-iu-1/values.yaml @@ -19,7 +19,7 @@ SquidConf: CacheDirOnHost: True DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" - IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.159.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 + IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 From f3c32beb9451d1f88d452443fea95f583ef4ad61 Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Wed, 22 Mar 2023 16:00:00 -0400 Subject: [PATCH 34/40] Remove 149.165.159.0/24 from allow list. This IP range belongs to the JetStream project. --- atlas-squid-uchicago-prod-3/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-uchicago-prod-3/values.yaml b/atlas-squid-uchicago-prod-3/values.yaml index 18a3e9f..81cc54f 100644 --- a/atlas-squid-uchicago-prod-3/values.yaml +++ b/atlas-squid-uchicago-prod-3/values.yaml @@ -20,7 +20,7 @@ SquidConf: CacheDirOnHost: True DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" - IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.159.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 + IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 192.170.240.10/32 149.165.224.253/32 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 From 7e5e1b88891505e2c3d227b1a80cd6bd10abaf3b Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Fri, 31 Mar 2023 13:40:59 -0400 Subject: [PATCH 35/40] Remove open port for FNAL Monitoring Dave Dykstra tells me that he is no longer using 131.225.240.232 to monitor our squids. --- atlas-squid-mwt2-iu-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-mwt2-iu-1/values.yaml b/atlas-squid-mwt2-iu-1/values.yaml index 5dedc59..0395b82 100644 --- a/atlas-squid-mwt2-iu-1/values.yaml +++ b/atlas-squid-mwt2-iu-1/values.yaml @@ -20,7 +20,7 @@ SquidConf: DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 - MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 + MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 128.142.0.0/16 188.185.0.0/17 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 CleanLog: False From 8ca62ea7c1cfdb6fc58131f9732fcdf31d78405f Mon Sep 17 00:00:00 2001 From: Frederick Luehring Date: Fri, 31 Mar 2023 13:52:46 -0400 Subject: [PATCH 36/40] Remove open port for FNAL monitoring. Dave Dykstra tells me that he is no longer using 131.225.240.232 to monitor our squids. --- atlas-squid-uchicago-prod-3/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-uchicago-prod-3/values.yaml b/atlas-squid-uchicago-prod-3/values.yaml index 81cc54f..4ca4134 100644 --- a/atlas-squid-uchicago-prod-3/values.yaml +++ b/atlas-squid-uchicago-prod-3/values.yaml @@ -21,7 +21,7 @@ SquidConf: DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 - MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 188.185.0.0/17 131.225.240.232/32 128.142.0.0/16 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 192.170.240.10/32 149.165.224.253/32 + MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 128.142.0.0/16 188.185.0.0/17 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 192.170.240.10/32 149.165.224.253/32 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 CleanLog: False From 302fb9125c8ce468afa35b33c543c619f186bb84 Mon Sep 17 00:00:00 2001 From: jlstephen Date: Tue, 7 Nov 2023 12:05:15 -0600 Subject: [PATCH 37/40] Update MWT2 hosts in MonitoringIPRange for IU --- atlas-squid-mwt2-iu-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-mwt2-iu-1/values.yaml b/atlas-squid-mwt2-iu-1/values.yaml index 0395b82..ef6f6aa 100644 --- a/atlas-squid-mwt2-iu-1/values.yaml +++ b/atlas-squid-mwt2-iu-1/values.yaml @@ -20,7 +20,7 @@ SquidConf: DisableDiskCache: False MaximumObjectSizeInMemory: "1048704" IPRange: 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 72.36.96.0/24 149.165.224.0/23 149.165.236.0/24 192.170.240.0/23 - MonitoringIPRange: 127.0.0.1/32 192.170.227.128/32 128.135.158.191/32 128.142.0.0/16 188.185.0.0/17 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 + MonitoringIPRange: 127.0.0.1/32 192.170.240.10/32 149.165.224.253/32 128.142.0.0/16 188.185.0.0/17 188.184.128.0/17 188.185.48.0/20 188.185.128.0/17 RequestEphemeralSize: 1024 LimitEphemeralSize: 2048 CleanLog: False From 463b114dfb9ad75152647d360285855afc5d1e44 Mon Sep 17 00:00:00 2001 From: Lincoln Bryant Date: Wed, 10 Jan 2024 12:37:57 -0600 Subject: [PATCH 38/40] add Squid at OU --- atlas-squid-swt2-ou-1/instance.yaml | 3 +++ atlas-squid-swt2-ou-1/values.yaml | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 atlas-squid-swt2-ou-1/instance.yaml create mode 100644 atlas-squid-swt2-ou-1/values.yaml diff --git a/atlas-squid-swt2-ou-1/instance.yaml b/atlas-squid-swt2-ou-1/instance.yaml new file mode 100644 index 0000000..99e3481 --- /dev/null +++ b/atlas-squid-swt2-ou-1/instance.yaml @@ -0,0 +1,3 @@ +cluster: swt2-ou +group: atlas-squid +app: osg-frontier-squid diff --git a/atlas-squid-swt2-ou-1/values.yaml b/atlas-squid-swt2-ou-1/values.yaml new file mode 100644 index 0000000..e713527 --- /dev/null +++ b/atlas-squid-swt2-ou-1/values.yaml @@ -0,0 +1,26 @@ +SquidConf: + LimitEphemeralSize: 2000 + CacheSize: 100000 + MonitoringIPRange: 127.0.0.1/32 129.107.255.0/24 128.142.0.0/16 188.185.0.0/17 192.170.227.128/32 + Logfile_Rotate: ! 50 + MaxAccessLog: ! 20M + CPU: 4 + DisableLogging: True + CleanLog: True + DisableDiskCache: False + CacheDirOnHost: True + IPRange: 10.1.0.0/16 129.107.255.0/24 129.15.40.0/23 129.15.42.0/23 129.15.30.0/23 + MaximumObjectSizeInMemory: ! 1048704 + RequestEphemeralSize: 1000 + LogToStdout: False + CacheMem: "16384" +Instance: ! "" +NodeSelection: + OpenDefaultMonPort: True + Hostname: slate01.oscer.ou.edu +Service: + ExternalVisibility: NodePort + MonitoringPort: 3401 + Port: 3128 + NodePort: 32200 +ImageTag: 3.6-testing From 64afae717c970b4aa9c0532b884fd40df2aa9ef3 Mon Sep 17 00:00:00 2001 From: LincolnBryant Date: Wed, 10 Jan 2024 18:38:42 +0000 Subject: [PATCH 39/40] append new SLATE instance ID --- atlas-squid-swt2-ou-1/instance.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/atlas-squid-swt2-ou-1/instance.yaml b/atlas-squid-swt2-ou-1/instance.yaml index 99e3481..cb648b2 100644 --- a/atlas-squid-swt2-ou-1/instance.yaml +++ b/atlas-squid-swt2-ou-1/instance.yaml @@ -1,3 +1,5 @@ cluster: swt2-ou group: atlas-squid app: osg-frontier-squid + +instance: instance_jMOqp6JJ2VQ \ No newline at end of file From 628d783ea04e2236f3a9ce81ceeac1b4c4075c46 Mon Sep 17 00:00:00 2001 From: Lincoln Bryant Date: Thu, 11 Jan 2024 11:53:49 -0600 Subject: [PATCH 40/40] added 10.251.0.0/16 per Horst's request --- atlas-squid-swt2-ou-1/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-squid-swt2-ou-1/values.yaml b/atlas-squid-swt2-ou-1/values.yaml index e713527..df8d0dd 100644 --- a/atlas-squid-swt2-ou-1/values.yaml +++ b/atlas-squid-swt2-ou-1/values.yaml @@ -9,7 +9,7 @@ SquidConf: CleanLog: True DisableDiskCache: False CacheDirOnHost: True - IPRange: 10.1.0.0/16 129.107.255.0/24 129.15.40.0/23 129.15.42.0/23 129.15.30.0/23 + IPRange: 10.251.0.0/16 10.1.0.0/16 129.107.255.0/24 129.15.40.0/23 129.15.42.0/23 129.15.30.0/23 MaximumObjectSizeInMemory: ! 1048704 RequestEphemeralSize: 1000 LogToStdout: False