Merge branch 'main' of https://github.com/slateci/atlas-squid into main

slateci · Feb 14, 2024 · e82d9f0 · e82d9f0
2 parents 1c753a6 + 628d783
commit e82d9f0
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 30 deletions.
diff --git a/.github/workflows/slate-deployment.yml b/.github/workflows/slate-deployment.yml
@@ -13,4 +13,4 @@ jobs:
       mailgun_send_to: "[email protected], [email protected], [email protected]"
     secrets:
       mailgun_api_key: "${{ secrets.MAILGUN_API_KEY }}"
-      slate_api_token: "${{ secrets.SLATE_API_TOKEN }}"
+      slate_api_token: "${{ secrets.SLATE_API_TOKEN }}"
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *~
 mailbody
+.DS_Store
diff --git 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.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
@@ -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
diff --git a/atlas-squid-mwt2-iu-test-1/instance.yaml b/atlas-squid-mwt2-iu-test-1/instance.yaml
@@ -2,4 +2,4 @@ cluster: mwt2-iu-test
 group: atlas-squid
 app: osg-frontier-squid
 
-instance: instance_JMJ1OIEF17c
+instance: instance_Xz3eWqiI3qY
diff --git a/atlas-squid-mwt2-iu-test-1/values.yaml b/atlas-squid-mwt2-iu-test-1/values.yaml
@@ -19,15 +19,15 @@ 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
   CleanLog: False
   LogToStdout: False
   UseHostpathLogDir: True
   Logfile_Rotate: "5"
-  MaxAccessLog: "5000M"
+  MaxAccessLog: "1000M"
 
 Alarm:
   Site: "MWT2"

diff --git a/atlas-squid-net2-1/values.yaml b/atlas-squid-net2-1/values.yaml
@@ -1,27 +1,34 @@
+Instance: "net2-1"
+
+NodeSelection:
+  OpenDefaultMonPort: True
+  Hostname: atlas-slate01
+
 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
+  RequestEphemeralSize: 1024
+  LimitEphemeralSize: 2048
+  CleanLog: False
+  LogToStdout: False
   UseHostpathLogDir: False
-NodeSelection:
-  OpenDefaultMonPort: True
-  Hostname: atlas-slate01
-ImageTag: 3.6-testing
+  Logfile_Rotate: "5"
+  MaxAccessLog: "5000M"
+
+Alarm:
+  Site: "NET2"
+  AaasServer: aaas.atlas-ml.org
diff --git a/atlas-squid-swt2-ou-1/instance.yaml b/atlas-squid-swt2-ou-1/instance.yaml
@@ -0,0 +1,5 @@
+cluster: swt2-ou
+group: atlas-squid
+app: osg-frontier-squid
+
+instance: instance_jMOqp6JJ2VQ
diff --git a/atlas-squid-swt2-ou-1/values.yaml 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.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
+  CacheMem: "16384"
+Instance: !<!> ""
+NodeSelection:
+  OpenDefaultMonPort: True
+  Hostname: slate01.oscer.ou.edu
+Service:
+  ExternalVisibility: NodePort
+  MonitoringPort: 3401
+  Port: 3128
+  NodePort: 32200
+ImageTag: 3.6-testing
diff --git 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
diff --git 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.
@@ -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$"

diff --git 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:
@@ -20,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
+  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