From 941169e7cbc9c2e21a41d012dbf21d2602440873 Mon Sep 17 00:00:00 2001 From: Cheng <89034346+chengjie8@users.noreply.github.com> Date: Tue, 26 Sep 2023 13:05:27 -0400 Subject: [PATCH 01/17] Add workflow to support LHDI's implementation of DORA * removed vro-images output check for secrel job * Automated commit: Unpin versions of updated images * added dora lead time workflow file * minor update --------- Co-authored-by: VRO Machine User --- .../workflows/dora-lead-time-for-changes.yml | 23 +++++++++++++++++++ scripts/image_versions.src | 4 ---- 2 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/dora-lead-time-for-changes.yml diff --git a/.github/workflows/dora-lead-time-for-changes.yml b/.github/workflows/dora-lead-time-for-changes.yml new file mode 100644 index 0000000000..ca59581916 --- /dev/null +++ b/.github/workflows/dora-lead-time-for-changes.yml @@ -0,0 +1,23 @@ +###################### DO NOT DELETE OR MODIFY THIS FILE ####################### +# +# This GitHub Workflow was added to your repository automatically by the +# Lighthouse Delivery Infrastructure's SecRel team. It is required. +# +# It calculates the Lead Time for Changes DORA metric for PRs merged into your +# default branch. +# +###################### DO NOT DELETE OR MODIFY THIS FILE ####################### + +name: dora-lead-time-for-changes +run-name: "Calculate DORA Lead Time for Changes" +on: + create: +jobs: + calculate-lead-time-for-changes: + if: ${{ github.ref_type == 'tag' }} + uses: department-of-veterans-affairs/lighthouse-di-documentation/.github/workflows/dora-lead-time-for-changes.yml@main + secrets: + # The SecRel team maintains a GitHub action that publishes these secrets + # to your repo. Do not delete these secrets from your repo. + DATADOG_API_KEY_FOR_LEAD_TIME_METRIC: ${{ secrets.DATADOG_API_KEY_FOR_LEAD_TIME_METRIC }} + DATADOG_APP_KEY_FOR_LEAD_TIME_METRIC: ${{ secrets.DATADOG_APP_KEY_FOR_LEAD_TIME_METRIC }} diff --git a/scripts/image_versions.src b/scripts/image_versions.src index fc95cb9b41..fd88b8623d 100644 --- a/scripts/image_versions.src +++ b/scripts/image_versions.src @@ -25,18 +25,14 @@ # Fri Aug 25 16:36:30 UTC 2023 -- v3.4.8 # Wed Aug 30 18:36:53 UTC 2023 -- v3.4.9 # Fri Sep 1 21:08:58 UTC 2023 -- v3.4.12 -eemaxcfiapp_VER="v3.4.12" # Wed Sep 6 17:58:41 UTC 2023 -- v3.4.13 -ccapp_VER="v3.4.13" # Thu Sep 7 20:28:30 UTC 2023 -- v3.4.14 # Tue Sep 12 20:23:04 UTC 2023 -- v3.4.15 # Wed Sep 13 14:29:58 UTC 2023 -- v3.4.16 # Fri Sep 15 15:14:20 UTC 2023 -- v3.4.17 postgres_VER="v3.4.17" apigateway_VER="v3.4.17" -app_VER="v3.4.17" dbinit_VER="v3.4.17" -svcbgsapi_VER="v3.4.17" svclighthouseapi_VER="v3.4.17" svcbiekafka_VER="v3.4.17" xampleworkflows_VER="v3.4.17" From 0e61500eb20fdda4c570f1031b0ab1058f4f0a84 Mon Sep 17 00:00:00 2001 From: VRO Machine User Date: Tue, 26 Sep 2023 17:10:46 +0000 Subject: [PATCH 02/17] Automated commit: Unpin versions of updated images --- scripts/image_versions.src | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/image_versions.src b/scripts/image_versions.src index fd88b8623d..8ac17c0204 100644 --- a/scripts/image_versions.src +++ b/scripts/image_versions.src @@ -30,10 +30,4 @@ # Tue Sep 12 20:23:04 UTC 2023 -- v3.4.15 # Wed Sep 13 14:29:58 UTC 2023 -- v3.4.16 # Fri Sep 15 15:14:20 UTC 2023 -- v3.4.17 -postgres_VER="v3.4.17" -apigateway_VER="v3.4.17" -dbinit_VER="v3.4.17" -svclighthouseapi_VER="v3.4.17" -svcbiekafka_VER="v3.4.17" -xampleworkflows_VER="v3.4.17" # Wed Sep 20 17:22:23 UTC 2023 -- v3.4.18 From f35c18eb9d2aea6ed947fcb59b277fb30173edcd Mon Sep 17 00:00:00 2001 From: runner Date: Thu, 28 Sep 2023 18:53:10 +0000 Subject: [PATCH 03/17] Release version: 3.4.19 --- helm/api-gateway/Chart.yaml | 2 +- helm/domain-cc/Chart.yaml | 2 +- helm/domain-ee/Chart.yaml | 2 +- helm/platform/Chart.yaml | 2 +- helm/svc-bgs-api/Chart.yaml | 2 +- helm/svc-lighthouse-api/Chart.yaml | 2 +- helm/vro-app/Chart.yaml | 2 +- versions.txt | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/helm/api-gateway/Chart.yaml b/helm/api-gateway/Chart.yaml index 13f080d90b..695ed08cd8 100644 --- a/helm/api-gateway/Chart.yaml +++ b/helm/api-gateway/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.18" +appVersion: "3.4.19" diff --git a/helm/domain-cc/Chart.yaml b/helm/domain-cc/Chart.yaml index 1eca8cf49b..bc2bf24a52 100644 --- a/helm/domain-cc/Chart.yaml +++ b/helm/domain-cc/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.18" +appVersion: "3.4.19" diff --git a/helm/domain-ee/Chart.yaml b/helm/domain-ee/Chart.yaml index 0c3984c4bb..00e4f99d53 100644 --- a/helm/domain-ee/Chart.yaml +++ b/helm/domain-ee/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.18" +appVersion: "3.4.19" diff --git a/helm/platform/Chart.yaml b/helm/platform/Chart.yaml index 447b0d6543..d47b50f1e8 100644 --- a/helm/platform/Chart.yaml +++ b/helm/platform/Chart.yaml @@ -21,7 +21,7 @@ version: 0.2.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "3.4.18" +appVersion: "3.4.19" # https://levelup.gitconnected.com/helm-data-sharing-between-parent-and-child-chart-c4487a452d4e dependencies: diff --git a/helm/svc-bgs-api/Chart.yaml b/helm/svc-bgs-api/Chart.yaml index 5af5a91300..76258c8a01 100644 --- a/helm/svc-bgs-api/Chart.yaml +++ b/helm/svc-bgs-api/Chart.yaml @@ -16,4 +16,4 @@ version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.18" +appVersion: "3.4.19" diff --git a/helm/svc-lighthouse-api/Chart.yaml b/helm/svc-lighthouse-api/Chart.yaml index 8e79410504..89298b74b8 100644 --- a/helm/svc-lighthouse-api/Chart.yaml +++ b/helm/svc-lighthouse-api/Chart.yaml @@ -16,4 +16,4 @@ version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.18" +appVersion: "3.4.19" diff --git a/helm/vro-app/Chart.yaml b/helm/vro-app/Chart.yaml index 259094a683..f0a9ac61d7 100644 --- a/helm/vro-app/Chart.yaml +++ b/helm/vro-app/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.18" +appVersion: "3.4.19" diff --git a/versions.txt b/versions.txt index 752fbdb1be..935004f4fa 100644 --- a/versions.txt +++ b/versions.txt @@ -22,3 +22,4 @@ v3.4.15 v3.4.16 v3.4.17 v3.4.18 +v3.4.19 From 34caa23c7ac007e4908060a133a2ae3bd693d45a Mon Sep 17 00:00:00 2001 From: VRO Machine User Date: Thu, 28 Sep 2023 18:53:10 +0000 Subject: [PATCH 04/17] Automated commit: Pin versions of unpinned images --- scripts/image_versions.src | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/image_versions.src b/scripts/image_versions.src index 8ac17c0204..4d9953f9cc 100644 --- a/scripts/image_versions.src +++ b/scripts/image_versions.src @@ -31,3 +31,14 @@ # Wed Sep 13 14:29:58 UTC 2023 -- v3.4.16 # Fri Sep 15 15:14:20 UTC 2023 -- v3.4.17 # Wed Sep 20 17:22:23 UTC 2023 -- v3.4.18 +# Thu Sep 28 18:53:10 UTC 2023 -- v3.4.19 +postgres_VER="v3.4.19" +apigateway_VER="v3.4.19" +app_VER="v3.4.19" +dbinit_VER="v3.4.19" +svcbgsapi_VER="v3.4.19" +svclighthouseapi_VER="v3.4.19" +svcbiekafka_VER="v3.4.19" +xampleworkflows_VER="v3.4.19" +ccapp_VER="v3.4.19" +eemaxcfiapp_VER="v3.4.19" From f85f6e8c2119158c8042dca3bbc8dc38661280ad Mon Sep 17 00:00:00 2001 From: VRO Machine User Date: Fri, 29 Sep 2023 15:56:20 +0000 Subject: [PATCH 05/17] Automated commit: Unpin versions of updated images --- scripts/image_versions.src | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/image_versions.src b/scripts/image_versions.src index 4d9953f9cc..79092bc372 100644 --- a/scripts/image_versions.src +++ b/scripts/image_versions.src @@ -32,13 +32,4 @@ # Fri Sep 15 15:14:20 UTC 2023 -- v3.4.17 # Wed Sep 20 17:22:23 UTC 2023 -- v3.4.18 # Thu Sep 28 18:53:10 UTC 2023 -- v3.4.19 -postgres_VER="v3.4.19" -apigateway_VER="v3.4.19" -app_VER="v3.4.19" dbinit_VER="v3.4.19" -svcbgsapi_VER="v3.4.19" -svclighthouseapi_VER="v3.4.19" -svcbiekafka_VER="v3.4.19" -xampleworkflows_VER="v3.4.19" -ccapp_VER="v3.4.19" -eemaxcfiapp_VER="v3.4.19" From 59d1b85c13680065e83f1012200911c9ca9f09f4 Mon Sep 17 00:00:00 2001 From: runner Date: Fri, 29 Sep 2023 16:52:43 +0000 Subject: [PATCH 06/17] Release version: 3.4.20 --- helm/api-gateway/Chart.yaml | 2 +- helm/domain-cc/Chart.yaml | 2 +- helm/domain-ee/Chart.yaml | 2 +- helm/platform/Chart.yaml | 2 +- helm/svc-bgs-api/Chart.yaml | 2 +- helm/svc-lighthouse-api/Chart.yaml | 2 +- helm/vro-app/Chart.yaml | 2 +- versions.txt | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/helm/api-gateway/Chart.yaml b/helm/api-gateway/Chart.yaml index 695ed08cd8..424c130e4f 100644 --- a/helm/api-gateway/Chart.yaml +++ b/helm/api-gateway/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.19" +appVersion: "3.4.20" diff --git a/helm/domain-cc/Chart.yaml b/helm/domain-cc/Chart.yaml index bc2bf24a52..fad8a5f7d0 100644 --- a/helm/domain-cc/Chart.yaml +++ b/helm/domain-cc/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.19" +appVersion: "3.4.20" diff --git a/helm/domain-ee/Chart.yaml b/helm/domain-ee/Chart.yaml index 00e4f99d53..525e039017 100644 --- a/helm/domain-ee/Chart.yaml +++ b/helm/domain-ee/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.19" +appVersion: "3.4.20" diff --git a/helm/platform/Chart.yaml b/helm/platform/Chart.yaml index d47b50f1e8..7e4cfba12d 100644 --- a/helm/platform/Chart.yaml +++ b/helm/platform/Chart.yaml @@ -21,7 +21,7 @@ version: 0.2.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "3.4.19" +appVersion: "3.4.20" # https://levelup.gitconnected.com/helm-data-sharing-between-parent-and-child-chart-c4487a452d4e dependencies: diff --git a/helm/svc-bgs-api/Chart.yaml b/helm/svc-bgs-api/Chart.yaml index 76258c8a01..7ebcd57f71 100644 --- a/helm/svc-bgs-api/Chart.yaml +++ b/helm/svc-bgs-api/Chart.yaml @@ -16,4 +16,4 @@ version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.19" +appVersion: "3.4.20" diff --git a/helm/svc-lighthouse-api/Chart.yaml b/helm/svc-lighthouse-api/Chart.yaml index 89298b74b8..75775e3cf0 100644 --- a/helm/svc-lighthouse-api/Chart.yaml +++ b/helm/svc-lighthouse-api/Chart.yaml @@ -16,4 +16,4 @@ version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.19" +appVersion: "3.4.20" diff --git a/helm/vro-app/Chart.yaml b/helm/vro-app/Chart.yaml index f0a9ac61d7..f884e99950 100644 --- a/helm/vro-app/Chart.yaml +++ b/helm/vro-app/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.19" +appVersion: "3.4.20" diff --git a/versions.txt b/versions.txt index 935004f4fa..0802ece363 100644 --- a/versions.txt +++ b/versions.txt @@ -23,3 +23,4 @@ v3.4.16 v3.4.17 v3.4.18 v3.4.19 +v3.4.20 From b3ca872ff454a47f0fd83a982558344b0c62312a Mon Sep 17 00:00:00 2001 From: VRO Machine User Date: Fri, 29 Sep 2023 16:52:44 +0000 Subject: [PATCH 07/17] Automated commit: Pin versions of unpinned images --- scripts/image_versions.src | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/image_versions.src b/scripts/image_versions.src index 79092bc372..34e15af8a5 100644 --- a/scripts/image_versions.src +++ b/scripts/image_versions.src @@ -33,3 +33,13 @@ # Wed Sep 20 17:22:23 UTC 2023 -- v3.4.18 # Thu Sep 28 18:53:10 UTC 2023 -- v3.4.19 dbinit_VER="v3.4.19" +# Fri Sep 29 16:52:44 UTC 2023 -- v3.4.20 +postgres_VER="v3.4.20" +apigateway_VER="v3.4.20" +app_VER="v3.4.20" +svcbgsapi_VER="v3.4.20" +svclighthouseapi_VER="v3.4.20" +svcbiekafka_VER="v3.4.20" +xampleworkflows_VER="v3.4.20" +ccapp_VER="v3.4.20" +eemaxcfiapp_VER="v3.4.20" From d0888de7e32d80923c8f8f445638b0665fa6c699 Mon Sep 17 00:00:00 2001 From: runner Date: Fri, 29 Sep 2023 17:50:35 +0000 Subject: [PATCH 08/17] Release version: 3.4.21 --- helm/api-gateway/Chart.yaml | 2 +- helm/domain-cc/Chart.yaml | 2 +- helm/domain-ee/Chart.yaml | 2 +- helm/platform/Chart.yaml | 2 +- helm/svc-bgs-api/Chart.yaml | 2 +- helm/svc-lighthouse-api/Chart.yaml | 2 +- helm/vro-app/Chart.yaml | 2 +- versions.txt | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/helm/api-gateway/Chart.yaml b/helm/api-gateway/Chart.yaml index 424c130e4f..4c387f071d 100644 --- a/helm/api-gateway/Chart.yaml +++ b/helm/api-gateway/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.20" +appVersion: "3.4.21" diff --git a/helm/domain-cc/Chart.yaml b/helm/domain-cc/Chart.yaml index fad8a5f7d0..36a93de698 100644 --- a/helm/domain-cc/Chart.yaml +++ b/helm/domain-cc/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.20" +appVersion: "3.4.21" diff --git a/helm/domain-ee/Chart.yaml b/helm/domain-ee/Chart.yaml index 525e039017..b0454fd44b 100644 --- a/helm/domain-ee/Chart.yaml +++ b/helm/domain-ee/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.20" +appVersion: "3.4.21" diff --git a/helm/platform/Chart.yaml b/helm/platform/Chart.yaml index 7e4cfba12d..1d7d05ce44 100644 --- a/helm/platform/Chart.yaml +++ b/helm/platform/Chart.yaml @@ -21,7 +21,7 @@ version: 0.2.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "3.4.20" +appVersion: "3.4.21" # https://levelup.gitconnected.com/helm-data-sharing-between-parent-and-child-chart-c4487a452d4e dependencies: diff --git a/helm/svc-bgs-api/Chart.yaml b/helm/svc-bgs-api/Chart.yaml index 7ebcd57f71..5dbe602519 100644 --- a/helm/svc-bgs-api/Chart.yaml +++ b/helm/svc-bgs-api/Chart.yaml @@ -16,4 +16,4 @@ version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.20" +appVersion: "3.4.21" diff --git a/helm/svc-lighthouse-api/Chart.yaml b/helm/svc-lighthouse-api/Chart.yaml index 75775e3cf0..055249c92a 100644 --- a/helm/svc-lighthouse-api/Chart.yaml +++ b/helm/svc-lighthouse-api/Chart.yaml @@ -16,4 +16,4 @@ version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.20" +appVersion: "3.4.21" diff --git a/helm/vro-app/Chart.yaml b/helm/vro-app/Chart.yaml index f884e99950..ecd640ab2e 100644 --- a/helm/vro-app/Chart.yaml +++ b/helm/vro-app/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.20" +appVersion: "3.4.21" diff --git a/versions.txt b/versions.txt index 0802ece363..c39b1ab474 100644 --- a/versions.txt +++ b/versions.txt @@ -24,3 +24,4 @@ v3.4.17 v3.4.18 v3.4.19 v3.4.20 +v3.4.21 From 49a0c3e19733cede1614b3a25b85bd30d0badad3 Mon Sep 17 00:00:00 2001 From: VRO Machine User Date: Fri, 29 Sep 2023 17:50:35 +0000 Subject: [PATCH 09/17] Automated commit: Pin versions of unpinned images --- scripts/image_versions.src | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/image_versions.src b/scripts/image_versions.src index 34e15af8a5..70b26715ac 100644 --- a/scripts/image_versions.src +++ b/scripts/image_versions.src @@ -43,3 +43,4 @@ svcbiekafka_VER="v3.4.20" xampleworkflows_VER="v3.4.20" ccapp_VER="v3.4.20" eemaxcfiapp_VER="v3.4.20" +# Fri Sep 29 17:50:35 UTC 2023 -- v3.4.21 From 1e36425d4e74e72f86b417ff920846d99c826da1 Mon Sep 17 00:00:00 2001 From: Mason Watson <32622851+msnwatson@users.noreply.github.com> Date: Mon, 2 Oct 2023 09:59:22 -0700 Subject: [PATCH 10/17] Support application load balancers from LHDI (#2058) * support application load balancers from lhdi * fix syntax error * rm brackets * rm spaces --- helm/api-gateway/templates/virtual-service.yaml | 5 ++++- helm/domain-cc/templates/virtual-service.yaml | 5 ++++- helm/domain-ee/templates/virtual-service.yaml | 5 ++++- helm/vro-app/templates/virtual-service.yaml | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/helm/api-gateway/templates/virtual-service.yaml b/helm/api-gateway/templates/virtual-service.yaml index ffa528edd4..4c39854af8 100644 --- a/helm/api-gateway/templates/virtual-service.yaml +++ b/helm/api-gateway/templates/virtual-service.yaml @@ -6,7 +6,10 @@ metadata: spec: # Refer to https://animated-carnival-57b3e7f5.pages.github.io/container-platform/routing-traffic/ hosts: [{{ .Values.global.endpoint }}] - gateways: [istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-gateway] + gateways: + - istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-gateway + - istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-alb-gateway + http: - match: # Using solution at https://github.com/istio/istio/issues/8076#issuecomment-515278023 diff --git a/helm/domain-cc/templates/virtual-service.yaml b/helm/domain-cc/templates/virtual-service.yaml index 7653400217..ee63302cf7 100644 --- a/helm/domain-cc/templates/virtual-service.yaml +++ b/helm/domain-cc/templates/virtual-service.yaml @@ -6,7 +6,10 @@ metadata: spec: # Refer to https://animated-carnival-57b3e7f5.pages.github.io/container-platform/routing-traffic/ hosts: [{{ .Values.global.endpoint }}] - gateways: [istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-gateway] + gateways: + - istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-gateway + - istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-alb-gateway + http: - match: # Using solution at https://github.com/istio/istio/issues/8076#issuecomment-515278023 diff --git a/helm/domain-ee/templates/virtual-service.yaml b/helm/domain-ee/templates/virtual-service.yaml index 758f78e89d..ea3e4d22c6 100644 --- a/helm/domain-ee/templates/virtual-service.yaml +++ b/helm/domain-ee/templates/virtual-service.yaml @@ -6,7 +6,10 @@ metadata: spec: # Refer to https://animated-carnival-57b3e7f5.pages.github.io/container-platform/routing-traffic/ hosts: [{{ .Values.global.endpoint }}] - gateways: [istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-gateway] + gateways: + - istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-gateway + - istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-alb-gateway + http: - match: # Using solution at https://github.com/istio/istio/issues/8076#issuecomment-515278023 diff --git a/helm/vro-app/templates/virtual-service.yaml b/helm/vro-app/templates/virtual-service.yaml index bd51978e71..e2ab821bc0 100644 --- a/helm/vro-app/templates/virtual-service.yaml +++ b/helm/vro-app/templates/virtual-service.yaml @@ -6,7 +6,10 @@ metadata: spec: # Refer to https://animated-carnival-57b3e7f5.pages.github.io/container-platform/routing-traffic/ hosts: [{{ .Values.global.endpoint }}] - gateways: [istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-gateway] + gateways: + - istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-gateway + - istio-system/ldx-{{ .Values.global.lhdiCluster }}-1-{{ .Values.global.environment }}-alb-gateway + http: - match: # Using solution at https://github.com/istio/istio/issues/8076#issuecomment-515278023 From 91a0770e06090914b7e92115a0cdda2b62a2cfa7 Mon Sep 17 00:00:00 2001 From: VRO Machine User Date: Mon, 2 Oct 2023 17:07:28 +0000 Subject: [PATCH 11/17] Automated commit: Unpin versions of updated images --- scripts/image_versions.src | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/image_versions.src b/scripts/image_versions.src index 70b26715ac..1764617469 100644 --- a/scripts/image_versions.src +++ b/scripts/image_versions.src @@ -34,13 +34,6 @@ # Thu Sep 28 18:53:10 UTC 2023 -- v3.4.19 dbinit_VER="v3.4.19" # Fri Sep 29 16:52:44 UTC 2023 -- v3.4.20 -postgres_VER="v3.4.20" apigateway_VER="v3.4.20" -app_VER="v3.4.20" -svcbgsapi_VER="v3.4.20" svclighthouseapi_VER="v3.4.20" -svcbiekafka_VER="v3.4.20" -xampleworkflows_VER="v3.4.20" -ccapp_VER="v3.4.20" -eemaxcfiapp_VER="v3.4.20" # Fri Sep 29 17:50:35 UTC 2023 -- v3.4.21 From 3203b2dabafb0af79e1c50ea405d5f9cb14aad15 Mon Sep 17 00:00:00 2001 From: Mason Watson <32622851+msnwatson@users.noreply.github.com> Date: Mon, 2 Oct 2023 10:37:07 -0700 Subject: [PATCH 12/17] Change DB URLs to point to RDS (#2040) * change DB URLs to point to RDS * Automated commit: Unpin versions of updated images --------- Co-authored-by: VRO Machine User --- helm/_shared/named_templates/_postgres.tpl | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/helm/_shared/named_templates/_postgres.tpl b/helm/_shared/named_templates/_postgres.tpl index e7e0251767..9ff5e4b6c6 100644 --- a/helm/_shared/named_templates/_postgres.tpl +++ b/helm/_shared/named_templates/_postgres.tpl @@ -1,16 +1,12 @@ -{{- define "vro.postgresUrl" -}} -{{- printf "jdbc:postgresql://%s-postgres:%s/%s" - .Values.global.hostnamePrefix - (toString .Values.global.service.db.targetPort) - .Values.global.service.db.databaseName }} -{{- end }} - {{/* For clients to connect to DB */}} {{- define "vro.dbClient.envVars" -}} - name: POSTGRES_URL - value: {{ include "vro.postgresUrl" . }} + valueFrom: + secretKeyRef: + name: rds-db + key: DB_URL - name: POSTGRES_USER valueFrom: secretKeyRef: @@ -32,7 +28,10 @@ */}} {{- define "vro.flyway.envVars" -}} - name: FLYWAY_URL - value: {{ include "vro.postgresUrl" . }} + valueFrom: + secretKeyRef: + name: rds-db + key: DB_URL - name: FLYWAY_USER valueFrom: secretKeyRef: From 3db0772644df55419af20d8777123350e0e1040c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 14:23:15 -0400 Subject: [PATCH 13/17] Bump com.diffplug.spotless:com.diffplug.spotless.gradle.plugin from 6.21.0 to 6.22.0 (#2064) Bump com.diffplug.spotless:com.diffplug.spotless.gradle.plugin Bumps com.diffplug.spotless:com.diffplug.spotless.gradle.plugin from 6.21.0 to 6.22.0. --- updated-dependencies: - dependency-name: com.diffplug.spotless:com.diffplug.spotless.gradle.plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle-plugins/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle-plugins/build.gradle b/gradle-plugins/build.gradle index a95f87ac6e..c212fc7366 100644 --- a/gradle-plugins/build.gradle +++ b/gradle-plugins/build.gradle @@ -18,7 +18,7 @@ dependencies { // https://discuss.gradle.org/t/applying-a-plugin-version-inside-a-convention-plugin/42160 // Syntax: ":.gradle.plugin:" implementation 'io.freefair.lombok:io.freefair.lombok.gradle.plugin:8.3' - implementation 'com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:6.21.0' + implementation 'com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:6.22.0' implementation 'com.felipefzdz.gradle.shellcheck:com.felipefzdz.gradle.shellcheck.gradle.plugin:1.4.6' implementation 'com.palantir.docker:com.palantir.docker.gradle.plugin:0.35.0' implementation 'com.palantir.docker-run:com.palantir.docker-run.gradle.plugin:0.35.0' From 3aa0319c0ccb16fa26cc58e4375774fd7332f484 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 14:30:07 -0400 Subject: [PATCH 14/17] Bump pl.allegro.tech.build.axion-release from 1.15.4 to 1.15.5 (#2051) Bumps [pl.allegro.tech.build.axion-release](https://github.com/allegro/axion-release-plugin) from 1.15.4 to 1.15.5. - [Release notes](https://github.com/allegro/axion-release-plugin/releases) - [Commits](https://github.com/allegro/axion-release-plugin/compare/v1.15.4...v1.15.5) --- updated-dependencies: - dependency-name: pl.allegro.tech.build.axion-release dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 521d34f132..a0900bf2ee 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { plugins { id 'local.std.base-project-conventions' - id 'pl.allegro.tech.build.axion-release' version '1.15.4' + id 'pl.allegro.tech.build.axion-release' version '1.15.5' // Set versions for these plugins (but don't apply) so we don't have to repeat the versions in subprojects id "org.springframework.boot" version "${spring_boot_version}" apply false From a95115a63cc6656f791ac1c7b05ffb834f9b22e7 Mon Sep 17 00:00:00 2001 From: runner Date: Mon, 2 Oct 2023 20:38:19 +0000 Subject: [PATCH 15/17] Release version: 3.5.0 --- helm/api-gateway/Chart.yaml | 2 +- helm/domain-cc/Chart.yaml | 2 +- helm/domain-ee/Chart.yaml | 2 +- helm/platform/Chart.yaml | 2 +- helm/svc-bgs-api/Chart.yaml | 2 +- helm/svc-lighthouse-api/Chart.yaml | 2 +- helm/vro-app/Chart.yaml | 2 +- versions.txt | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/helm/api-gateway/Chart.yaml b/helm/api-gateway/Chart.yaml index 4c387f071d..28533275a2 100644 --- a/helm/api-gateway/Chart.yaml +++ b/helm/api-gateway/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.21" +appVersion: "3.5.0" diff --git a/helm/domain-cc/Chart.yaml b/helm/domain-cc/Chart.yaml index 36a93de698..340caac54a 100644 --- a/helm/domain-cc/Chart.yaml +++ b/helm/domain-cc/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.21" +appVersion: "3.5.0" diff --git a/helm/domain-ee/Chart.yaml b/helm/domain-ee/Chart.yaml index b0454fd44b..00b9c9229a 100644 --- a/helm/domain-ee/Chart.yaml +++ b/helm/domain-ee/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.21" +appVersion: "3.5.0" diff --git a/helm/platform/Chart.yaml b/helm/platform/Chart.yaml index 1d7d05ce44..fc507525de 100644 --- a/helm/platform/Chart.yaml +++ b/helm/platform/Chart.yaml @@ -21,7 +21,7 @@ version: 0.2.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "3.4.21" +appVersion: "3.5.0" # https://levelup.gitconnected.com/helm-data-sharing-between-parent-and-child-chart-c4487a452d4e dependencies: diff --git a/helm/svc-bgs-api/Chart.yaml b/helm/svc-bgs-api/Chart.yaml index 5dbe602519..f72b90423a 100644 --- a/helm/svc-bgs-api/Chart.yaml +++ b/helm/svc-bgs-api/Chart.yaml @@ -16,4 +16,4 @@ version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.21" +appVersion: "3.5.0" diff --git a/helm/svc-lighthouse-api/Chart.yaml b/helm/svc-lighthouse-api/Chart.yaml index 055249c92a..81fdf28645 100644 --- a/helm/svc-lighthouse-api/Chart.yaml +++ b/helm/svc-lighthouse-api/Chart.yaml @@ -16,4 +16,4 @@ version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.21" +appVersion: "3.5.0" diff --git a/helm/vro-app/Chart.yaml b/helm/vro-app/Chart.yaml index ecd640ab2e..b2232e2d0e 100644 --- a/helm/vro-app/Chart.yaml +++ b/helm/vro-app/Chart.yaml @@ -16,4 +16,4 @@ version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. # This field is informational, and has no impact on chart version calculations. -appVersion: "3.4.21" +appVersion: "3.5.0" diff --git a/versions.txt b/versions.txt index c39b1ab474..3ecdac5ddc 100644 --- a/versions.txt +++ b/versions.txt @@ -25,3 +25,4 @@ v3.4.18 v3.4.19 v3.4.20 v3.4.21 +v3.5.0 From c6aea16ac3a9a28b26d04281c13958b78d94c4da Mon Sep 17 00:00:00 2001 From: VRO Machine User Date: Mon, 2 Oct 2023 20:38:20 +0000 Subject: [PATCH 16/17] Automated commit: Pin versions of unpinned images --- scripts/image_versions.src | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/image_versions.src b/scripts/image_versions.src index 1764617469..a8fce676f1 100644 --- a/scripts/image_versions.src +++ b/scripts/image_versions.src @@ -37,3 +37,11 @@ dbinit_VER="v3.4.19" apigateway_VER="v3.4.20" svclighthouseapi_VER="v3.4.20" # Fri Sep 29 17:50:35 UTC 2023 -- v3.4.21 +# Mon Oct 2 20:38:20 UTC 2023 -- v3.5.0 +postgres_VER="v3.5.0" +app_VER="v3.5.0" +svcbgsapi_VER="v3.5.0" +svcbiekafka_VER="v3.5.0" +xampleworkflows_VER="v3.5.0" +ccapp_VER="v3.5.0" +eemaxcfiapp_VER="v3.5.0" From 49bf9d6496d770f220942091493a636cb9e03382 Mon Sep 17 00:00:00 2001 From: VRO Machine User Date: Mon, 2 Oct 2023 21:11:20 +0000 Subject: [PATCH 17/17] Automated commit: Unpin versions of updated images --- scripts/image_versions.src | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/image_versions.src b/scripts/image_versions.src index a8fce676f1..9809beb011 100644 --- a/scripts/image_versions.src +++ b/scripts/image_versions.src @@ -39,9 +39,5 @@ svclighthouseapi_VER="v3.4.20" # Fri Sep 29 17:50:35 UTC 2023 -- v3.4.21 # Mon Oct 2 20:38:20 UTC 2023 -- v3.5.0 postgres_VER="v3.5.0" -app_VER="v3.5.0" -svcbgsapi_VER="v3.5.0" -svcbiekafka_VER="v3.5.0" -xampleworkflows_VER="v3.5.0" ccapp_VER="v3.5.0" eemaxcfiapp_VER="v3.5.0"