Skip to content

Commit 4caf7a4

Browse files
committed
containerd v2
Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
1 parent 3e570c5 commit 4caf7a4

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

cluster/config-defaults.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -827,8 +827,10 @@ tracing_coredns_local_zone_traces_endpoint: ""
827827
# AMI id given the image name and the Image AWS account owner.
828828
#
829829
# [0]: https://github.com/zalando-incubator/cluster-lifecycle-manager/blob/8a9bd1cb2d094038a9e23e646421f8146b48886a/provisioner/template.go#L116
830-
kuberuntu_image_v1_34_new_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.34.1-amd64-master-380" "861068367966" }}
831-
kuberuntu_image_v1_34_new_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.34.1-arm64-master-380" "861068367966" }}
830+
kuberuntu_image_v1_34_new_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-test-v1.34.1-amd64-pr-405-9" "861068367966" }}
831+
kuberuntu_image_v1_34_new_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-test-v1.34.1-arm64-pr-405-9" "861068367966" }}
832+
# kuberuntu_image_v1_34_new_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.34.1-amd64-master-380" "861068367966" }}
833+
# kuberuntu_image_v1_34_new_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.34.1-arm64-master-380" "861068367966" }}
832834

833835
# This is used to determine which AMI to use for the cluster or individual node
834836
# pools. Possible values are 'new' or 'old'

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ write_files:
1919
# https://github.com/kubernetes/kubernetes/blob/v1.30.0/staging/src/k8s.io/kubelet/config/v1beta1/types.go
2020
apiVersion: kubelet.config.k8s.io/v1beta1
2121
kind: KubeletConfiguration
22-
cgroupDriver: systemd
2322
containerLogMaxSize: "50Mi"
2423
containerLogMaxFiles: 2
2524
staticPodPath: "/etc/kubernetes/manifests"

cluster/node-pools/worker-splitaz/userdata.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ write_files:
6767
# https://github.com/kubernetes/kubernetes/blob/v1.13.6/staging/src/k8s.io/kubelet/config/v1beta1/types.go
6868
apiVersion: kubelet.config.k8s.io/v1beta1
6969
kind: KubeletConfiguration
70-
cgroupDriver: systemd
7170
containerLogMaxSize: "50Mi"
7271
containerLogMaxFiles: 2
7372
imageGCHighThresholdPercent: {{.Cluster.ConfigItems.kubelet_image_gc_high_threshold}}

test/e2e/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ examples of how to write the tests or checkout the files already defined e.g.
2626
```bash
2727
KUBECONFIG=~/.kube/config HOSTED_ZONE=example.org CLUSTER_ALIAS=example \
2828
ginkgo -procs=1 -flake-attempts=2 \
29-
-focus="(\[Conformance\]|\[StatefulSetBasic\]|\[Feature:StatefulSet\]\s\[Slow\].*mysql|\[Zalando\])" \
29+
-focus="(\[Conformance\]|\[StatefulSetBasic\]|\[Zalando\])" \
3030
-skip="(\[Serial\])" \
3131
"e2e.test" -- -delete-namespace-on-failure=false -non-blocking-taints=node.kubernetes.io/role,nvidia.com/gpu,dedicated
3232
```

test/e2e/admission_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const (
4141
application = "e2e-test-application"
4242
component = "e2e-test-component"
4343
environment = "e2e-test-environment"
44-
dockerImage = "registry.k8s.io/busybox"
44+
dockerImage = "public.ecr.aws/docker/library/busybox"
4545
)
4646

4747
var _ = describe("Admission controller tests", func() {

test/e2e/run_e2e.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,12 @@ if [ "$e2e" = true ]; then
214214
"Mirror pods should be created for the main Kubernetes components \[Zalando\]"
215215
"Should audit API calls to create, update, patch, delete pods. \[Audit\] \[Zalando\]"
216216
"should validate permissions for \[Authorization\] \[RBAC\] \[Zalando\]" # TODO: Remains skipped until we remove the older RBAC setup
217-
"should creating a working mysql cluster" # upstream test which does not work with IPv6
218217
)
219218
fi
220219

221220
mkdir -p junit_reports
222221
ginkgo -procs=25 -flake-attempts=2 \
223-
-focus="(\[Conformance\]|\[StatefulSetBasic\]|\[Feature:StatefulSet\]\s\[Slow\].*mysql|\[Zalando\]|\[Opa\])" \
222+
-focus="(\[Conformance\]|\[StatefulSetBasic\]|\[Zalando\]|\[Opa\])" \
224223
-skip="($(IFS="|" ; echo "${SKIPPED_TESTS[*]}"))" \
225224
"e2e.test" -- \
226225
-delete-namespace-on-failure=false \

0 commit comments

Comments
 (0)