Merge branch 'cors-headers' into 'master'

fix: add CORS headers to PUT-responses as well

See merge request unboundsoftware/nginx-s3-upload!4

.gitlab-ci.yml

@@ -5,12 +5,12 @@ stages:
 variables:
   DOCKER_HOST: tcp://docker:2375/
 
-image: buildtool/build-tools:0.0.23
+image: buildtool/build-tools:${BUILDTOOLS_VERSION}
 
 build:
   stage: build
   services:
-    - docker:19.03-dind
+    - docker:dind
   script:
   - build
   - push

k8s/deploy.yaml

@@ -72,7 +72,7 @@ spec:
     targetPort: 80
   selector:
     app: nginx-s3-upload
-  type: ClusterIP
+  type: NodePort
 
 ---
 
@@ -81,15 +81,22 @@ kind: Ingress
 metadata:
   name: nginx-s3-upload
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    nginx.ingress.kubernetes.io/enable-cors: "true"
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    kubernetes.io/ingress.class: "alb"
+    alb.ingress.kubernetes.io/group.name: "unbound"
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80},{"HTTPS": 443}]'
+    alb.ingress.kubernetes.io/scheme: internet-facing
+    alb.ingress.kubernetes.io/target-type: instance
+    alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
 spec:
   rules:
   - host: 'upload.unbound.se'
     http:
       paths:
+      - path: /*
+        backend:
+          serviceName: ssl-redirect
+          servicePort: use-annotation
       - backend:
           serviceName: nginx-s3-upload
           servicePort: 80
-        path: /
+        path: /*

nginx.conf

@@ -91,6 +91,11 @@ http {
       resolver 8.8.8.8 valid=300s;
       resolver_timeout 10s;
       add_header 'Access-Control-Expose-Headers' 'X-File-Url';
+      add_header 'Access-Control-Allow-Origin' "*" ;
+      add_header 'Access-Control-Allow-Credentials' 'true' ;
+      add_header 'Access-Control-Allow-Methods' 'GET, PUT, OPTIONS' ;
+      add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Requested-With';
+      add_header 'Access-Control-Max-Age' 1728000;
 
       proxy_pass $url;
     }
@@ -153,6 +158,11 @@ http {
       resolver 8.8.8.8 valid=300s;
       resolver_timeout 10s;
       add_header 'Access-Control-Expose-Headers' 'X-File-Url';
+      add_header 'Access-Control-Allow-Origin' "*" ;
+      add_header 'Access-Control-Allow-Credentials' 'true' ;
+      add_header 'Access-Control-Allow-Methods' 'GET, PUT, OPTIONS' ;
+      add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Requested-With';
+      add_header 'Access-Control-Max-Age' 1728000;
 
       proxy_pass $url;
     }