diff --git a/helmfile/helmfile.yaml b/helmfile/helmfile.yaml index 615dae36e..40b39b812 100644 --- a/helmfile/helmfile.yaml +++ b/helmfile/helmfile.yaml @@ -34,7 +34,7 @@ repositories: url: https://okgolove.github.io/helm-charts releases: -{{ if or (eq .Environment.Name "dev") (eq .Environment.Name "staging") }} + - name: notify-documentation namespace: notification-canada-ca labels: @@ -90,8 +90,6 @@ releases: values: - ./overrides/notify/celery.yaml.gotmpl -{{ end }} - - name: k8s-event-logger namespace: amazon-cloudwatch labels: diff --git a/helmfile/overrides/notify/admin.yaml.gotmpl b/helmfile/overrides/notify/admin.yaml.gotmpl index 8ad4668bf..ed069548a 100644 --- a/helmfile/overrides/notify/admin.yaml.gotmpl +++ b/helmfile/overrides/notify/admin.yaml.gotmpl @@ -35,7 +35,7 @@ serviceAccount: eks.amazonaws.com/role-arn: arn:aws:iam::{{ requiredEnv "AWS_ACCOUNT_ID" }}:role/admin-eks-role targetGroupBinding: - enabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} + enabled: true targetGroupARN: {{requiredEnv "ADMIN_TARGET_GROUP_ARN"}} resources: diff --git a/helmfile/overrides/notify/api.yaml.gotmpl b/helmfile/overrides/notify/api.yaml.gotmpl index 7ea07258a..29ea5598d 100644 --- a/helmfile/overrides/notify/api.yaml.gotmpl +++ b/helmfile/overrides/notify/api.yaml.gotmpl @@ -29,7 +29,7 @@ serviceAccount: eks.amazonaws.com/role-arn: arn:aws:iam::{{ requiredEnv "AWS_ACCOUNT_ID" }}:role/api-eks-role targetGroupBinding: - enabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} + enabled: true targetGroupARN: {{requiredEnv "API_TARGET_GROUP_ARN"}} resources: diff --git a/helmfile/overrides/notify/celery.yaml.gotmpl b/helmfile/overrides/notify/celery.yaml.gotmpl index 3a3fc503f..1b9da1e26 100644 --- a/helmfile/overrides/notify/celery.yaml.gotmpl +++ b/helmfile/overrides/notify/celery.yaml.gotmpl @@ -108,7 +108,7 @@ nodes: autoscaling: hpaEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} minReplicas: {{ if eq .Environment.Name "production" }} 3 {{ else if eq .Environment.Name "staging" }} 3 {{ else }} 3 {{ end }} - maxReplicas: {{ if eq .Environment.Name "production" }} 30 {{ else if eq .Environment.Name "staging" }} 30 {{ else }} 30 {{ end }} + maxReplicas: {{ if eq .Environment.Name "production" }} 3 {{ else if eq .Environment.Name "staging" }} 30 {{ else }} 30 {{ end }} targetCPUUtilizationPercentage: {{ if eq .Environment.Name "production" }} 25 {{ else if eq .Environment.Name "staging" }} 25 {{ else }} 25 {{ end }} scaleUpPodsValue: {{ if eq .Environment.Name "production" }} 6 {{ else if eq .Environment.Name "staging" }} 6 {{ else }} 6 {{ end }} scaleUpPeriodSeconds: {{ if eq .Environment.Name "production" }} 45 {{ else if eq .Environment.Name "staging" }} 45 {{ else }} 45 {{ end }} @@ -131,7 +131,7 @@ nodes: autoscaling: hpaEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} minReplicas: {{ if eq .Environment.Name "production" }} 3 {{ else if eq .Environment.Name "staging" }} 3 {{ else }} 3 {{ end }} - maxReplicas: {{ if eq .Environment.Name "production" }} 30 {{ else if eq .Environment.Name "staging" }} 30 {{ else }} 30 {{ end }} + maxReplicas: {{ if eq .Environment.Name "production" }} 3 {{ else if eq .Environment.Name "staging" }} 30 {{ else }} 30 {{ end }} targetCPUUtilizationPercentage: {{ if eq .Environment.Name "production" }} 25 {{ else if eq .Environment.Name "staging" }} 25 {{ else }} 25 {{ end }} scaleUpPodsValue: {{ if eq .Environment.Name "production" }} 6 {{ else if eq .Environment.Name "staging" }} 6 {{ else }} 6 {{ end }} scaleUpPeriodSeconds: {{ if eq .Environment.Name "production" }} 45 {{ else if eq .Environment.Name "staging" }} 45 {{ else }} 45 {{ end }} @@ -154,7 +154,7 @@ nodes: autoscaling: hpaEnabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} minReplicas: {{ if eq .Environment.Name "production" }} 3 {{ else if eq .Environment.Name "staging" }} 3 {{ else }} 3 {{ end }} - maxReplicas: {{ if eq .Environment.Name "production" }} 30 {{ else if eq .Environment.Name "staging" }} 30 {{ else }} 30 {{ end }} + maxReplicas: {{ if eq .Environment.Name "production" }} 3 {{ else if eq .Environment.Name "staging" }} 30 {{ else }} 30 {{ end }} targetCPUUtilizationPercentage: {{ if eq .Environment.Name "production" }} 25 {{ else if eq .Environment.Name "staging" }} 25 {{ else }} 25 {{ end }} scaleUpPodsValue: {{ if eq .Environment.Name "production" }} 6 {{ else if eq .Environment.Name "staging" }} 6 {{ else }} 6 {{ end }} scaleUpPeriodSeconds: {{ if eq .Environment.Name "production" }} 45 {{ else if eq .Environment.Name "staging" }} 45 {{ else }} 45 {{ end }} diff --git a/helmfile/overrides/notify/document-download.yaml.gotmpl b/helmfile/overrides/notify/document-download.yaml.gotmpl index b24b461a2..75e8a2a42 100644 --- a/helmfile/overrides/notify/document-download.yaml.gotmpl +++ b/helmfile/overrides/notify/document-download.yaml.gotmpl @@ -21,7 +21,7 @@ serviceAccount: eks.amazonaws.com/role-arn: arn:aws:iam::{{ requiredEnv "AWS_ACCOUNT_ID" }}:role/document-download-eks-role targetGroupBinding: - enabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} + enabled: true targetGroupARN: {{requiredEnv "DOCUMENT_DOWNLOAD_API_TARGET_GROUP_ARN"}} resources: diff --git a/helmfile/overrides/notify/documentation.yaml.gotmpl b/helmfile/overrides/notify/documentation.yaml.gotmpl index 0de520c06..9687d59ea 100644 --- a/helmfile/overrides/notify/documentation.yaml.gotmpl +++ b/helmfile/overrides/notify/documentation.yaml.gotmpl @@ -2,7 +2,7 @@ image: tag: {{ env "{{ .StateValues.DOCUMENTATION_DOCKER_TAG }}" | default "latest" }} targetGroupBinding: - enabled: {{ if eq .Environment.Name "production" }} true {{ else if eq .Environment.Name "staging" }} true {{ else }} true {{ end }} + enabled: true targetGroupARN: {{requiredEnv "DOCUMENTATION_TARGET_GROUP_ARN"}} pdb: diff --git a/helmfile/overrides/production.env b/helmfile/overrides/production.env index 22297f658..18f0829f9 100644 --- a/helmfile/overrides/production.env +++ b/helmfile/overrides/production.env @@ -1,7 +1,7 @@ -ADMIN_DOCKER_TAG: "latest" -API_DOCKER_TAG: "latest" -DOCUMENT_DOWNLOAD_DOCKER_TAG: "latest" -DOCUMENTATION_DOCKER_TAG: "latest" +ADMIN_DOCKER_TAG: "8a47c0c" +API_DOCKER_TAG: "429d2f7" +DOCUMENT_DOWNLOAD_DOCKER_TAG: "7f5dc9d" +DOCUMENTATION_DOCKER_TAG: "5c45cc5" API_HOST_NAME_PREFIX: "api" HC_EN_SERVICE_ID: "9d7eb35c-e15f-46d0-b7a4-6859b843fedb" HC_FR_SERVICE_ID: "3e2589c4-a0d7-4592-9eb9-c178cddf2b1f"