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.

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 #8238

Merged
merged 27 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
66018a1
skipper: Update to version v0.21.209
zalando-teapot-robot Sep 26, 2024
f66316c
skipper-canary-controller: Update to version main-24
zalando-teapot-robot Sep 26, 2024
9df7d41
e2e: Allow non ready nodes when starting e2e run
mikkeloscar Sep 27, 2024
a167287
aws-cloud-controller-manager-internal: Update to version v1.31.0-mast…
zalando-teapot-robot Sep 27, 2024
d4d6166
pdb-controller: Update to version master-35
zalando-teapot-robot Sep 27, 2024
d6d6b3e
kube-static-egress-controller: Update to version v0.3.1-master-50
zalando-teapot-robot Sep 27, 2024
5e40d2d
Merge pull request #8233 from zalando-incubator/e2e-allow-non-reayd-n…
demonCoder95 Sep 27, 2024
da9e077
Merge pull request #8212 from zalando-incubator/926694233939.dkr.ecr.…
demonCoder95 Sep 27, 2024
9c8f24c
Merge dev to dev-to-alpha
k8s-on-aws-manager-app[bot] Sep 27, 2024
3ee8a4f
Merge pull request #8234 from zalando-incubator/container-registry.za…
mikkeloscar Sep 27, 2024
1212a66
Merge dev to dev-to-alpha
k8s-on-aws-manager-app[bot] Sep 27, 2024
82e81f5
make consolidation policy configurable
myaser Sep 26, 2024
f7e64bd
Merge pull request #8219 from zalando-incubator/karpenter-consolidati…
demonCoder95 Sep 27, 2024
f9287e7
Merge dev to dev-to-alpha
k8s-on-aws-manager-app[bot] Sep 27, 2024
26fb333
Merge pull request #8235 from zalando-incubator/container-registry.za…
demonCoder95 Sep 27, 2024
d4b3eb0
Merge pull request #8236 from zalando-incubator/container-registry.za…
demonCoder95 Sep 27, 2024
f266171
Merge dev to dev-to-alpha
k8s-on-aws-manager-app[bot] Sep 27, 2024
eaa1f39
Merge pull request #8225 from zalando-incubator/container-registry.za…
katyanna Sep 27, 2024
d38618d
Merge dev to dev-to-alpha
k8s-on-aws-manager-app[bot] Sep 27, 2024
7418812
skipper: increase skipper_pod_deletion_cost_controller_poll_timeout
AlexanderYastrebov Sep 27, 2024
4b43435
Merge pull request #8244 from zalando-incubator/skipper/skipper_pod_d…
szuecs Sep 27, 2024
c3eb8a1
Merge dev to dev-to-alpha
k8s-on-aws-manager-app[bot] Sep 27, 2024
626530f
skipper-ingress: enable routesrv profiling
AlexanderYastrebov Sep 30, 2024
5f37867
skipper: update main fleet version to v0.21.208
Sep 30, 2024
64f5df6
Merge pull request #8250 from zalando-incubator/skipper/update-main-f…
RomanZavodskikh Sep 30, 2024
046cc6b
Merge pull request #8246 from zalando-incubator/skipper/enable-routes…
RomanZavodskikh Sep 30, 2024
682a2ca
Merge dev to dev-to-alpha
k8s-on-aws-manager-app[bot] Sep 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
2 changes: 1 addition & 1 deletion cluster/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ skipper_pod_deletion_cost_controller_cpu_min: 25m
skipper_pod_deletion_cost_controller_log_v: "0"
# pod informer sync config
skipper_pod_deletion_cost_controller_poll_interval: "10s"
skipper_pod_deletion_cost_controller_poll_timeout: "10s"
skipper_pod_deletion_cost_controller_poll_timeout: "60s"
# enable re-sync
skipper_pod_deletion_cost_controller_resync_enable: "false"
skipper_pod_deletion_cost_controller_resync_interval: "1h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
- --cloud-provider=aws
- --use-service-account-credentials=true
- --configure-cloud-routes=false
image: container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.31.0-master-128
image: container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.31.0-master-129
name: aws-cloud-controller-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
serviceAccountName: kube-static-egress-controller
containers:
- name: controller
image: container-registry.zalando.net/teapot/kube-static-egress-controller:v0.3.0-master-49
image: container-registry.zalando.net/teapot/kube-static-egress-controller:v0.3.1-master-50
args:
- "--provider=aws"
- "--vpc-id={{.Cluster.ConfigItems.vpc_id}}"
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/pdb-controller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
serviceAccountName: pdb-controller
containers:
- name: pdb-controller
image: container-registry.zalando.net/teapot/pdb-controller:master-34
image: container-registry.zalando.net/teapot/pdb-controller:master-35
args:
- --debug
{{- if .Cluster.ConfigItems.pdb_controller_non_ready_ttl }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
containers:
- name: skipper-canary-controller
terminationMessagePolicy: FallbackToLogsOnError
image: container-registry.zalando.net/gwproxy/skipper-canary-controller:main-23
image: container-registry.zalando.net/gwproxy/skipper-canary-controller:main-24
env:
- name: POD_NAME
valueFrom:
Expand Down
3 changes: 2 additions & 1 deletion cluster/manifests/skipper/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{/* 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.21.198-1017" }}
{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.21.208-1027" }}
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.208-1027" }}


Expand Down Expand Up @@ -525,6 +525,7 @@ spec:
args:
- "routesrv"
- "-application-log-level={{ .Cluster.ConfigItems.skipper_routesrv_log_level }}"
- "-enable-profile"
- "-kubernetes"
- "-kubernetes-in-cluster"
- "-kubernetes-path-mode=path-prefix"
Expand Down
6 changes: 3 additions & 3 deletions cluster/node-pools/master-default/userdata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ write_files:
name: admission-controller-kubeconfig
readOnly: true
- name: skipper-admission-webhook
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.208
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.209
args:
- webhook
- --address=:9085
Expand Down Expand Up @@ -424,7 +424,7 @@ write_files:
value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }}
{{ end }}
- name: skipper-proxy
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.208
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.209
args:
- skipper
- -access-log-strip-query
Expand Down Expand Up @@ -475,7 +475,7 @@ write_files:
name: ssl-certs-kubernetes
readOnly: true
- name: skipper-metrics
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.208
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.209
args:
- skipper
- -access-log-strip-query
Expand Down
4 changes: 2 additions & 2 deletions cluster/node-pools/worker-karpenter/provisioners.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,12 @@ spec:
# Describes which types of Nodes Karpenter should consider for consolidation
# If using 'WhenUnderutilized', Karpenter will consider all nodes for consolidation and attempt to remove or replace Nodes when it discovers that the Node is underutilized and could be changed to reduce cost
# If using `WhenEmpty`, Karpenter will only consider nodes for consolidation that contain no workload pods
#{{ if and (index .NodePool.ConfigItems "consolidation") (eq .NodePool.ConfigItems.consolidation "false") }}
#{{ if and (index .NodePool.ConfigItems "consolidation_policy") (eq .NodePool.ConfigItems.consolidation_policy "WhenEmpty") }}
consolidationPolicy: WhenEmpty
# The amount of time Karpenter should wait after discovering a consolidation decision
# This value can currently only be set when the consolidationPolicy is 'WhenEmpty'
# You can choose to disable consolidation entirely by setting the string value 'Never' here
consolidateAfter: 10m
consolidateAfter: {{ or (index .NodePool.ConfigItems "consolidate_after") "10m" }}
#{{ else }}
consolidationPolicy: WhenUnderutilized
#{{ end }}
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@ Follow up code, that waits for creations to be happen:
S3_AWS_IAM_BUCKET=zalando-e2e-aws-iam-test-12345678912-kube-1 \
AWS_IAM_ROLE=kube-1-e2e-aws-iam-test \
ginkgo -procs=25 -flake-attempts=2 -focus="\[Zalando\]" \
e2e.test -- -non-blocking-taints=node.kubernetes.io/role,nvidia.com/gpu,dedicated
e2e.test -- -non-blocking-taints=node.kubernetes.io/role,nvidia.com/gpu,dedicated \
-allowed-not-ready-nodes=-1
```

* **Why is the go modules such a mess?**
Expand Down
1 change: 1 addition & 0 deletions test/e2e/run_e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ if [ "$e2e" = true ]; then
"e2e.test" -- \
-delete-namespace-on-failure=false \
-non-blocking-taints=node.kubernetes.io/role,nvidia.com/gpu,dedicated \
-allowed-not-ready-nodes=-1 \
-report-dir=junit_reports
TEST_RESULT="$?"

Expand Down