Skip to content

Commit 8016f9b

Browse files
authored
Merge pull request #9427 from zalando-incubator/oidc-iam-role
Provide default OIDC trust relationship template as a deployment variable
2 parents ccf4478 + c69e14d commit 8016f9b

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

cluster/manifests/deployment-service/01-config.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ data:
1212
create-namespaces: "true"
1313
aws-available: "true"
1414
worker-role-arn: "arn:aws:iam::{{accountID .Cluster.InfrastructureAccount}}:role/{{.Cluster.LocalID}}-worker"
15+
{{ $oidc_issuer := "" }}
1516
{{- if eq .Cluster.Provider "zalando-eks" }}
16-
{{ $eks_oidc_issuer := index (split .Cluster.ConfigItems.eks_oidc_issuer_url "//") 1 }}
17-
oidc-provider-arn: "arn:aws:iam::{{accountID .Cluster.InfrastructureAccount}}:oidc-provider/{{$eks_oidc_issuer}}"
18-
oidc-subject-key: "{{$eks_oidc_issuer}}:sub"
17+
{{ $oidc_issuer = index (split .Cluster.ConfigItems.eks_oidc_issuer_url "//") 1 }}
1918
{{- else }}
20-
oidc-provider-arn: "arn:aws:iam::{{accountID .Cluster.InfrastructureAccount}}:oidc-provider/{{.Cluster.LocalID}}.{{.Values.hosted_zone}}"
21-
oidc-subject-key: "{{.Cluster.LocalID}}.{{.Values.hosted_zone}}:sub"
19+
{{ $oidc_issuer = printf "%s.%s" .Cluster.LocalID .Values.hosted_zone }}
2220
{{- end }}
21+
{{ $oidc_provider_arn := printf "arn:aws:iam::%s:oidc-provider/%s" (accountID .Cluster.InfrastructureAccount) $oidc_issuer }}
22+
{{ $oidc_subject_key := printf "%s:sub" $oidc_issuer }}
23+
oidc-provider-arn: "{{$oidc_provider_arn}}"
24+
oidc-subject-key: "{{$oidc_subject_key}}"
25+
oidc-trust-relationship-template: '{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"Federated":"{{$oidc_provider_arn}}"},"Action":"sts:AssumeRoleWithWebIdentity","Condition":{"StringLike":{"{{$oidc_subject_key}}":"system:serviceaccount:${SERVICE_ACCOUNT}"}}}]}'
2326
s3-bucket-name: "zalando-deployment-service-{{accountID .Cluster.InfrastructureAccount}}-{{.Cluster.LocalID}}"
2427
status-service-url: "https://depl-status-{{.Cluster.Alias}}.{{.Values.hosted_zone}}"
2528
status-service-url-local: "http://deployment-status-service.ingress.cluster.local."

0 commit comments

Comments
 (0)