Merge branch 'develop' into chengjie8/issue-1902

department-of-veterans-affairs · Oct 3, 2023 · bf7ee32 · bf7ee32
2 parents d4c73aa + 49bf9d6
commit bf7ee32
Show file tree

Hide file tree

Showing 17 changed files with 70 additions and 22 deletions.
diff --git a/.github/workflows/dora-lead-time-for-changes.yml 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/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

diff --git 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: "<pluginName>:<pluginName>.gradle.plugin:<pluginVersion>"
     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'

diff --git 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:

diff --git 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.5.0"
diff --git 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/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.5.0"
diff --git 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/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.5.0"
diff --git 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/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.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
@@ -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.5.0"
diff --git 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.5.0"
diff --git 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.5.0"
diff --git 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

diff --git a/scripts/image_versions.src b/scripts/image_versions.src
@@ -31,3 +31,13 @@
 # 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
+dbinit_VER="v3.4.19"
+# Fri Sep 29 16:52:44 UTC 2023 -- v3.4.20
+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"
+ccapp_VER="v3.5.0"
+eemaxcfiapp_VER="v3.5.0"
diff --git a/versions.txt b/versions.txt
@@ -22,3 +22,7 @@ v3.4.15
 v3.4.16
 v3.4.17
 v3.4.18
+v3.4.19
+v3.4.20
+v3.4.21
+v3.5.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,3 +22,7 @@ v3.4.15 @@
     v3.4.16
     v3.4.17
     v3.4.18
+    v3.4.19
+    v3.4.20
+    v3.4.21
+    v3.5.0