updates to annotations and use letsencrypt

Author: anish-mudaraddi

clusters/prod/worker/harbor-values.yaml

@@ -8,12 +8,16 @@ stfc-cloud-harbor:
         certSource: secret
         secret:
           secretName: harbor-tls
-
       ingress:
-        className: ingress-nginx-external
         annotations:
           kubernetes.io/ingress.class: ingress-nginx-external
-          cert-manager.io/cluster-issuer: "self-signed"
+          nginx.ingress.kubernetes.io/proxy-connect-timeout: "900"
+          nginx.ingress.kubernetes.io/proxy-read-timeout: "900"
+          nginx.ingress.kubernetes.io/proxy-send-timeout: "900"
+          nginx.ingress.kubernetes.io/proxy-buffering: "on"
+          nginx.ingress.kubernetes.io/proxy-request-buffering: "off"
+          cert-manager.io/cluster-issuer: letsencrypt-prod
+        className: ingress-nginx-external
         hosts:
           core: "harbor.stfc.ac.uk"
 

clusters/staging/worker/harbor-values.yaml

@@ -3,12 +3,6 @@ stfc-cloud-harbor:
     caSecretName: harbor-tls
     externalURL: "https://staging.harbor.stfc.ac.uk"
 
-    persistence:
-      imageChartStorage:
-        s3:
-          bucket: new-staging-harbor
-          regionendpoint: s3.echo.stfc.ac.uk
-
     expose:
       tls:
         certSource: secret
@@ -33,6 +27,12 @@ stfc-cloud-harbor:
         host: "dbspgha03.fds.rl.ac.uk"
         coreDatabase: "cloud_harbor_registry_dev"
 
+    persistence:
+      imageChartStorage:
+        s3:
+          bucket: new-staging-harbor
+          regionendpoint: s3.echo.stfc.ac.uk
+
     metrics:
       enabled: true
       serviceMonitor: