Syncthing Improvements (#1378)

* DBC22-6710: Add DB Retention Interval to Syncthing

* DBC22-6712: Add retry to OpenShift login

* DBC22-6715: Add CPU Limit to Syncthing

* DBC22-6667: Update oauth-proxy to 4.18

Author: wmuldergov

.github/actions/oc-setup/action.yaml

@@ -31,10 +31,27 @@ runs:
 
     - name: Authenticate and set project
       shell: bash
-      env:
-        OC_SERVER: ${{ inputs.server }}
-        OC_TOKEN: ${{ inputs.token }}
-        OC_NAMESPACE: ${{ inputs.namespace }}
       run: |
-        oc login --server="$OC_SERVER" --token="$OC_TOKEN"
-        oc project "$OC_NAMESPACE"
+        attempt=1
+        max_attempts=3
+
+        until [ $attempt -gt $max_attempts ]
+        do
+          echo "Attempt $attempt of $max_attempts..."
+
+          if oc login --server=${{ inputs.server }} --token=${{ inputs.token }} \
+            && oc project ${{ inputs.namespace }}; then
+            echo "Login successful"
+            break
+          fi
+
+          if [ $attempt -eq $max_attempts ]; then
+            echo "All attempts failed"
+            exit 1
+          fi
+
+          echo "Login failed. Retrying in 30 seconds..."
+          sleep 30
+
+          attempt=$((attempt+1))
+        done

infrastructure/syncthing/templates/deployment.yaml

@@ -25,6 +25,7 @@ spec:
             cpu: {{ .Values.deployment.resources.requests.cpu }}
             memory: {{ .Values.deployment.resources.requests.memory }}
           limits:
+            cpu: {{ .Values.deployment.resources.limits.cpu }}
             memory: {{ .Values.deployment.resources.limits.memory }}
         securityContext:
           seccompProfile:
@@ -42,6 +43,8 @@ spec:
         env:
         - name: STTRACE
           value: "connections:ERROR,model:WARN"
+        - name: STDBDELETERETENTIONINTERVAL
+          value: {{ .Values.deployment.env.dbretention }}
       - name: oauth-proxy
         image: {{ .Values.deployment.oAuthProxy.image.repository }}:{{ .Values.deployment.oAuthProxy.image.tag }}
         imagePullPolicy: Always

infrastructure/syncthing/values-dev.yaml

@@ -14,6 +14,7 @@ deployment:
       cpu: 200m
       memory: 750Mi
     limits:
+      cpu: 1000m # Syncthing should have a CPU Limit as it has been known to use all available CPU on the node if not limited.
       memory: 1Gi
   volumeMounts: # List of volume mounts for the deployment. Can add as many as needed.
     - name: dev-drivebc-syncthing
@@ -28,11 +29,13 @@ deployment:
       mountPath: /app/images/webcams
       persistentVolumeClaim:
         claimName: dev-drivebc-django-app-images
+  env:
+    dbretention: "168h" # 7 days. This is the interval for how long Syncthing will keep deleted files in the database before permanently deleting them. 
   oAuthProxy:
     enabled: true
     image:
       repository: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9
-      tag: v4.16
+      tag: v4.18
     resources:
       requests:
         cpu: 5m

infrastructure/syncthing/values-prod.yaml

@@ -14,6 +14,7 @@ deployment:
       cpu: 350m
       memory: 1Gi
     limits:
+      cpu: 1000m # Syncthing should have a CPU Limit as it has been known to use all available CPU on the node if not limited.
       memory: 1Gi
   volumeMounts: # List of volume mounts for the deployment. Can add as many as needed.
     - name: prod-drivebc-syncthing
@@ -28,11 +29,13 @@ deployment:
       mountPath: /app/images/webcams
       persistentVolumeClaim:
         claimName: prod-drivebc-django-app-images
+  env:
+    dbretention: "168h" # 7 days. This is the interval for how long Syncthing will keep deleted files in the database before permanently deleting them. 
   oAuthProxy:
     enabled: true
     image:
       repository: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9
-      tag: v4.16
+      tag: v4.18
     resources:
       requests:
         cpu: 5m

infrastructure/syncthing/values-test.yaml

@@ -14,6 +14,7 @@ deployment:
       cpu: 200m
       memory: 750Mi
     limits:
+      cpu: 1000m # Syncthing should have a CPU Limit as it has been known to use all available CPU on the node if not limited.
       memory: 1Gi
   volumeMounts: # List of volume mounts for the deployment. Can add as many as needed.
     - name: test-drivebc-syncthing
@@ -28,11 +29,13 @@ deployment:
       mountPath: /app/images/webcams
       persistentVolumeClaim:
         claimName: test-drivebc-django-app-images
+  env:
+    dbretention: "168h" # 7 days. This is the interval for how long Syncthing will keep deleted files in the database before permanently deleting them. 
   oAuthProxy:
     enabled: true
     image:
       repository: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9
-      tag: v4.16
+      tag: v4.18
     resources:
       requests:
         cpu: 5m

infrastructure/syncthing/values-uat.yaml

@@ -14,6 +14,7 @@ deployment:
       cpu: 250m
       memory: 750Mi
     limits:
+      cpu: 1000m # Syncthing should have a CPU Limit as it has been known to use all available CPU on the node if not limited.
       memory: 1Gi
   volumeMounts: # List of volume mounts for the deployment. Can add as many as needed.
     - name: uat-drivebc-syncthing
@@ -28,11 +29,13 @@ deployment:
       mountPath: /app/images/webcams
       persistentVolumeClaim:
         claimName: uat-drivebc-django-app-images
+  env:
+    dbretention: "168h" # 7 days. This is the interval for how long Syncthing will keep deleted files in the database before permanently deleting them.  
   oAuthProxy:
     enabled: true
     image:
       repository: registry.redhat.io/openshift4/ose-oauth-proxy-rhel9
-      tag: v4.16
+      tag: v4.18
     resources:
       requests:
         cpu: 5m