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.

Sign up for GitHub

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

dev to alpha #7418

Merged
merged 6 commits into from
May 2, 2024
Merged

dev to alpha #7418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
259aa94
Document the purpose of etcd_dns_record_prefixes
mikkeloscar Apr 30, 2024
e91002a
Update tokeninfo
mikkeloscar Apr 30, 2024
7aae187
Merge pull request #7412 from zalando-incubator/etcd_record_prefix_doc
zaklawrencea Apr 30, 2024
1f70189
Merge dev to dev-to-alpha
zalando-teapot-robot Apr 30, 2024
05b34bf
Merge pull request #7414 from zalando-incubator/update-tokeninfo
linki Apr 30, 2024
ccf4c1d
Merge dev to dev-to-alpha
zalando-teapot-robot Apr 30, 2024
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
3 changes: 3 additions & 0 deletions cluster/config-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,9 @@ blocked_availability_zone: ""

# etcd cluster
etcd_stack_name: "etcd-cluster-etcd"
# comma separated list of DNS record prefixes which will be prefixed to the
# hosted zone of the account. We allow multiple prefixes for the purpose of
# migration.
etcd_dns_record_prefixes: "etcd-server.{{.Cluster.Region}}"

{{if eq .Cluster.Environment "production"}}
Expand Down
4 changes: 2 additions & 2 deletions cluster/node-pools/master-default/userdata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ write_files:
- mountPath: /etc/kubernetes/k8s-authnz-webhook-kubeconfig
name: k8s-authnz-webhook-kubeconfig
readOnly: true
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-55
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-100
name: tokeninfo
ports:
- containerPort: 9021
Expand Down Expand Up @@ -385,7 +385,7 @@ write_files:
value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }}
{{ if ne .Cluster.Environment "production" }}
- name: tokeninfo-sandbox
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-55
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-100
ports:
- containerPort: 9022
lifecycle:
Expand Down