Commit 77e448ca authored by Akanksha Prasad's avatar Akanksha Prasad
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/search-service into akprasad/search-code-coverage-core
parents 33d70d5d 4a38647b
Pipeline #103889 failed with stages
in 10 minutes and 13 seconds
......@@ -12,8 +12,14 @@ data:
REDIS_SEARCH_PORT: "{{ .Values.data.redis_search_port }}"
AUTHORIZE_API: "{{ .Values.data.authorize_api }}"
SECURITY_HTTPS_CERTIFICATE_TRUST: "{{ .Values.data.security_https_certificate_trust }}"
GOOGLE_AUDIENCES: "{{ .Values.data.audiences }}"
PARTITION_API: "{{ .Values.data.partition_api }}"
POLICY_API: "{{ .Values.data.policy_api }}"
POLICY_ID: "{{ .Values.data.policy_id }}"
SPRING_PROFILES_ACTIVE: "{{ .Values.data.spring_profiles_active }}"
INDEXER_HOST: "{{ .Values.data.indexer_host }}"
{{- if .Values.conf.on_prem_enabled }}
SPRING_PROFILES_ACTIVE: "anthos"
{{- else }}
SPRING_PROFILES_ACTIVE: "gcp"
SERVICE_TOKEN_PROVIDER: "GCP"
GOOGLE_AUDIENCES: "{{ .Values.data.audiences }}"
{{- end }}
......@@ -4,17 +4,19 @@
data:
log_level: "INFO"
redis_group_host: "redis-cache-groups"
redis_search_host: "redis-cache-search"
redis_group_host: "redis-group-master"
redis_search_host: "redis-search-master"
redis_search_port: "6379"
authorize_api: "http://entitlements/api/entitlements/v2"
security_https_certificate_trust: "true"
audiences: ""
partition_api: "http://partition/api/partition/v1/"
policy_api: "https://policy/api/policy/v1/"
policy_id: "search"
spring_profiles_active: "gcp"
indexer_host: "http:indexer/api/indexer/v2/"
#gcp
audiences: ""
conf:
configmap: "search-config"
app_name: "search"
on_prem_enabled: false
{{- if .Values.conf.on_prem_enabled }}
apiVersion: v1
kind: ServiceAccount
metadata:
name: "{{ .Values.data.serviceAccountName }}"
namespace: "{{ .Release.Namespace }}"
{{- end }}
......@@ -7,11 +7,12 @@ data:
requests_memory: "448M"
limits_cpu: "1"
limits_memory: "1G"
serviceAccountName: ""
serviceAccountName: "search"
imagePullPolicy: "IfNotPresent"
image: ""
conf:
configmap: "search-config"
elastic_secret_name: "elastic-secret"
elastic_secret_name: "search-elastic-secret"
app_name: "search"
on_prem_enabled: false
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