Unverified Commit 9fe370d3 authored by Sebastian Schüpbach's avatar Sebastian Schüpbach
Browse files

Merge branch 'master' of...

Merge branch 'master' of gitlab.switch.ch:memoriav/memobase-2020/services/import-process/media-metadata-extractor
parents 6d01bf68 853bd9fe
Pipeline #52901 passed with stages
in 6 minutes and 3 seconds
#!/usr/bin/env sh
helm upgrade --install -f ./helm-charts/helm-values/di-image-enrichment-prod.yaml di-image-enrichment-prod-deployment ./helm-charts
helm upgrade --install -f ./helm-charts/helm-values/di-av-enrichment-prod.yaml di-av-enrichment-prod-deployment ./helm-charts
#!/usr/bin/env sh
helm upgrade --install -f ./helm-charts/helm-values/di-image-enrichment-stage.yaml di-image-enrichment-stage-deployment ./helm-charts
helm upgrade --install -f ./helm-charts/helm-values/di-av-enrichment-stage.yaml di-av-enrichment-stage-deployment ./helm-charts
#!/usr/bin/env sh
helm upgrade --install -f ./helm-charts/helm-values/di-image-enrichment-test.yaml di-image-enrichment-test-deployment ./helm-charts
helm upgrade --install -f ./helm-charts/helm-values/di-av-enrichment-test.yaml di-av-enrichment-test-deployment ./helm-charts
......@@ -4,15 +4,15 @@ tagIndexerHelper: "latest"
k8sName: av-enricher
k8sEnvironment: prod
k8sReplicas: 2
k8sRequestsCpuExtractor: "0.5"
k8sRequestsCpuExtractor: "0.1"
k8sRequestsMemoryExtractor: "256Mi"
k8sLimitsCpuExtractor: "1"
k8sLimitsMemoryExtractor: "1Gi"
k8sRequestsCpuIndexer: "0.5"
k8sRequestsCpuIndexer: "0.1"
k8sRequestsMemoryIndexer: "1Gi"
k8sLimitsCpuIndexer: "1"
k8sLimitsMemoryIndexer: "2Gi"
k8sRequestsCpuIndexerHelper: "0.5"
k8sRequestsCpuIndexerHelper: "0.1"
k8sRequestsMemoryIndexerHelper: "2Gi"
k8sLimitsCpuIndexerHelper: "2"
k8sLimitsMemoryIndexerHelper: "4Gi"
......
......@@ -4,15 +4,15 @@ tagIndexerHelper: "latest"
k8sName: av-enricher
k8sEnvironment: stage
k8sReplicas: 1
k8sRequestsCpuExtractor: "0.5"
k8sRequestsCpuExtractor: "0.1"
k8sRequestsMemoryExtractor: "256Mi"
k8sLimitsCpuExtractor: "1"
k8sLimitsMemoryExtractor: "1Gi"
k8sRequestsCpuIndexer: "0.5"
k8sRequestsCpuIndexer: "0.1"
k8sRequestsMemoryIndexer: "1Gi"
k8sLimitsCpuIndexer: "1"
k8sLimitsMemoryIndexer: "2Gi"
k8sRequestsCpuIndexerHelper: "0.5"
k8sRequestsCpuIndexerHelper: "0.1"
k8sRequestsMemoryIndexerHelper: "2Gi"
k8sLimitsCpuIndexerHelper: "2"
k8sLimitsMemoryIndexerHelper: "4Gi"
......
......@@ -4,15 +4,15 @@ tagIndexerHelper: "latest"
k8sName: image-enricher
k8sEnvironment: prod
k8sReplicas: 1
k8sRequestsCpuExtractor: "0.5"
k8sRequestsCpuExtractor: "0.1"
k8sRequestsMemoryExtractor: "256Mi"
k8sLimitsCpuExtractor: "1"
k8sLimitsMemoryExtractor: "1Gi"
k8sRequestsCpuIndexer: "0.5"
k8sRequestsCpuIndexer: "0.1"
k8sRequestsMemoryIndexer: "1Gi"
k8sLimitsCpuIndexer: "1"
k8sLimitsMemoryIndexer: "2Gi"
k8sRequestsCpuIndexerHelper: "0.5"
k8sRequestsCpuIndexerHelper: "0.1"
k8sRequestsMemoryIndexerHelper: "2Gi"
k8sLimitsCpuIndexerHelper: "2"
k8sLimitsMemoryIndexerHelper: "4Gi"
......
......@@ -4,15 +4,15 @@ tagIndexerHelper: "latest"
k8sName: image-enricher
k8sEnvironment: stage
k8sReplicas: 1
k8sRequestsCpuExtractor: "0.5"
k8sRequestsCpuExtractor: "0.1"
k8sRequestsMemoryExtractor: "256Mi"
k8sLimitsCpuExtractor: "1"
k8sLimitsMemoryExtractor: "1Gi"
k8sRequestsCpuIndexer: "0.5"
k8sRequestsCpuIndexer: "0.1"
k8sRequestsMemoryIndexer: "1Gi"
k8sLimitsCpuIndexer: "1"
k8sLimitsMemoryIndexer: "2Gi"
k8sRequestsCpuIndexerHelper: "0.5"
k8sRequestsCpuIndexerHelper: "0.1"
k8sRequestsMemoryIndexerHelper: "2Gi"
k8sLimitsCpuIndexerHelper: "2"
k8sLimitsMemoryIndexerHelper: "4Gi"
......
......@@ -4,18 +4,23 @@ metadata:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}"
namespace: "{{ .Values.k8sNamespace }}"
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
app: "{{ .Values.k8sName }}"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
spec:
selector:
matchLabels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
app: "{{ .Values.k8sName }}"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
replicas: {{ .Values.k8sReplicas}}
template:
metadata:
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
app: "{{ .Values.k8sName }}"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
logging: "{{ .Values.k8sLogging }}"
spec:
containers:
- name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-extractor-{{ .Values.k8sEnvironment}}-container"
......
......@@ -4,6 +4,8 @@ metadata:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-extractor-{{ .Values.k8sEnvironment }}-config"
namespace: "{{ .Values.k8sNamespace }}"
labels:
app: "{{ .Values.k8sName }}"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
data:
LOG_LEVEL: "{{ .Values.logLevel }}"
......
......@@ -4,6 +4,8 @@ metadata:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-indexer-{{ .Values.k8sEnvironment }}-config"
namespace: "{{ .Values.k8sNamespace }}"
labels:
app: "{{ .Values.k8sName }}"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
data:
indexer.toml: |-
......
......@@ -4,6 +4,8 @@ metadata:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-indexer-helper-{{ .Values.k8sEnvironment }}-config"
namespace: "{{ .Values.k8sNamespace }}"
labels:
app: "{{ .Values.k8sName }}"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
data:
histogram.toml: |-
......
......@@ -11,6 +11,7 @@ k8sNamespace: memobase
k8sGroupId: di
k8sGroupName: documents-import
k8sEnvironment: placeholder
k8sLogging: special
k8sReplicas: placeholder
k8sRequestsCpuExtractor: placeholder
k8sRequestsMemoryExtractor: placeholder
......
Supports Markdown
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