Merge branch 'master' into Nicolas_local_ops
This commit is contained in:
commit
020756a397
@ -15,7 +15,7 @@ chat:
|
||||
registry: docker.io
|
||||
repository: null
|
||||
name: chat
|
||||
tag: snapshot-97090e9
|
||||
tag: snapshot-1f1ef3a
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
|
||||
@ -13,7 +13,7 @@ chat:
|
||||
registry: docker.io
|
||||
repository: null
|
||||
name: chat
|
||||
tag: snapshot-e46efad
|
||||
tag: snapshot-b25e221
|
||||
imagePullPolicy: Always
|
||||
ports:
|
||||
- name: http
|
||||
|
||||
@ -93,12 +93,12 @@ devsvc:
|
||||
vpa:
|
||||
minAllowed:
|
||||
enabled: false
|
||||
cpu: "50m"
|
||||
memory: "64Mi"
|
||||
cpu: 50m
|
||||
memory: 64Mi
|
||||
maxAllowed:
|
||||
enabled: true
|
||||
cpu: "200m"
|
||||
memory: "128Mi"
|
||||
cpu: 200m
|
||||
memory: 128Mi
|
||||
controlledResources:
|
||||
- cpu
|
||||
- memory
|
||||
- cpu
|
||||
- memory
|
||||
|
||||
@ -37,3 +37,5 @@ data:
|
||||
REDIS_IS_CLUSTER: {{ .Values.freeleaps.configs.redisIsCluster | b64enc | quote }}
|
||||
METRICS_ENABLED: {{ .Values.freeleaps.configs.metricsEnabled | default false | toString | b64enc }}
|
||||
PROBES_ENABLED: {{ .Values.freeleaps.configs.probesEnabled | default false | toString | b64enc }}
|
||||
GITEA_API_KEY: {{ .Values.freeleaps.configs.giteaApiKey | b64enc | quote }}
|
||||
GITEA_ENDPOINT: {{ .Values.freeleaps.configs.giteaEndpoint | b64enc | quote }}
|
||||
@ -15,7 +15,7 @@ freeleaps:
|
||||
registry: docker.io
|
||||
repository: null
|
||||
name: backend
|
||||
tag: snapshot-97090e9
|
||||
tag: snapshot-1f1ef3a
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
@ -72,7 +72,7 @@ freeleaps:
|
||||
rabbitmqHost: freeleaps-alpha-rabbitmq.freeleaps-alpha.svc.freeleaps.cluster
|
||||
rabbitmqPort: 5672
|
||||
rabbitmqUsername: user
|
||||
rabbitmqPassword: toKhVTIgRqHe3PLy
|
||||
rabbitmqPassword: 4O80YlxnlhHrjzaM
|
||||
freeleapsDevsvcEndpoint: http://devsvc-service.freeleaps-alpha.svc.freeleaps.cluster:8007/api/devsvc/
|
||||
freeleapsContentEndpoint: http://content-service.freeleaps-alpha.svc.freeleaps.cluster:8013/api/content/
|
||||
freeleapsCentralStorageEndpoint: http://central-storage-service.freeleaps-alpha.svc.freeleaps.cluster:8005/api/central_storage/
|
||||
@ -87,6 +87,8 @@ freeleaps:
|
||||
redisIsCluster: 'false'
|
||||
metricsEnabled: 'false'
|
||||
probesEnabled: 'true'
|
||||
giteaApiKey: 737645b8a52b24bf6fc5081c461255fd4c28ab0a
|
||||
giteaEndpoint: https://alpha.gitea.freeleaps.mathmast.com/
|
||||
vpa:
|
||||
minAllowed:
|
||||
enabled: false
|
||||
|
||||
@ -73,6 +73,8 @@ freeleaps:
|
||||
redisIsCluster: 'true'
|
||||
metricsEnabled: 'true'
|
||||
probesEnabled: 'true'
|
||||
giteaApiKey: a61216761e1cda4797c1bc13c4cc26472e9e1eb3
|
||||
giteaEndpoint: https://gitea.freeleaps.mathmast.com/
|
||||
vpa:
|
||||
minAllowed:
|
||||
enabled: true
|
||||
|
||||
@ -112,6 +112,11 @@ freeleaps:
|
||||
metricsEnabled: "false"
|
||||
# PROBES_ENABLED
|
||||
probesEnabled: "false"
|
||||
# GITEA_API_KEY
|
||||
giteaApiKey: ""
|
||||
# GITEA_ENDPOINT
|
||||
giteaEndpoint: ""
|
||||
|
||||
vpa:
|
||||
minAllowed:
|
||||
enabled: true
|
||||
|
||||
Loading…
Reference in New Issue
Block a user