ROX-23709: Fix token expiration (#1891)

Fix token expiration
stackrox · Jun 17, 2024 · 6fad115 · 6fad115
1 parent 0af0262
commit 6fad115
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml b/dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml
@@ -142,16 +142,8 @@ spec:
               key: {{ .Values.fleetshardSync.tenantImagePullSecret.key | quote }}
         {{- end }}
         volumeMounts:
-          - mountPath: /var/run/secrets/tokens/aws-token
-            subPath: aws-token
-            name: aws-token
-            readOnly: true
-          {{- if eq "SERVICE_ACCOUNT_TOKEN" .Values.fleetshardSync.authType }}
-          - mountPath: /var/run/secrets/tokens/fleet-manager-token
-            subPath: fleet-manager-token
-            name: fleet-manager-token
-            readOnly: true
-          {{- end }}
+          - mountPath: /var/run/secrets/tokens
+            name: tokens
         ports:
         - name: monitoring
           containerPort: 8080
@@ -163,19 +155,16 @@ spec:
             cpu: {{ .Values.fleetshardSync.resources.requests.cpu | quote }}
             memory: {{ .Values.fleetshardSync.resources.requests.memory | quote }}
       volumes:
-        - name: aws-token
+        - name: tokens
           projected:
             sources:
               - serviceAccountToken:
                   path: aws-token
                   audience: sts.amazonaws.com
                   expirationSeconds: 3600
-        {{- if eq "SERVICE_ACCOUNT_TOKEN" .Values.fleetshardSync.authType }}
-        - name: fleet-manager-token
-          projected:
-            sources:
+              {{- if eq "SERVICE_ACCOUNT_TOKEN" .Values.fleetshardSync.authType }}
               - serviceAccountToken:
                   path: fleet-manager-token
                   audience: acs-fleet-manager-private-api
                   expirationSeconds: 3600
-        {{- end }}
+              {{- end }}