Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
source:
repoURL: ghcr.io/ifrcgo
chart: ifrcgo-alert-hub-helm
targetRevision: 0.1.1-develop.ca9d3c81
targetRevision: 0.1.1-develop.c6f10f53
helm:
valueFiles:
- values-go-deploy.yaml
Expand Down Expand Up @@ -44,14 +44,6 @@ spec:
clientID: "5853dc85-0d06-4f6d-9145-c72680a65ad9"
keyvaultName: "alert-hub-production-kv"
tenantId: "a2b53be5-734e-4e6c-ab0d-d184f60fd917"
# App level configs - temporary
api:
replicaCount: 2
resources:
requests:
memory: 2Gi
limits:
memory: 2Gi
destination:
server: https://kubernetes.default.svc
namespace: alert-hub
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
source:
repoURL: ghcr.io/ifrcgo/alert-hub-web-app
chart: ifrcgo-web-app-nginx-serve
targetRevision: 0.0.1-develop.218124b
targetRevision: 0.0.1-develop.6a791e5
helm:
parameters:
- name: ingress.host
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
resources:
requests:
memory: "2048Mi"
cpu: "500m"
cpu: "10m"
limits:
memory: "4096Mi"
cpu: "1000m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
source:
repoURL: ghcr.io/ifrcgo
chart: ifrcgo-risk-module-helm
targetRevision: 0.0.1-develop.cf300c49
targetRevision: 0.0.1-develop.c0c63878
helm:
valueFiles:
- values/operators.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
source:
repoURL: ghcr.io/ifrcgo
chart: ifrcgo-alert-hub-helm
targetRevision: 0.1.1-develop.ca9d3c81
targetRevision: 0.1.1-develop.c6f10f53
helm:
valueFiles:
- values-go-deploy.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
source:
repoURL: ghcr.io/ifrcgo/alert-hub-web-app
chart: ifrcgo-web-app-nginx-serve
targetRevision: 0.0.1-develop.990c96d
targetRevision: 0.0.1-develop.6a791e5
helm:
parameters:
- name: ingress.host
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
resources:
requests:
memory: "2048Mi"
cpu: "500m"
cpu: "10m"
limits:
memory: "4096Mi"
cpu: "1000m"
Expand Down
2 changes: 1 addition & 1 deletion applications/argocd/staging/applications/risk-module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
source:
repoURL: ghcr.io/ifrcgo
chart: ifrcgo-risk-module-helm
targetRevision: 0.0.1-develop.cf300c49
targetRevision: 0.0.1-develop.c0c63878
helm:
valueFiles:
- values/operators.yaml
Expand Down
4 changes: 2 additions & 2 deletions applications/go-api/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
displayName: "Deploy staging instance of go-api"
env:
ENVIRONMENT: staging
VERSION: "0.0.2-develop.c038d7f8"
VERSION: "0.0.2-develop.c05d5fea"
# For Azure CLI
AZURE_TENANT_ID: $(TERRAFORM_TENANT_ID)
AZURE_CLIENT_ID: $(TERRAFORM_SERVICE_PRINCIPAL_ID)
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
displayName: "Deploy production instance of go-api"
env:
ENVIRONMENT: production
VERSION: "0.0.2-master.ce40be9f"
VERSION: "0.0.2-master.c02bae97"
# For Azure CLI
AZURE_TENANT_ID: $(TERRAFORM_TENANT_ID)
AZURE_CLIENT_ID: $(TERRAFORM_SERVICE_PRINCIPAL_ID)
Expand Down
8 changes: 4 additions & 4 deletions applications/go-api/helm/ifrcgo-helm/values-production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ api:
replicaCount: 2
resources:
requests:
cpu: "1"
cpu: "0.2"
memory: 4Gi
limits:
cpu: "2"
Expand All @@ -49,7 +49,7 @@ celery:
replicaCount: 2
resources:
requests:
cpu: "0.5"
cpu: "0.2"
memory: 0.4Gi
limits:
cpu: "2"
Expand All @@ -60,7 +60,7 @@ elasticsearch:
uri: /subscriptions/39308fb0-9929-4b29-aafa-b3c78a8b0658/resourceGroups/ifrcpgo002rg/providers/Microsoft.Compute/disks/ifrcpgo-disk001
resources:
requests:
cpu: "1"
cpu: "0.2"
memory: 4Gi
limits:
cpu: "2"
Expand All @@ -72,7 +72,7 @@ sshBastion:
cpu: "0.1"
memory: 0.05Gi
limits:
cpu: "0.5"
cpu: "1"
memory: 0.2Gi

serviceAccount:
Expand Down
12 changes: 6 additions & 6 deletions applications/go-api/helm/ifrcgo-helm/values-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ api:
replicaCount: 1
resources:
requests:
cpu: "0.5"
cpu: "0.2"
memory: 4Gi
limits:
cpu: "2"
Expand All @@ -39,7 +39,7 @@ redis:
repository: bitnamilegacy/redis
resources:
requests:
cpu: "0.1"
cpu: "0.2"
memory: 0.5Gi
limits:
cpu: "1"
Expand All @@ -49,7 +49,7 @@ celery:
replicaCount: 1
resources:
requests:
cpu: "0.1"
cpu: "0.2"
memory: 0.4Gi
limits:
cpu: "2"
Expand All @@ -60,7 +60,7 @@ elasticsearch:
uri: /subscriptions/39308fb0-9929-4b29-aafa-b3c78a8b0658/resourceGroups/ifrctgo002rg/providers/Microsoft.Compute/disks/ifrctgo-disk001
resources:
requests:
cpu: "0.5"
cpu: "0.2"
memory: 4Gi
limits:
cpu: "2"
Expand All @@ -69,10 +69,10 @@ elasticsearch:
sshBastion:
resources:
requests:
cpu: "0.1"
cpu: "0.2"
memory: 0.05Gi
limits:
cpu: "0.5"
cpu: "1"
memory: 0.2Gi

serviceAccount:
Expand Down
Loading