Skip to content

Commit

Permalink
aws-pod-identity-china (#624)
Browse files Browse the repository at this point in the history
* aws-pod-identity-china

* fix-dot

* fix2

* aws-pod-identity-china

* trim
  • Loading branch information
calvix authored May 16, 2024
1 parent 3af34b5 commit 0507e74
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Set token audience for `aws-pod-identity-webhook` based on AWS region.

## [0.76.0] - 2024-05-14

### ⚠️ Breaking change
Expand Down
13 changes: 10 additions & 3 deletions helm/cluster-aws/templates/aws-pod-identity-webhook-app.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{{- if .Values.global.apps.awsPodIdentityWebhook.values -}}
{{- define "awsPodIdentityWebhookValuesDefault" }}
aws:
tokenAudience: {{ include "awsApiServerApiAudiences" $ | trim -}}
{{- end }}
{{- $awsPodIdentityWebhookValues := (include "awsPodIdentityWebhookValuesDefault" $ ) | fromYaml -}}
{{- $customAwsPodIdentityWebhookValues := .Values.global.apps.awsPodIdentityWebhook.values -}}
{{- if $customAwsPodIdentityWebhookValues -}}
{{- $awsPodIdentityWebhookValues = mergeOverwrite $awsPodIdentityWebhookValues (deepCopy $customAwsPodIdentityWebhookValues) -}}
{{- end -}}
apiVersion: v1
kind: ConfigMap
metadata:
Expand All @@ -8,8 +16,7 @@ metadata:
{{- include "labels.common" . | nindent 4 }}
data:
values: |
{{- toYaml .Values.global.apps.awsPodIdentityWebhook.values | nindent 4 }}
{{- end }}
{{- $awsPodIdentityWebhookValues | toYaml | nindent 4 }}
---
apiVersion: application.giantswarm.io/v1alpha1
kind: App
Expand Down

0 comments on commit 0507e74

Please sign in to comment.