Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ROX-23709: Fix token expiration #1891

Merged
merged 1 commit into from
Jun 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Loading