From 259aa94d66364035d96906f833decf979d8a1229 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Tue, 30 Apr 2024 11:09:52 +0200 Subject: [PATCH 1/2] Document the purpose of etcd_dns_record_prefixes Signed-off-by: Mikkel Oscar Lyderik Larsen --- cluster/config-defaults.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml index f6a5a3552e..c1dcb6d030 100644 --- a/cluster/config-defaults.yaml +++ b/cluster/config-defaults.yaml @@ -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"}} From e91002ab4e3d46368cf483ed07cc7bd7e0b2314c Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Tue, 30 Apr 2024 14:00:18 +0200 Subject: [PATCH 2/2] Update tokeninfo Signed-off-by: Mikkel Oscar Lyderik Larsen --- cluster/node-pools/master-default/userdata.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index aa4e66b4db..580e5d04bb 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -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 @@ -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: