Merge pull request #673 from artsy/mc-jones/fix-config-syntax

fix: hokusai secret config and syntax
artsy · Dec 9, 2024 · f36ac25 · f36ac25
2 parents 0f23917 + a035015
commit f36ac25
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/hokusai/production.yml b/hokusai/production.yml
@@ -73,7 +73,7 @@ spec:
               fieldPath: metadata.labels['app.kubernetes.io/version']
         envFrom:
         - configMapRef:
-           name: secrets-config
+            name: secrets-config
         - configMapRef:
             name: horizon-environment
         volumeMounts:
@@ -113,7 +113,7 @@ spec:
         options:
         - name: ndots
           value: '1'
-      serviceAccount: horizon
+      serviceAccountName: horizon
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -246,9 +246,6 @@ spec:
             volumeMounts:
             - name: data
               mountPath: /home/deploy/data
-            - name: secrets
-              mountPath: /secrets
-              readOnly: true
           containers:
           - name: horizon-refresh-comparisons-cron
             image: 585031190124.dkr.ecr.us-east-1.amazonaws.com/horizon:production
@@ -261,6 +258,9 @@ spec:
             volumeMounts:
             - name: data
               mountPath: /home/deploy/data
+            - name: secrets
+              mountPath: /secrets
+              readOnly: true
             envFrom:
             - configMapRef:
                 name: secrets-config
@@ -276,7 +276,7 @@ spec:
               claimName: horizon-refresh-comparisons-cron-data
           - name: secrets
             emptyDir: {}
-          serviceAccount: horizon
+          serviceAccountName: horizon
           affinity:
             nodeAffinity:
               requiredDuringSchedulingIgnoredDuringExecution:
@@ -335,8 +335,9 @@ spec:
             volumeMounts:
             - name: secrets
               mountPath: /secrets
+              readOnly: true
           restartPolicy: Never
-          serviceAccount: horizon
+          serviceAccountName: horizon
           affinity:
             nodeAffinity:
               requiredDuringSchedulingIgnoredDuringExecution:

diff --git a/hokusai/staging.yml b/hokusai/staging.yml
@@ -282,7 +282,7 @@ spec:
               claimName: horizon-refresh-comparisons-cron-data
           - name: secrets
             emptyDir: {}
-          serviceAccount: horizon
+          serviceAccountName: horizon
           affinity:
             nodeAffinity:
               requiredDuringSchedulingIgnoredDuringExecution:
@@ -341,8 +341,9 @@ spec:
             volumeMounts:
             - name: secrets
               mountPath: /secrets
+              readOnly: true
           restartPolicy: Never
-          serviceAccount: horizon
+          serviceAccountName: horizon
           affinity:
             nodeAffinity:
               requiredDuringSchedulingIgnoredDuringExecution: