Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5e1c6c5
kube-state-metrics: Update to version v2.16.0-master-30
k8s-on-aws-manager-app[bot] Aug 5, 2025
e2bb9b0
skipper-internal: Update to version v0.22.77-1184
k8s-on-aws-manager-app[bot] Jul 28, 2025
4f82ec3
skipper-internal: Update to version
k8s-on-aws-manager-app[bot] Jul 29, 2025
2fce34b
skipper-internal: Update to version v0.22.78-1185
k8s-on-aws-manager-app[bot] Jul 30, 2025
11a4248
skipper-internal: Update to version v0.22.79-1186
k8s-on-aws-manager-app[bot] Jul 31, 2025
fb5bf7b
skipper-internal: Update to version v0.22.80-1187
k8s-on-aws-manager-app[bot] Aug 4, 2025
23f8a31
skipper-internal: Update to version v0.22.81-1188
k8s-on-aws-manager-app[bot] Aug 4, 2025
db4260c
skipper-internal: Update to version v0.22.82-1189
k8s-on-aws-manager-app[bot] Aug 4, 2025
2857d2b
skipper-internal: Update to version v0.22.83-1190
k8s-on-aws-manager-app[bot] Aug 4, 2025
8c3d169
skipper-internal: Update to version v0.22.84-1191
k8s-on-aws-manager-app[bot] Aug 8, 2025
87b7582
skipper-internal: Update to version v0.22.85-1192
k8s-on-aws-manager-app[bot] Aug 8, 2025
52f20f0
skipper-internal: Update to version v0.22.86-1193
k8s-on-aws-manager-app[bot] Aug 11, 2025
0ec0885
skipper-internal: Update to version v0.22.87-1194
k8s-on-aws-manager-app[bot] Aug 11, 2025
a8f2b86
skipper-internal: Update to version v0.22.88-1195
k8s-on-aws-manager-app[bot] Aug 12, 2025
eef735f
kube-ingress-aws-controller: Update to version v0.18.8
k8s-on-aws-manager-app[bot] Aug 14, 2025
d0b5ca9
kube-aws-iam-controller: Update to version v0.3.0-84-g8bed7f3
k8s-on-aws-manager-app[bot] Aug 15, 2025
08eb2fa
make etcd image resolution automatic
myaser Aug 14, 2025
540ca07
Merge pull request #9769 from zalando-incubator/container-registry.za…
linki Aug 18, 2025
1b8c941
Merge pull request #9751 from zalando-incubator/container-registry.za…
linki Aug 18, 2025
dbf0726
add tcondeixa in zappr file
Aug 18, 2025
b72ba13
Merge pull request #9771 from zalando-incubator/add-maintainer
zaklawrencea Aug 18, 2025
f1a0d4d
Merge pull request #9766 from zalando-incubator/etcd-arm-configs
demonCoder95 Aug 18, 2025
59ec3f4
Merge pull request #9767 from zalando-incubator/926694233939.dkr.ecr.…
linki Aug 19, 2025
cd48e61
Merge dev to dev-to-kube-1.33
k8s-on-aws-manager-app[bot] Aug 19, 2025
e30f838
Merge branch 'dev' into container-registry.zalando.net/teapot/skipper…
vlktna Aug 19, 2025
73f4f57
Merge pull request #9710 from zalando-incubator/container-registry.za…
szuecs Aug 19, 2025
94034ea
Merge dev to dev-to-kube-1.33
k8s-on-aws-manager-app[bot] Aug 19, 2025
89febaa
Add Log Group with expiring retention period for Control Plane logging
zaklawrencea Aug 21, 2025
3cce1d3
Add dependency for EKS cluster on Contorl Plane log group
zaklawrencea Aug 22, 2025
40ec7ac
Add migration config item to control plane logging depedency
zaklawrencea Aug 22, 2025
a70f7d7
Merge pull request #9777 from zalando-incubator/control-plane-logging…
zaklawrencea Aug 22, 2025
06a2ef9
Merge dev to dev-to-kube-1.33
k8s-on-aws-manager-app[bot] Aug 22, 2025
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
1 change: 1 addition & 0 deletions .zappr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ approvals:
- demonCoder95
- MustafaSaber
- vlktna
- tcondeixa

# mandatory pull request labels
pull-request:
Expand Down
15 changes: 15 additions & 0 deletions cluster/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,11 @@ Resources:
Type: 'AWS::EC2::SecurityGroup'
EKSCluster:
Type: AWS::EKS::Cluster
{{- if eq .Cluster.ConfigItems.eks_control_plane_logging "true" }}
{{- if eq .Cluster.ConfigItems.eks_control_plane_logging_migration "true" }}
DependsOn: ControlPlaneLogGroup
{{- end }}
{{- end }}
Properties:
Name: "{{.Cluster.Name}}"
Version: "1.33"
Expand Down Expand Up @@ -3023,6 +3028,16 @@ Resources:
- BucketArn: !GetAtt AuditTrailBucket.Arn
{{- end }}

{{- if eq .Cluster.ConfigItems.eks_control_plane_logging "true" }}
{{- if eq .Cluster.ConfigItems.eks_control_plane_logging_migration "true" }}
ControlPlaneLogGroup:
Type: AWS::Logs::LogGroup
Properties:
LogGroupName: "/aws/eks/{{.Cluster.LocalID}}/cluster"
RetentionInDays: 545
{{- end }}
{{- end }}

{{- if index .Cluster.ConfigItems "session_manager_destination_arn" }}
SessionManagerLogGroup:
Type: AWS::Logs::LogGroup
Expand Down
4 changes: 3 additions & 1 deletion cluster/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,8 @@ etcd_instance_type: "t3.medium"

etcd_scalyr_key: ""

etcd_ami: {{ amiID "zalando-ubuntu-etcd-production-v3.5.18-amd64-main-35" "861068367966"}}
etcd_ami_amd64: {{ amiID "zalando-ubuntu-etcd-production-v3.5.22-amd64-main-38" "861068367966"}}
etcd_ami_arm64: {{ amiID "zalando-ubuntu-etcd-production-v3.5.22-arm64-main-38" "861068367966"}}

cluster_dns: "coredns"
coredns_log_svc_names: "true"
Expand Down Expand Up @@ -1282,6 +1283,7 @@ wiz_node_feature_rollout : "false"

# EKS specific configuration
eks_control_plane_logging: "true"
eks_control_plane_logging_migration: "false"
eks_ip_family: "ipv4"
eks_zalando_iam_aws_proxy_cpu: "100m"
eks_zalando_iam_aws_proxy_memory: "512Mi"
Expand Down
10 changes: 9 additions & 1 deletion cluster/etcd/stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ Metadata:
"kubernetes:component": "etcd-cluster"
application: "kubernetes"
component: "etcd-cluster"
Mappings:
Images:
{{.Cluster.Region}}:
# Use the etcd instance architecture to construct the config item name that we're using to get the AMI name.
MachineImage: '{{ index .Cluster.ConfigItems (print "etcd_ami_" .Values.etcd_instance_type_info.Architecture) }}'
Outputs:
EtcdClusterSecurityGroupId:
Description: "Security Group ID of the etcd cluster"
Expand Down Expand Up @@ -53,7 +58,10 @@ Resources:
IamInstanceProfile:
Name: !Ref AppServerInstanceProfile
InstanceInitiatedShutdownBehavior: terminate
ImageId: {{.Cluster.ConfigItems.etcd_ami}}
ImageId: !FindInMap
- Images
- !Ref 'AWS::Region'
- MachineImage
InstanceType: {{.Cluster.ConfigItems.etcd_instance_type}}
UserData:
Fn::Base64: !Sub |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
hostNetwork: true
containers:
- name: kube-aws-iam-controller
image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-82-g83974de
image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-84-g8bed7f3
env:
- name: AWS_DEFAULT_REGION
value: "{{.Cluster.Region}}"
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/ingress-controller/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {{ $image := "926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/kube-ingress-aws-controller:v0.18.7" }}
# {{ $image := "926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/kube-ingress-aws-controller:v0.18.8" }}
# {{ $version := index (split $image ":") 1 }}

apiVersion: apps/v1
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/kube-state-metrics/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
serviceAccountName: kube-state-metrics
containers:
- name: kube-state-metrics
image: container-registry.zalando.net/teapot/kube-state-metrics:v2.15.0-master-29
image: container-registry.zalando.net/teapot/kube-state-metrics:v2.16.0-master-30
args:
- --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments
- --metric-labels-allowlist=pods=[{{.Cluster.ConfigItems.observability_metrics_pods_labels}}],ingresses=[{{.Cluster.ConfigItems.observability_metrics_ingresses_labels}}],nodes=[topology.kubernetes.io/zone,node.kubernetes.io/instance-type,node.kubernetes.io/node-pool,node.kubernetes.io/role,node.kubernetes.io/profile,dedicated]
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/skipper/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{/* image-updater-bot detects *image variables so use print to disable it for main image */}}

{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.22.76-1183" }}
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.22.76-1183" }}
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.22.88-1195" }}

{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
{{ $canary_args := "" }}
Expand Down