From 12022d0f9655983f44f4d1e019d7dee5bb780d6c Mon Sep 17 00:00:00 2001 From: ZacharyLeahan Date: Sun, 25 May 2025 11:34:08 -0400 Subject: [PATCH 1/3] Prepare for future release 2.0.5 with improved environment variable handling --- .holo/sources/choose-native-plants.toml | 2 +- choose-native-plants/release-values.yaml | 51 +++--------------------- 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/.holo/sources/choose-native-plants.toml b/.holo/sources/choose-native-plants.toml index 9bdd494..7306e57 100644 --- a/.holo/sources/choose-native-plants.toml +++ b/.holo/sources/choose-native-plants.toml @@ -1,3 +1,3 @@ [holosource] url = "https://github.com/CodeForPhilly/pa-wildflower-selector" -ref = "refs/tags/v2.0.4" +ref = "refs/tags/v2.0.5" diff --git a/choose-native-plants/release-values.yaml b/choose-native-plants/release-values.yaml index 53c2a28..17b4beb 100644 --- a/choose-native-plants/release-values.yaml +++ b/choose-native-plants/release-values.yaml @@ -1,49 +1,12 @@ app: image: - tag: "2.0.4" + tag: "2.0.5" + # IMPORTANT: Only include environment variables here that are NOT already defined in the Helm chart template + # The following environment variables are already defined in the template and should NOT be duplicated here: + # - PAC_API_BASE_URL, PAC_API_KEY (from pac-api secret) + # - AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_DEFAULT_REGION, LINODE_BUCKET_NAME, LINODE_ENDPOINT_URL (from linode-storage secret) + # Duplicating these variables causes patch errors in the GitOps deployment process env: - - name: PAC_API_BASE_URL - valueFrom: - secretKeyRef: - name: pac-api - key: PAC_API_BASE_URL - optional: false - - name: PAC_API_KEY - valueFrom: - secretKeyRef: - name: pac-api - key: PAC_API_KEY - optional: false - - name: AWS_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: linode-storage - key: AWS_ACCESS_KEY_ID - optional: false - - name: AWS_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: linode-storage - key: AWS_SECRET_ACCESS_KEY - optional: false - - name: AWS_DEFAULT_REGION - valueFrom: - secretKeyRef: - name: linode-storage - key: AWS_DEFAULT_REGION - optional: false - - name: LINODE_BUCKET_NAME - valueFrom: - secretKeyRef: - name: linode-storage - key: LINODE_BUCKET_NAME - optional: false - - name: LINODE_ENDPOINT_URL - valueFrom: - secretKeyRef: - name: linode-storage - key: LINODE_ENDPOINT_URL - optional: false - name: NODE_OPTIONS value: "--openssl-legacy-provider --max-old-space-size=768" @@ -55,7 +18,6 @@ resources: memory: 512Mi # Allow the Helm chart to create PVCs automatically -# (removed existingPVCs configuration) # Horizontal Pod Autoscaling configuration autoscaling: @@ -66,7 +28,6 @@ autoscaling: targetMemoryUtilizationPercentage: 80 # Allow the Helm chart to create Service and Ingress resources automatically -# (removed existingService and existingIngress configuration) ingress: enabled: true From a4effc1631a2f48fdcd082890c4d159552bcd7ae Mon Sep 17 00:00:00 2001 From: ZacharyLeahan Date: Mon, 26 May 2025 17:45:48 -0400 Subject: [PATCH 2/3] Update to v2.0.6 with proper environment configuration for secrets --- .holo/sources/choose-native-plants.toml | 2 +- choose-native-plants/release-values.yaml | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.holo/sources/choose-native-plants.toml b/.holo/sources/choose-native-plants.toml index 7306e57..da5c4f9 100644 --- a/.holo/sources/choose-native-plants.toml +++ b/.holo/sources/choose-native-plants.toml @@ -1,3 +1,3 @@ [holosource] url = "https://github.com/CodeForPhilly/pa-wildflower-selector" -ref = "refs/tags/v2.0.5" +ref = "refs/tags/v2.0.6" diff --git a/choose-native-plants/release-values.yaml b/choose-native-plants/release-values.yaml index 17b4beb..a8ca198 100644 --- a/choose-native-plants/release-values.yaml +++ b/choose-native-plants/release-values.yaml @@ -1,6 +1,6 @@ app: image: - tag: "2.0.5" + tag: "2.0.6" # IMPORTANT: Only include environment variables here that are NOT already defined in the Helm chart template # The following environment variables are already defined in the template and should NOT be duplicated here: # - PAC_API_BASE_URL, PAC_API_KEY (from pac-api secret) @@ -9,6 +9,15 @@ app: env: - name: NODE_OPTIONS value: "--openssl-legacy-provider --max-old-space-size=768" + envFrom: + - secretRef: + name: app + - secretRef: + name: mongo + - secretRef: + name: pac-api + - secretRef: + name: linode-storage # Resource settings for the application resources: From 23b63eefba6c9eadef2b46b1648a13f777090d65 Mon Sep 17 00:00:00 2001 From: ZacharyLeahan Date: Mon, 26 May 2025 17:49:22 -0400 Subject: [PATCH 3/3] Clean up comments in release-values.yaml --- choose-native-plants/release-values.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/choose-native-plants/release-values.yaml b/choose-native-plants/release-values.yaml index a8ca198..cf995da 100644 --- a/choose-native-plants/release-values.yaml +++ b/choose-native-plants/release-values.yaml @@ -26,8 +26,6 @@ resources: requests: memory: 512Mi -# Allow the Helm chart to create PVCs automatically - # Horizontal Pod Autoscaling configuration autoscaling: enabled: true @@ -36,8 +34,6 @@ autoscaling: targetCPUUtilizationPercentage: 80 targetMemoryUtilizationPercentage: 80 -# Allow the Helm chart to create Service and Ingress resources automatically - ingress: enabled: true annotations: