Adding changes made to fix fence (#2510)

* Adding changes made to fix fence * Changing to point to port 8080, where the next Nginx sidecar will listen * Added fixes --------- Co-authored-by: Edward Malinowski <edwardmalinowski@Eds-MacBook-Pro.attlocal.net> Co-authored-by: emalinowski <emalinowski@uchicago.edu>
uc-cdis · Apr 2, 2024 · 2488f0b · 2488f0b
1 parent 7da5150
commit 2488f0b
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 27 deletions.
diff --git a/kube/services/audit-service/audit-service-service.yaml b/kube/services/audit-service/audit-service-service.yaml
@@ -9,7 +9,6 @@ spec:
   ports:
     - protocol: TCP
       port: 80
-      targetPort: 80 
+      targetPort: 8080
       name: http
   type: ClusterIP
-
diff --git a/kube/services/fence/fence-deploy.yaml b/kube/services/fence/fence-deploy.yaml
@@ -119,6 +119,8 @@ spec:
         - name: nginx-main-config
           configMap:
             name: sidecar-nginx-main 
+        - name: fence
+          emptyDir: {}    
       securityContext:
         # nginx group in current images
         fsGroup: 101
@@ -193,6 +195,8 @@ spec:
 # DEPRECATED! Remove when all commons are no longer using local_settings.py
 #             for fence.
 # -----------------------------------------------------------------------------
+          - name: "fence"
+            mountPath: "/var/www/fence"
           - name: "old-config-volume"
             readOnly: true
             mountPath: "/var/www/fence/local_settings.py"
@@ -315,6 +319,8 @@ spec:
             readOnly: true
             mountPath: "/var/www/fence/fence_google_storage_creds_secret.json"
             subPath: fence_google_storage_creds_secret.json
+          - mountPath: /var/www/fence
+            name: "fence"
         command: ["/bin/bash"]
         args:
           - "-c"

diff --git a/kube/services/fence/fence-gunicorn.yaml b/kube/services/fence/fence-gunicorn.yaml
@@ -6,7 +6,8 @@ data:
   gunicorn.conf.py: |
     wsgi_app = "deployment.wsgi.wsgi:application"
     bind = "0.0.0.0:8000"
-    workers = 1
+    workers = 3
+    preload_app = True    
     user = 'gen3'
     group = 'gen3'
-    timeout = 300
+    timeout = 300
diff --git a/kube/services/fence/fence-service.yaml b/kube/services/fence/fence-service.yaml
@@ -9,11 +9,11 @@ spec:
   ports:
     - protocol: TCP
       port: 80
-      targetPort: 80 
+      targetPort: 8080
       name: http
       nodePort: null
-    - protocol: TCP 
-      port: 443 
+    - protocol: TCP
+      port: 443
       targetPort: 443
       name: https
       nodePort: null

diff --git a/kube/services/indexd/indexd-service.yaml b/kube/services/indexd/indexd-service.yaml
@@ -18,13 +18,12 @@ spec:
   ports:
     - protocol: TCP
       port: 80
-      targetPort: 80 
+      targetPort: 8080
       name: http
       nodePort: null
-    - protocol: TCP 
-      port: 443 
+    - protocol: TCP
+      port: 443
       targetPort: 443
       name: https
       nodePort: null
   type: ClusterIP
-
diff --git a/kube/services/manifestservice/manifestservice-service.yaml b/kube/services/manifestservice/manifestservice-service.yaml
@@ -9,6 +9,6 @@ spec:
   ports:
     - protocol: TCP
       port: 80
-      targetPort: 80
+      targetPort: 8080
       name: https
-  type: ClusterIP
+  type: ClusterIP
diff --git a/kube/services/metadata/metadata-service.yaml b/kube/services/metadata/metadata-service.yaml
@@ -18,7 +18,6 @@ spec:
   ports:
     - protocol: TCP
       port: 80
-      targetPort: 80 
+      targetPort: 8080
       name: http
   type: ClusterIP
-
diff --git a/kube/services/peregrine/peregrine-deploy.yaml b/kube/services/peregrine/peregrine-deploy.yaml
@@ -90,6 +90,8 @@ spec:
         - name: nginx-main-config
           configMap:
             name: sidecar-nginx-main 
+        - name: peregrine
+          emptyDir: {}
       containers:
         - name: peregrine
           GEN3_PEREGRINE_IMAGE
@@ -196,6 +198,8 @@ spec:
             - name: "wsgi-config"
               mountPath: "/peregrine/deployment/wsgi/gunicorn.conf.py"
               subPath: gunicorn.conf.py
+            - name: "peregrine"
+              mountPat: "/var/www/peregrine"
           imagePullPolicy: Always
           resources:
             requests:
@@ -231,4 +235,4 @@ spec:
               subPath: "nginx.conf"
             - name: "nginx-config"
               mountPath: "/etc/nginx/conf.d/default.conf"
-              subPath: default.conf
+              subPath: default.conf
diff --git a/kube/services/peregrine/peregrine-gunicorn.yaml b/kube/services/peregrine/peregrine-gunicorn.yaml
@@ -9,4 +9,4 @@ data:
     workers = 1
     user = 'gen3'
     group = 'gen3'
-    timeout = 300
+    timeout = 300
diff --git a/kube/services/peregrine/peregrine-service.yaml b/kube/services/peregrine/peregrine-service.yaml
@@ -9,10 +9,10 @@ spec:
   ports:
     - protocol: TCP
       port: 80
-      targetPort: 80 
+      targetPort: 8080
       name: http
-    - protocol: TCP 
-      port: 443 
+    - protocol: TCP
+      port: 443
       targetPort: 443
       name: https
   type: ClusterIP
diff --git a/kube/services/presigned-url-fence/presigned-url-fence-deploy.yaml b/kube/services/presigned-url-fence/presigned-url-fence-deploy.yaml
@@ -106,6 +106,8 @@ spec:
         - name: privacy-policy
           configMap:
             name: "privacy-policy"
+        - name: fence
+          emptyDir: {}    
       securityContext:
         # nginx group in current images
         fsGroup: 101
@@ -175,6 +177,8 @@ spec:
 # DEPRECATED! Remove when all commons are no longer using local_settings.py
 #             for fence.
 # -----------------------------------------------------------------------------
+          - name: "fence"
+            mountPath: "/var/www/fence"
           - name: "old-config-volume"
             readOnly: true
             mountPath: "/var/www/fence/local_settings.py"

diff --git a/kube/services/requestor/requestor-service.yaml b/kube/services/requestor/requestor-service.yaml
@@ -9,7 +9,6 @@ spec:
   ports:
     - protocol: TCP
       port: 80
-      targetPort: 80 
+      targetPort: 8080
       name: http
   type: ClusterIP
-
diff --git a/kube/services/sheepdog/sheepdog-deploy.yaml b/kube/services/sheepdog/sheepdog-deploy.yaml
@@ -86,6 +86,8 @@ spec:
         - name: nginx-main-config
           configMap:
             name: sidecar-nginx-main 
+        - name: sheepdog
+          emptyDir: {}
       # sheepdog transactions take forever -
       # try to let the complete before termination
       terminationGracePeriodSeconds: 50
@@ -211,6 +213,8 @@ spec:
             - name: "wsgi-config"
               mountPath: "/sheepdog/deployment/wsgi/gunicorn.conf.py"
               subPath: gunicorn.conf.py
+            - name: "sheepdog"
+              mountPath: "/var/www/sheepdog"
           imagePullPolicy: Always
           resources:
             requests:
@@ -234,4 +238,4 @@ spec:
               subPath: "nginx.conf"
             - name: "nginx-config"
               mountPath: "/etc/nginx/conf.d/default.conf"
-              subPath: default.conf
+              subPath: default.conf
diff --git a/kube/services/sheepdog/sheepdog-service.yaml b/kube/services/sheepdog/sheepdog-service.yaml
@@ -9,7 +9,7 @@ spec:
   ports:
     - protocol: TCP
       port: 80
-      targetPort: 80
+      targetPort: 8080
       name: http
       nodePort: null
     - protocol: TCP
@@ -18,4 +18,3 @@ spec:
       name: https
       nodePort: null
   type: ClusterIP
-
diff --git a/kube/services/wts/wts-gunicorn.yaml b/kube/services/wts/wts-gunicorn.yaml
@@ -9,4 +9,4 @@ data:
     workers = 1
     user = 'gen3'
     group = 'gen3'
-    timeout = 300
+    timeout = 300
diff --git a/kube/services/wts/wts-service.yaml b/kube/services/wts/wts-service.yaml
@@ -8,7 +8,7 @@ spec:
   ports:
     - protocol: TCP
       port: 80
-      targetPort: 80
+      targetPort: 8080
       name: http
     - protocol: TCP
       port: 443