diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16658cc..f6a8599 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ image: buildtool/build-tools:${BUILDTOOLS_VERSION} build: stage: build services: - - docker:19.03-dind + - docker:dind script: - build - push diff --git a/k8s/deploy.yaml b/k8s/deploy.yaml index 0901316..e755443 100644 --- a/k8s/deploy.yaml +++ b/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: /*