Merge pull request #8238 from zalando-incubator/dev-to-alpha

dev to alpha

cluster/config-defaults.yaml

@@ -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"

cluster/manifests/aws-cloud-controller-manager/daemonset.yaml

@@ -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:

cluster/manifests/kube-static-egress-controller/deployment.yaml

@@ -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}}"

cluster/manifests/pdb-controller/deployment.yaml

@@ -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 }}

cluster/manifests/skipper-canary-controller/canary-cronjob.yaml

@@ -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:

cluster/manifests/skipper/deployment.yaml

@@ -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" }}
 
 
@@ -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"

cluster/node-pools/master-default/userdata.yaml

@@ -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
@@ -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
@@ -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

cluster/node-pools/worker-karpenter/provisioners.yaml

@@ -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 }}

test/e2e/README.md

@@ -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?**

test/e2e/run_e2e.sh

@@ -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="$?"