EOX GitLab Instance

Commit ff5deae0 authored by Nikola Jankovic's avatar Nikola Jankovic 💻
Browse files

added license

added tagging info to readme
updated cicd deploy->publish
updated cicd helm on tags
added ingress
separated ingress from global
parent 37687e12
stages:
- test
- deploy
- publish
- chart
variables:
......@@ -14,11 +14,11 @@ test:
- pip3 install -r requirements-test.txt
- pytest
deploy_latest:
publish_latest:
image: docker:20.10.8
services:
- docker:20.10.8-dind
stage: deploy
stage: publish
script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
- docker build -t $CI_REGISTRY_IMAGE .
......@@ -26,11 +26,11 @@ deploy_latest:
only:
- main
deploy:
publish:
image: docker:20.10.8
services:
- docker:20.10.8-dind
stage: deploy
stage: publish
script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
- docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG .
......@@ -47,4 +47,3 @@ helm:
- curl -u $HELM_CHART_REPOSITORY_CREDENTIALS -v -X POST https://charts-public.hub.eox.at/api/charts --data-binary "@${upload_filename}"
only:
- tags
- main
MIT License
Copyright (C) 2021 EOX IT Services GmbH
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
# ingestor
the VS Component Handles ingesting process
\ No newline at end of file
the VS Component Handles ingesting process
## Tagging
**Before tagging remember to increment the chart version (`.chart/Chart.yaml`) manually!**
This repository uses `bump2version` for managing tags. To bump a version use
```
bump2version --new-version <new_version> # or bump2version <major|minor|patch>
git push && git push --tags
```
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "vs-ingestor.fullname" . -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "vs-ingestor.labels" . | nindent 4 }}
{{- with .Values.global.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
nginx.ingress.kubernetes.io/rewrite-target: /$1
{{- end }}
spec:
{{- if .Values.global.ingress.tls }}
tls:
{{- range .Values.global.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.global.ingress.hosts }}
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
- host: {{ .host | quote }}
http:
paths:
- path: /ingest/(.*)
pathType: Prefix
backend:
service:
name: {{ $fullName }}
port:
number: 80
{{- else }}
- host: {{ .host | quote }}
http:
paths:
- path: /ingest/(.*)
backend:
serviceName: {{ $fullName }}
servicePort: http
{{- end -}}
{{- end }}
{{- end -}}
......@@ -35,6 +35,9 @@ affinity: {}
volumes: []
volumeMounts: []
ingress:
enabled: true
global:
env:
INSTANCE_ID: "view-server_ingestor"
......@@ -43,7 +46,6 @@ global:
INOTIFY_WATCH_DIR: "/mnt/data"
INOTIFY_MASKS: "IN_MOVED_TO,IN_CLOSE_WRITE"
ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: "true"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment