Skip to content
Snippets Groups Projects
Commit 6bee6e92 authored by Oleksandr Kosse (EPAM)'s avatar Oleksandr Kosse (EPAM)
Browse files

Merge branch 'GONRG-10655-REMOVE-BM-VALUES' into 'master' 

[GONRG-10655] Remove BM values, fix helm template, fix application properties

See merge request !970
parents 821607f8 be53695e
No related branches found
No related tags found
1 merge request!970[GONRG-10655] Remove BM values, fix helm template, fix application properties
Pipeline #300887 failed
Stage: build
Stage: coverage
Stage: containerize
Stage: scan
Stage: deploy
Stage: integration
Stage: acceptance
Stage: publish
Hide whitespace changes
Inline Side-by-side
Showing
with 70 additions and 110 deletions
devops/gc/deploy/README.md
+ 57
− 62
View file @ 6bee6e92
......@@ -28,86 +28,81 @@ First you need to set variables in **values.yaml** file using any code editor. S
### Global variables
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**global.domain** | your domain for the external endpoint, ex `example.com` | string | - | yes
**global.onPremEnabled** | whether on-prem is enabled | boolean | `false` | yes
**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | `true` | yes
**global.logLevel** | severity of logging level | string | `ERROR` | yes
**global.tier** | Only PROD must be used to enable autoscaling | string | - | no
**global.autoscaling** | enables horizontal pod autoscaling, when tier=PROD | boolean | `true` | yes
| Name | Description | Type | Default | Required |
|--------------------------|---------------------------------------------------------|---------|---------|----------|
| **global.domain** | your domain for the external endpoint, ex `example.com` | string | - | yes |
| **global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | `true` | yes |
| **global.logLevel** | severity of logging level | string | `ERROR` | yes |
| **global.tier** | Only PROD must be used to enable autoscaling | string | - | no |
| **global.autoscaling** | enables horizontal pod autoscaling, when tier=PROD | boolean | `true` | yes |
### Configmap variables
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**data.logLevel** | logging severity level for this service only | string | - | yes, only if differs from the `global.logLevel`
**data.defaultDataCountry** | Data storage region | string | `US` | yes
**data.storageServiceAccountEmail** | Storage service account email, used during OQM events processing | string | `storage@service.local` | yes
**data.entitlementsHost** | Entitlements service host address | string | `http://entitlements` | yes
**data.partitionHost** | Partition service host address | string | `http://partition` | yes
**data.crsConverterHost** | CRS Converter service host address | string | `http://crs-conversion` | yes
**data.legalHost** | Legal service host address | string | `http://legal` | yes
**data.opaEndpoint** | OPA host address | string | `http://opa` | yes
**data.redisStorageHost** | The host for redis instance. If empty (by default), helm installs an internal redis instance | string | - | yes
**data.redisStoragePort** | The port for redis instance | digit | `6379` | yes
| Name | Description | Type | Default | Required |
|-------------------------------------|----------------------------------------------------------------------------------------------|--------|-------------------------|-------------------------------------------------|
| **data.logLevel** | logging severity level for this service only | string | - | yes, only if differs from the `global.logLevel` |
| **data.defaultDataCountry** | Data storage region | string | `US` | yes |
| **data.storageServiceAccountEmail** | Storage service account email, used during OQM events processing | string | `storage@service.local` | yes |
| **data.entitlementsHost** | Entitlements service host address | string | `http://entitlements` | yes |
| **data.partitionHost** | Partition service host address | string | `http://partition` | yes |
| **data.crsConverterHost** | CRS Converter service host address | string | `http://crs-conversion` | yes |
| **data.legalHost** | Legal service host address | string | `http://legal` | yes |
| **data.opaEndpoint** | OPA host address | string | `http://opa` | yes |
| **data.redisStorageHost** | The host for redis instance. If empty (by default), helm installs an internal redis instance | string | - | yes |
| **data.redisStoragePort** | The port for redis instance | digit | `6379` | yes |
### Deployment variables
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**data.requestsCpu** | amount of requested CPU | string | `10m` | yes
**data.requestsMemory** | amount of requested memory| string | `650Mi` | yes
**data.limitsCpu** | CPU limit | string | `1` | only if `global.limitsEnabled` is true
**data.limitsMemory** | memory limit | string | `3G` | only if `global.limitsEnabled` is true
**data.image** | path to the image in a registry | string | - | yes
**data.imagePullPolicy** | when to pull the image | string | `IfNotPresent` | yes
**data.serviceAccountName** | name of kubernetes service account | string | `storage` | yes
**data.redisImage** | service image | string | `redis:7` | yes
| Name | Description | Type | Default | Required |
|-----------------------------|------------------------------------|--------|----------------|----------------------------------------|
| **data.requestsCpu** | amount of requested CPU | string | `10m` | yes |
| **data.requestsMemory** | amount of requested memory | string | `650Mi` | yes |
| **data.limitsCpu** | CPU limit | string | `1` | only if `global.limitsEnabled` is true |
| **data.limitsMemory** | memory limit | string | `3G` | only if `global.limitsEnabled` is true |
| **data.image** | path to the image in a registry | string | - | yes |
| **data.imagePullPolicy** | when to pull the image | string | `IfNotPresent` | yes |
| **data.serviceAccountName** | name of kubernetes service account | string | `storage` | yes |
| **data.redisImage** | service image | string | `redis:7` | yes |
### Configuration variables
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**conf.appName** | Service name | string | `storage` | yes
**conf.keycloakSecretName** | secret for keycloak | string | `storage-keycloak-secret` | yes
**conf.minioSecretName** | secret for minio | string | `storage-minio-secret` | yes
**conf.postgresSecretName** | secret for postgres | string | `storage-postgres-secret` | yes
**conf.rabbitmqSecretName** | secret for rabbitmq | string | `rabbitmq-secret` | yes
**conf.storageRedisSecretName** | secret for redis that contains redis password with REDIS_PASSWORD key | string | `storage-redis-secret` | yes
**conf.replicas** | Number of replicas | integer | `3` | yes
| Name | Description | Type | Default | Required |
|---------------------------------|-----------------------------------------------------------------------|---------|------------------------|----------|
| **conf.appName** | Service name | string | `storage` | yes |
| **conf.storageRedisSecretName** | secret for redis that contains redis password with REDIS_PASSWORD key | string | `storage-redis-secret` | yes |
| **conf.replicas** | Number of replicas | integer | `3` | yes |
### Istio variables
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**istio.proxyCPU** | CPU request for Envoy sidecars | string | `10m` | yes
**istio.proxyCPULimit** | CPU limit for Envoy sidecars | string | `200m` | yes
**istio.proxyMemory** | memory request for Envoy sidecars | string | `100Mi` | yes
**istio.proxyMemoryLimit** | memory limit for Envoy sidecars | string | `256Mi` | yes
| Name | Description | Type | Default | Required |
|----------------------------|-----------------------------------|--------|---------|----------|
| **istio.proxyCPU** | CPU request for Envoy sidecars | string | `10m` | yes |
| **istio.proxyCPULimit** | CPU limit for Envoy sidecars | string | `200m` | yes |
| **istio.proxyMemory** | memory request for Envoy sidecars | string | `100Mi` | yes |
| **istio.proxyMemoryLimit** | memory limit for Envoy sidecars | string | `256Mi` | yes |
### Horizontal Pod Autoscaling (HPA) variables (works only if tier=PROD and autoscaling=true)
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**hpa.minReplicas** | minimum number of replicas | integer | `10` | only if `global.autoscaling` is true and `global.tier` is PROD
**hpa.maxReplicas** | maximum number of replicas | integer | `20` | only if `global.autoscaling` is true and `global.tier` is PROD
**hpa.targetType** | type of measurements: AverageValue or Value | string | `AverageValue` | only if `global.autoscaling` is true and `global.tier` is PROD
**hpa.targetValue** | threshold value to trigger the scaling up | integer | `40` | only if `global.autoscaling` is true and `global.tier` is PROD
**hpa.behaviorScaleUpStabilizationWindowSeconds** | time to start implementing the scale up when it is triggered | integer | `10` | only if `global.autoscaling` is true and `global.tier` is PROD
**hpa.behaviorScaleUpPoliciesValue** | the maximum number of new replicas to create (in percents from current state)| integer | `50` | only if `global.autoscaling` is true and `global.tier` is PROD
**hpa.behaviorScaleUpPoliciesPeriodSeconds** | pause for every new scale up decision | integer | `15` | only if `global.autoscaling` is true and `global.tier` is PROD
**hpa.behaviorScaleDownStabilizationWindowSeconds** | time to start implementing the scale down when it is triggered | integer | `60` | only if `global.autoscaling` is true and `global.tier` is PROD
**hpa.behaviorScaleDownPoliciesValue** | the maximum number of replicas to destroy (in percents from current state) | integer | `25` | only if `global.autoscaling` is true and `global.tier` is PROD
**hpa.behaviorScaleDownPoliciesPeriodSeconds** | pause for every new scale down decision | integer | `60` | only if `global.autoscaling` is true and `global.tier` is PROD
| Name | Description | Type | Default | Required |
|-----------------------------------------------------|-------------------------------------------------------------------------------|---------|----------------|----------------------------------------------------------------|
| **hpa.minReplicas** | minimum number of replicas | integer | `10` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **hpa.maxReplicas** | maximum number of replicas | integer | `20` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **hpa.targetType** | type of measurements: AverageValue or Value | string | `AverageValue` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **hpa.targetValue** | threshold value to trigger the scaling up | integer | `40` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **hpa.behaviorScaleUpStabilizationWindowSeconds** | time to start implementing the scale up when it is triggered | integer | `10` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **hpa.behaviorScaleUpPoliciesValue** | the maximum number of new replicas to create (in percents from current state) | integer | `50` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **hpa.behaviorScaleUpPoliciesPeriodSeconds** | pause for every new scale up decision | integer | `15` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **hpa.behaviorScaleDownStabilizationWindowSeconds** | time to start implementing the scale down when it is triggered | integer | `60` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **hpa.behaviorScaleDownPoliciesValue** | the maximum number of replicas to destroy (in percents from current state) | integer | `25` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **hpa.behaviorScaleDownPoliciesPeriodSeconds** | pause for every new scale down decision | integer | `60` | only if `global.autoscaling` is true and `global.tier` is PROD |
### Limits variables
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**limits.maxTokens** | maximum number of requests per fillInterval | integer | `25` | only if `global.autoscaling` is true and `global.tier` is PROD
**limits.tokensPerFill** | number of new tokens allowed every fillInterval | integer | `25` | only if `global.autoscaling` is true and `global.tier` is PROD
**limits.fillInterval** | time interval | string | `1s` | only if `global.autoscaling` is true and `global.tier` is PROD
| Name | Description | Type | Default | Required |
|--------------------------|-------------------------------------------------|---------|---------|----------------------------------------------------------------|
| **limits.maxTokens** | maximum number of requests per fillInterval | integer | `25` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **limits.tokensPerFill** | number of new tokens allowed every fillInterval | integer | `25` | only if `global.autoscaling` is true and `global.tier` is PROD |
| **limits.fillInterval** | time interval | string | `1s` | only if `global.autoscaling` is true and `global.tier` is PROD |
## Install the Helm chart
......
devops/gc/deploy/templates/configmap.yaml
+ 0
− 5
View file @ 6bee6e92
......@@ -13,11 +13,6 @@ data:
LOG_LEVEL: {{ .Values.data.logLevel | default .Values.global.logLevel | quote }}
PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
STORAGE_SERVICE_ACCOUNT_EMAIL: {{ .Values.data.storageServiceAccountEmail | quote }}
{{- if .Values.global.onPremEnabled }}
SPRING_PROFILES_ACTIVE: "anthos"
{{- else }}
SPRING_PROFILES_ACTIVE: "gcp"
{{- end }}
OPA_ENDPOINT: {{ .Values.data.opaEndpoint | quote }}
{{- if .Values.data.redisStorageHost }}
REDIS_GROUP_HOST: {{ .Values.data.redisStorageHost | quote }}
......
devops/gc/deploy/templates/deployment.yaml
+ 0
− 10
View file @ 6bee6e92
......@@ -41,16 +41,6 @@ spec:
envFrom:
- configMapRef:
name: {{ printf "%s-config" .Values.conf.appName | quote }}
{{- if .Values.global.onPremEnabled }}
- secretRef:
name: {{ .Values.conf.keycloakSecretName | quote }}
- secretRef:
name: {{ .Values.conf.minioSecretName | quote }}
- secretRef:
name: {{ .Values.conf.postgresSecretName | quote }}
- secretRef:
name: {{ .Values.conf.rabbitmqSecretName | quote }}
{{- end }}
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
......
devops/gc/deploy/templates/service-account.yaml
+ 0
− 7
View file @ 6bee6e92
{{- if .Values.global.onPremEnabled }}
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.data.serviceAccountName | quote }}
namespace: {{ .Release.Namespace | quote }}
{{- end }}
devops/gc/deploy/templates/service.yaml
+ 2
− 4
View file @ 6bee6e92
apiVersion: v1
kind: Service
metadata:
{{- if not .Values.global.onPremEnabled }}
annotations:
cloud.google.com/neg: '{"ingress": true}'
{{- end }}
name: {{ .Values.conf.appName | quote }}
namespace: {{ .Release.Namespace | quote }}
annotations:
cloud.google.com/neg: '{"ingress": true}'
spec:
ports:
- protocol: TCP
......
devops/gc/deploy/templates/virtual-service.yaml
+ 1
− 3
View file @ 6bee6e92
......@@ -5,9 +5,7 @@ metadata:
namespace: {{ .Release.Namespace | quote }}
spec:
hosts:
{{- if and .Values.global.domain .Values.global.onPremEnabled }}
- {{ printf "osdu.%s" .Values.global.domain | quote }}
{{- else if .Values.global.domain }}
{{- if .Values.global.domain }}
- {{ .Values.global.domain | quote }}
{{- else }}
- "*"
......
devops/gc/deploy/values.yaml
+ 0
− 5
View file @ 6bee6e92
......@@ -4,7 +4,6 @@
global:
domain: ""
onPremEnabled: false
limitsEnabled: true
logLevel: "ERROR"
tier: ""
......@@ -35,10 +34,6 @@ data:
conf:
appName: "storage"
keycloakSecretName: "storage-keycloak-secret"
minioSecretName: "storage-minio-secret"
postgresSecretName: "storage-postgres-secret"
rabbitmqSecretName: "rabbitmq-secret"
replicas: 3
storageRedisSecretName: "storage-redis-secret"
......
provider/storage-gc/src/main/resources/application-anthos.properties
+ 0
− 7
View file @ 6bee6e92
partition-auth-enabled=false
service.token.provider=OPENID
obmDriver=minio
osmDriver=postgres
oqmDriver=rabbitmq
rabbitmq-retry-delay=10000
rabbitmq-retry-limit=5
provider/storage-gc/src/main/resources/application-gcp.properties
+ 0
− 7
View file @ 6bee6e92
osmDriver=datastore
obmDriver=gcs
oqmDriver=pubsub
service.token.provider=GCP
partition-auth-enabled=true
datastore-beta-enabled=false
dead-lettering-required=true
provider/storage-gc/src/main/resources/application.properties
+ 10
− 0
View file @ 6bee6e92
......@@ -61,3 +61,13 @@ management.health.probes.enabled=true
featureFlag.strategy=systemPartition
featureFlag.opa.enabled=false
SYSTEM_PARTITION_ID=system
# GCP specific properties
osmDriver=datastore
obmDriver=gcs
oqmDriver=pubsub
service.token.provider=GCP
partition-auth-enabled=true
datastore-beta-enabled=false
dead-lettering-required=true
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