diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 558c59eff5bb2d1a4abb87a5981f4b791c230bbf..ccafb85d8d3ff909330cf64c4bfb1e4b478b797b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,3 +4,14 @@ include: variables: INGRESS_HOSTNAME: manifest-$CI_COMMIT_REF_SLUG + +deploy helm chart: + extends: .auto-deploy-helm-chart + environment: + name: $CI_COMMIT_REF_SLUG + on_stop: tear down + auto_stop_in: 1 week + url: https://manifest-$CI_COMMIT_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN + after_script: + - envsubst < .gitlab-ci/kubernetes-resources.yaml > tmp-k8s-resources.yaml + - kubectl apply -f tmp-k8s-resources.yaml diff --git a/.gitlab-ci/kubernetes-resources.yaml b/.gitlab-ci/kubernetes-resources.yaml new file mode 100644 index 0000000000000000000000000000000000000000..b471e93815b764105a0f18e66011cdbb69c3e0b3 --- /dev/null +++ b/.gitlab-ci/kubernetes-resources.yaml @@ -0,0 +1,86 @@ +apiVersion: v1 +kind: Service +metadata: + name: ${OX_COMPONENT}-mw-http-api +spec: + type: ExternalName + externalName: main-core-mw-http-api.appsuite-stack-1494-main.svc.cluster.local + ports: + - name: http + protocol: TCP + port: 80 + targetPort: 80 + +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: ${OX_COMPONENT} +spec: + rules: + - host: manifest-${CI_COMMIT_REF_SLUG}.k3s.os2.oxui.de + http: + paths: + - path: / + pathType: ImplementationSpecific + backend: + service: + name: ${OX_COMPONENT} + port: + name: http + - path: /api/ + pathType: ImplementationSpecific + backend: + service: + name: ${OX_COMPONENT}-mw-http-api + port: + name: http + - path: /ajax/ + pathType: Prefix + backend: + service: + name: ${OX_COMPONENT}-mw-http-api + port: + name: http + - path: /servlet/ + pathType: Prefix + backend: + service: + name: ${OX_COMPONENT}-mw-http-api + port: + name: http + - path: /realtime/ + pathType: Prefix + backend: + service: + name: ${OX_COMPONENT}-mw-http-api + port: + name: http + - path: /infostore/ + pathType: Prefix + backend: + service: + name: ${OX_COMPONENT}-mw-http-api + port: + name: http + - path: /socket.io/ + pathType: Prefix + backend: + service: + name: ${OX_COMPONENT}-mw-http-api + port: + name: http + - path: /oxguard/ + pathType: Prefix + backend: + service: + name: ${OX_COMPONENT}-mw-http-api + port: + name: http + - path: /webservices/ + pathType: Prefix + backend: + service: + name: ${OX_COMPONENT}-mw-http-api + port: + name: http diff --git a/.gitlab-ci/values.yaml b/.gitlab-ci/values.yaml index a6fc8291bceb129916e6491bb13348c99e614579..d5989617f1df988b72b72a53e9103fdb25f85dd4 100644 --- a/.gitlab-ci/values.yaml +++ b/.gitlab-ci/values.yaml @@ -3,15 +3,10 @@ replicaCount: 1 containerPort: 8080 manifests: - - https://preview-main.k3s.os2.oxui.de/manifest.json + - http://main-core-ui.appsuite-stack-1494-main.svc.cluster.local/manifest.json ingress: - enabled: true - hosts: - - host: manifest-${CI_COMMIT_REF_SLUG}.k3s.os2.oxui.de - paths: - - path: / - pathType: ImplementationSpecific + enabled: false image: repository: ${CI_REGISTRY_IMAGE}