Merge pull request #118 from ZacharyLeahan/prep-release-2.0.6

Prep release 2.0.6

Author: themightychris

.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.6"

choose-native-plants/release-values.yaml

@@ -1,51 +1,23 @@
 app:
   image:
-    tag: "2.0.4"
+    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)
+  # - 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"
+  envFrom:
+    - secretRef:
+        name: app
+    - secretRef:
+        name: mongo
+    - secretRef:
+        name: pac-api
+    - secretRef:
+        name: linode-storage
 
 # Resource settings for the application
 resources:
@@ -54,9 +26,6 @@ resources:
   requests:
     memory: 512Mi
 
-# Allow the Helm chart to create PVCs automatically
-# (removed existingPVCs configuration)
-
 # Horizontal Pod Autoscaling configuration
 autoscaling:
   enabled: true
@@ -65,9 +34,6 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   targetMemoryUtilizationPercentage: 80
 
-# Allow the Helm chart to create Service and Ingress resources automatically
-# (removed existingService and existingIngress configuration)
-
 ingress:
   enabled: true
   annotations: