Move template tests, rm src dir (#1565)

awslabs · Jan 12, 2024 · 3cf8461 · 3cf8461
1 parent 8a901f6
commit 3cf8461
Show file tree

Hide file tree

Showing 102 changed files with 24 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -65,7 +65,7 @@ lint: lint-docs ## Check the source files for syntax and format issues
 
 .PHONY: test
 test: ## run the test-harness
-	test/test-harness.sh
+	templates/test/test-harness.sh
 
 PACKER_BINARY ?= packer
 PACKER_TEMPLATE_DIR ?= src/templates/$(os_distro)

diff --git a/hack/generate-template-variable-doc.py b/hack/generate-template-variable-doc.py
@@ -57,8 +57,8 @@ def update_doc(doc: str, boundary: str, template_path: str) -> str:
 with open(doc_file_name) as doc_file:
     doc = doc_file.read()
 
-doc = update_doc(doc, al2_boundary, '../src/templates/al2/template.json')
-doc = update_doc(doc, al2023_boundary, '../src/templates/al2023/template.json')
+doc = update_doc(doc, al2_boundary, '../templates/al2/template.json')
+doc = update_doc(doc, al2023_boundary, '../templates/al2023/template.json')
 
 with open(doc_file_name, 'w') as doc_file:
     doc_file.write(doc)
diff --git a/.../provisioners/cleanup-additional-repos.sh → .../provisioners/cleanup-additional-repos.sh b/.../provisioners/cleanup-additional-repos.sh → .../provisioners/cleanup-additional-repos.sh
diff --git a/...templates/al2/provisioners/enable-fips.sh → templates/al2/provisioners/enable-fips.sh b/...templates/al2/provisioners/enable-fips.sh → templates/al2/provisioners/enable-fips.sh
diff --git a/.../provisioners/install-additional-repos.sh → .../provisioners/install-additional-repos.sh b/.../provisioners/install-additional-repos.sh → .../provisioners/install-additional-repos.sh
diff --git a/...plates/al2/provisioners/install-worker.sh → templates/al2/provisioners/install-worker.sh b/...plates/al2/provisioners/install-worker.sh → templates/al2/provisioners/install-worker.sh
diff --git a/...plates/al2/provisioners/upgrade-kernel.sh → templates/al2/provisioners/upgrade-kernel.sh b/...plates/al2/provisioners/upgrade-kernel.sh → templates/al2/provisioners/upgrade-kernel.sh
diff --git a/src/templates/al2/provisioners/validate.sh → templates/al2/provisioners/validate.sh b/src/templates/al2/provisioners/validate.sh → templates/al2/provisioners/validate.sh
diff --git a/src/templates/al2/runtime/bin/imds → templates/al2/runtime/bin/imds b/src/templates/al2/runtime/bin/imds → templates/al2/runtime/bin/imds
diff --git a/src/templates/al2/runtime/bin/mount-bpf-fs → templates/al2/runtime/bin/mount-bpf-fs b/src/templates/al2/runtime/bin/mount-bpf-fs → templates/al2/runtime/bin/mount-bpf-fs
diff --git a/...emplates/al2/runtime/bin/private-dns-name → templates/al2/runtime/bin/private-dns-name b/...emplates/al2/runtime/bin/private-dns-name → templates/al2/runtime/bin/private-dns-name
diff --git a/src/templates/al2/runtime/bin/provider-id → templates/al2/runtime/bin/provider-id b/src/templates/al2/runtime/bin/provider-id → templates/al2/runtime/bin/provider-id
diff --git a/src/templates/al2/runtime/bin/vercmp → templates/al2/runtime/bin/vercmp b/src/templates/al2/runtime/bin/vercmp → templates/al2/runtime/bin/vercmp
diff --git a/src/templates/al2/runtime/bootstrap.sh → templates/al2/runtime/bootstrap.sh b/src/templates/al2/runtime/bootstrap.sh → templates/al2/runtime/bootstrap.sh
diff --git a/...plates/al2/runtime/containerd-config.toml → templates/al2/runtime/containerd-config.toml b/...plates/al2/runtime/containerd-config.toml → templates/al2/runtime/containerd-config.toml
diff --git a/src/templates/al2/runtime/docker-daemon.json → templates/al2/runtime/docker-daemon.json b/src/templates/al2/runtime/docker-daemon.json → templates/al2/runtime/docker-daemon.json
diff --git a/...ntime/ecr-credential-provider-config.json → ...ntime/ecr-credential-provider-config.json b/...ntime/ecr-credential-provider-config.json → ...ntime/ecr-credential-provider-config.json
diff --git a/src/templates/al2/runtime/get-ecr-uri.sh → templates/al2/runtime/get-ecr-uri.sh b/src/templates/al2/runtime/get-ecr-uri.sh → templates/al2/runtime/get-ecr-uri.sh
diff --git a/...ates/al2/runtime/iptables-restore.service → ...ates/al2/runtime/iptables-restore.service b/...ates/al2/runtime/iptables-restore.service → ...ates/al2/runtime/iptables-restore.service
diff --git a/...templates/al2/runtime/kubelet-config.json → templates/al2/runtime/kubelet-config.json b/...templates/al2/runtime/kubelet-config.json → templates/al2/runtime/kubelet-config.json
diff --git a/...es/al2/runtime/kubelet-containerd.service → ...es/al2/runtime/kubelet-containerd.service b/...es/al2/runtime/kubelet-containerd.service → ...es/al2/runtime/kubelet-containerd.service
diff --git a/src/templates/al2/runtime/kubelet-kubeconfig → templates/al2/runtime/kubelet-kubeconfig b/src/templates/al2/runtime/kubelet-kubeconfig → templates/al2/runtime/kubelet-kubeconfig
diff --git a/src/templates/al2/runtime/kubelet.service → templates/al2/runtime/kubelet.service b/src/templates/al2/runtime/kubelet.service → templates/al2/runtime/kubelet.service
diff --git a/...emplates/al2/runtime/logrotate-kube-proxy → templates/al2/runtime/logrotate-kube-proxy b/...emplates/al2/runtime/logrotate-kube-proxy → templates/al2/runtime/logrotate-kube-proxy
diff --git a/src/templates/al2/runtime/logrotate.conf → templates/al2/runtime/logrotate.conf b/src/templates/al2/runtime/logrotate.conf → templates/al2/runtime/logrotate.conf
diff --git a/...plates/al2/runtime/max-pods-calculator.sh → templates/al2/runtime/max-pods-calculator.sh b/...plates/al2/runtime/max-pods-calculator.sh → templates/al2/runtime/max-pods-calculator.sh
diff --git a/src/templates/al2/runtime/pull-image.sh → templates/al2/runtime/pull-image.sh b/src/templates/al2/runtime/pull-image.sh → templates/al2/runtime/pull-image.sh
diff --git a/...mplates/al2/runtime/pull-sandbox-image.sh → templates/al2/runtime/pull-sandbox-image.sh b/...mplates/al2/runtime/pull-sandbox-image.sh → templates/al2/runtime/pull-sandbox-image.sh
diff --git a/src/templates/al2/runtime/runtime.slice → templates/al2/runtime/runtime.slice b/src/templates/al2/runtime/runtime.slice → templates/al2/runtime/runtime.slice
diff --git a/...mplates/al2/runtime/sandbox-image.service → templates/al2/runtime/sandbox-image.service b/...mplates/al2/runtime/sandbox-image.service → templates/al2/runtime/sandbox-image.service
diff --git a/src/templates/al2/template.json → templates/al2/template.json b/src/templates/al2/template.json → templates/al2/template.json
diff --git a/src/templates/al2/variables-1.23.json → templates/al2/variables-1.23.json b/src/templates/al2/variables-1.23.json → templates/al2/variables-1.23.json
diff --git a/src/templates/al2/variables-1.24.json → templates/al2/variables-1.24.json b/src/templates/al2/variables-1.24.json → templates/al2/variables-1.24.json
diff --git a/src/templates/al2/variables-default.json → templates/al2/variables-default.json b/src/templates/al2/variables-default.json → templates/al2/variables-default.json
diff --git a/...plates/al2023/provisioners/enable-fips.sh → templates/al2023/provisioners/enable-fips.sh b/...plates/al2023/provisioners/enable-fips.sh → templates/al2023/provisioners/enable-fips.sh
diff --git a/...tes/al2023/provisioners/install-worker.sh → ...tes/al2023/provisioners/install-worker.sh b/...tes/al2023/provisioners/install-worker.sh → ...tes/al2023/provisioners/install-worker.sh
diff --git a/...templates/al2023/provisioners/validate.sh → templates/al2023/provisioners/validate.sh b/...templates/al2023/provisioners/validate.sh → templates/al2023/provisioners/validate.sh
diff --git a/src/templates/al2023/runtime/bin/imds → templates/al2023/runtime/bin/imds b/src/templates/al2023/runtime/bin/imds → templates/al2023/runtime/bin/imds
diff --git a/...templates/al2023/runtime/bin/mount-bpf-fs → templates/al2023/runtime/bin/mount-bpf-fs b/...templates/al2023/runtime/bin/mount-bpf-fs → templates/al2023/runtime/bin/mount-bpf-fs
diff --git a/...lates/al2023/runtime/bin/private-dns-name → ...lates/al2023/runtime/bin/private-dns-name b/...lates/al2023/runtime/bin/private-dns-name → ...lates/al2023/runtime/bin/private-dns-name
diff --git a/src/templates/al2023/runtime/bin/provider-id → templates/al2023/runtime/bin/provider-id b/src/templates/al2023/runtime/bin/provider-id → templates/al2023/runtime/bin/provider-id
diff --git a/src/templates/al2023/runtime/bin/vercmp → templates/al2023/runtime/bin/vercmp b/src/templates/al2023/runtime/bin/vercmp → templates/al2023/runtime/bin/vercmp
diff --git a/src/templates/al2023/runtime/bootstrap.sh → templates/al2023/runtime/bootstrap.sh b/src/templates/al2023/runtime/bootstrap.sh → templates/al2023/runtime/bootstrap.sh
diff --git a/...tes/al2023/runtime/containerd-config.toml → ...tes/al2023/runtime/containerd-config.toml b/...tes/al2023/runtime/containerd-config.toml → ...tes/al2023/runtime/containerd-config.toml
diff --git a/...ntime/ecr-credential-provider-config.json → ...ntime/ecr-credential-provider-config.json b/...ntime/ecr-credential-provider-config.json → ...ntime/ecr-credential-provider-config.json
diff --git a/src/templates/al2023/runtime/get-ecr-uri.sh → templates/al2023/runtime/get-ecr-uri.sh b/src/templates/al2023/runtime/get-ecr-uri.sh → templates/al2023/runtime/get-ecr-uri.sh
diff --git a/...s/al2023/runtime/iptables-restore.service → ...s/al2023/runtime/iptables-restore.service b/...s/al2023/runtime/iptables-restore.service → ...s/al2023/runtime/iptables-restore.service
diff --git a/...plates/al2023/runtime/kubelet-config.json → templates/al2023/runtime/kubelet-config.json b/...plates/al2023/runtime/kubelet-config.json → templates/al2023/runtime/kubelet-config.json
diff --git a/...al2023/runtime/kubelet-containerd.service → ...al2023/runtime/kubelet-containerd.service b/...al2023/runtime/kubelet-containerd.service → ...al2023/runtime/kubelet-containerd.service
diff --git a/...mplates/al2023/runtime/kubelet-kubeconfig → templates/al2023/runtime/kubelet-kubeconfig b/...mplates/al2023/runtime/kubelet-kubeconfig → templates/al2023/runtime/kubelet-kubeconfig
diff --git a/src/templates/al2023/runtime/kubelet.service → templates/al2023/runtime/kubelet.service b/src/templates/al2023/runtime/kubelet.service → templates/al2023/runtime/kubelet.service
diff --git a/...lates/al2023/runtime/logrotate-kube-proxy → ...lates/al2023/runtime/logrotate-kube-proxy b/...lates/al2023/runtime/logrotate-kube-proxy → ...lates/al2023/runtime/logrotate-kube-proxy
diff --git a/src/templates/al2023/runtime/logrotate.conf → templates/al2023/runtime/logrotate.conf b/src/templates/al2023/runtime/logrotate.conf → templates/al2023/runtime/logrotate.conf
diff --git a/...tes/al2023/runtime/max-pods-calculator.sh → ...tes/al2023/runtime/max-pods-calculator.sh b/...tes/al2023/runtime/max-pods-calculator.sh → ...tes/al2023/runtime/max-pods-calculator.sh
diff --git a/src/templates/al2023/runtime/pull-image.sh → templates/al2023/runtime/pull-image.sh b/src/templates/al2023/runtime/pull-image.sh → templates/al2023/runtime/pull-image.sh
diff --git a/...ates/al2023/runtime/pull-sandbox-image.sh → ...ates/al2023/runtime/pull-sandbox-image.sh b/...ates/al2023/runtime/pull-sandbox-image.sh → ...ates/al2023/runtime/pull-sandbox-image.sh
diff --git a/src/templates/al2023/runtime/runtime.slice → templates/al2023/runtime/runtime.slice b/src/templates/al2023/runtime/runtime.slice → templates/al2023/runtime/runtime.slice
diff --git a/...ates/al2023/runtime/sandbox-image.service → ...ates/al2023/runtime/sandbox-image.service b/...ates/al2023/runtime/sandbox-image.service → ...ates/al2023/runtime/sandbox-image.service
diff --git a/src/templates/al2023/template.json → templates/al2023/template.json b/src/templates/al2023/template.json → templates/al2023/template.json
diff --git a/src/templates/al2023/variables-default.json → templates/al2023/variables-default.json b/src/templates/al2023/variables-default.json → templates/al2023/variables-default.json
diff --git a/src/templates/shared/provisioners/cleanup.sh → templates/shared/provisioners/cleanup.sh b/src/templates/shared/provisioners/cleanup.sh → templates/shared/provisioners/cleanup.sh
diff --git a/...red/provisioners/generate-version-info.sh → ...red/provisioners/generate-version-info.sh b/...red/provisioners/generate-version-info.sh → ...red/provisioners/generate-version-info.sh
diff --git a/...ates/shared/runtime/configure-clocksource → ...ates/shared/runtime/configure-clocksource b/...ates/shared/runtime/configure-clocksource → ...ates/shared/runtime/configure-clocksource
diff --git a/...red/runtime/configure-clocksource.service → ...red/runtime/configure-clocksource.service b/...red/runtime/configure-clocksource.service → ...red/runtime/configure-clocksource.service
diff --git a/...templates/shared/runtime/eni-max-pods.txt → templates/shared/runtime/eni-max-pods.txt b/...templates/shared/runtime/eni-max-pods.txt → templates/shared/runtime/eni-max-pods.txt
diff --git a/...emplates/shared/runtime/setup-local-disks → templates/shared/runtime/setup-local-disks b/...emplates/shared/runtime/setup-local-disks → templates/shared/runtime/setup-local-disks
diff --git a/templates/test/Dockerfile b/templates/test/Dockerfile
@@ -0,0 +1,21 @@
+FROM public.ecr.aws/aws-ec2/amazon-ec2-metadata-mock:v1.11.2 as aemm
+FROM public.ecr.aws/amazonlinux/amazonlinux:2
+RUN amazon-linux-extras enable docker && \
+    yum install -y jq containerd wget which && \
+    wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 && \
+    chmod a+x /usr/local/bin/yq
+
+ENV IMDS_ENDPOINT=127.0.0.1:1338
+COPY --from=aemm /ec2-metadata-mock /sbin/ec2-metadata-mock
+RUN mkdir -p /etc/systemd/system
+RUN mkdir -p /etc/eks/containerd
+COPY al2/runtime/ /etc/eks/
+COPY shared/runtime/ /etc/eks/
+COPY al2/runtime/containerd-config.toml al2/runtime/kubelet-containerd.service al2/runtime/pull-sandbox-image.sh al2/runtime/sandbox-image.service /etc/eks/containerd/
+COPY al2/runtime/kubelet-config.json /etc/kubernetes/kubelet/kubelet-config.json
+COPY al2/runtime/kubelet-kubeconfig /var/lib/kubelet/kubeconfig
+COPY al2/runtime/ecr-credential-provider-config.json /etc/eks/image-credential-provider/config.json
+COPY test/entrypoint.sh /entrypoint.sh
+COPY al2/runtime/bin/* /usr/bin/
+COPY test/mocks/ /sbin/
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/test/README.md → templates/test/README.md b/test/README.md → templates/test/README.md
diff --git a/test/cases/api-qps-k8s-1.21-below.sh → ...ates/test/cases/api-qps-k8s-1.21-below.sh b/test/cases/api-qps-k8s-1.21-below.sh → ...ates/test/cases/api-qps-k8s-1.21-below.sh
diff --git a/test/cases/api-qps-k8s-1.22-to-1.26.sh → ...es/test/cases/api-qps-k8s-1.22-to-1.26.sh b/test/cases/api-qps-k8s-1.22-to-1.26.sh → ...es/test/cases/api-qps-k8s-1.22-to-1.26.sh
diff --git a/test/cases/api-qps-k8s-1.27-above.sh → ...ates/test/cases/api-qps-k8s-1.27-above.sh b/test/cases/api-qps-k8s-1.27-above.sh → ...ates/test/cases/api-qps-k8s-1.27-above.sh
diff --git a/test/cases/cloud-provider-config.sh → ...lates/test/cases/cloud-provider-config.sh b/test/cases/cloud-provider-config.sh → ...lates/test/cases/cloud-provider-config.sh
diff --git a/test/cases/container-runtime-defaults.sh → .../test/cases/container-runtime-defaults.sh b/test/cases/container-runtime-defaults.sh → .../test/cases/container-runtime-defaults.sh
diff --git a/test/cases/containerd-config.sh → templates/test/cases/containerd-config.sh b/test/cases/containerd-config.sh → templates/test/cases/containerd-config.sh
diff --git a/test/cases/ecr-credential-provider-config.sh → ...t/cases/ecr-credential-provider-config.sh b/test/cases/ecr-credential-provider-config.sh → ...t/cases/ecr-credential-provider-config.sh
diff --git a/test/cases/get-ecr-uri.sh → templates/test/cases/get-ecr-uri.sh b/test/cases/get-ecr-uri.sh → templates/test/cases/get-ecr-uri.sh
diff --git a/test/cases/imds-errors.sh → templates/test/cases/imds-errors.sh b/test/cases/imds-errors.sh → templates/test/cases/imds-errors.sh
diff --git a/...s/ip-family-service-ipv6-cidr-mismatch.sh → ...s/ip-family-service-ipv6-cidr-mismatch.sh b/...s/ip-family-service-ipv6-cidr-mismatch.sh → ...s/ip-family-service-ipv6-cidr-mismatch.sh
diff --git a/test/cases/ipv4-cluster-dns-ip.sh → templates/test/cases/ipv4-cluster-dns-ip.sh b/test/cases/ipv4-cluster-dns-ip.sh → templates/test/cases/ipv4-cluster-dns-ip.sh
diff --git a/test/cases/ipv6-cluster-dns-ip.sh → templates/test/cases/ipv6-cluster-dns-ip.sh b/test/cases/ipv6-cluster-dns-ip.sh → templates/test/cases/ipv6-cluster-dns-ip.sh
diff --git a/...dns-cluster-ip-given-service-ipv6-cidr.sh → ...dns-cluster-ip-given-service-ipv6-cidr.sh b/...dns-cluster-ip-given-service-ipv6-cidr.sh → ...dns-cluster-ip-given-service-ipv6-cidr.sh
diff --git a/...s/ipv6-ip-family-and-service-ipv6-cidr.sh → ...s/ipv6-ip-family-and-service-ipv6-cidr.sh b/...s/ipv6-ip-family-and-service-ipv6-cidr.sh → ...s/ipv6-ip-family-and-service-ipv6-cidr.sh
diff --git a/test/cases/max-pods-cni-1-11-2-delegation.sh → ...t/cases/max-pods-cni-1-11-2-delegation.sh b/test/cases/max-pods-cni-1-11-2-delegation.sh → ...t/cases/max-pods-cni-1-11-2-delegation.sh
diff --git a/test/cases/max-pods-cni-1-11-2.sh → templates/test/cases/max-pods-cni-1-11-2.sh b/test/cases/max-pods-cni-1-11-2.sh → templates/test/cases/max-pods-cni-1-11-2.sh
diff --git a/test/cases/max-pods-cni-1-7-5.sh → templates/test/cases/max-pods-cni-1-7-5.sh b/test/cases/max-pods-cni-1-7-5.sh → templates/test/cases/max-pods-cni-1-7-5.sh
diff --git a/test/cases/mount-bpf-fs.sh → templates/test/cases/mount-bpf-fs.sh b/test/cases/mount-bpf-fs.sh → templates/test/cases/mount-bpf-fs.sh
diff --git a/test/cases/private-dns-name.sh → templates/test/cases/private-dns-name.sh b/test/cases/private-dns-name.sh → templates/test/cases/private-dns-name.sh
diff --git a/test/cases/provider-id.sh → templates/test/cases/provider-id.sh b/test/cases/provider-id.sh → templates/test/cases/provider-id.sh
diff --git a/test/cases/reserved-cpus-kubelet-arg.sh → ...s/test/cases/reserved-cpus-kubelet-arg.sh b/test/cases/reserved-cpus-kubelet-arg.sh → ...s/test/cases/reserved-cpus-kubelet-arg.sh
diff --git a/test/cases/vercmp.sh → templates/test/cases/vercmp.sh b/test/cases/vercmp.sh → templates/test/cases/vercmp.sh
diff --git a/test/entrypoint.sh → templates/test/entrypoint.sh b/test/entrypoint.sh → templates/test/entrypoint.sh
diff --git a/test/mocks/aws → templates/test/mocks/aws b/test/mocks/aws → templates/test/mocks/aws
diff --git a/...ks/describe-instance-types/m4-xlarge.json → ...ks/describe-instance-types/m4-xlarge.json b/...ks/describe-instance-types/m4-xlarge.json → ...ks/describe-instance-types/m4-xlarge.json
diff --git a/...s/describe-instance-types/m5-8xlarge.json → ...s/describe-instance-types/m5-8xlarge.json b/...s/describe-instance-types/m5-8xlarge.json → ...s/describe-instance-types/m5-8xlarge.json
diff --git a/...scribe-instances/i-1234567890abcdef0.json → ...scribe-instances/i-1234567890abcdef0.json b/...scribe-instances/i-1234567890abcdef0.json → ...scribe-instances/i-1234567890abcdef0.json
diff --git a/test/mocks/iptables-save → templates/test/mocks/iptables-save b/test/mocks/iptables-save → templates/test/mocks/iptables-save
diff --git a/test/mocks/kubelet → templates/test/mocks/kubelet b/test/mocks/kubelet → templates/test/mocks/kubelet
diff --git a/test/mocks/mount → templates/test/mocks/mount b/test/mocks/mount → templates/test/mocks/mount
diff --git a/test/mocks/sudo → templates/test/mocks/sudo b/test/mocks/sudo → templates/test/mocks/sudo
diff --git a/test/mocks/systemctl → templates/test/mocks/systemctl b/test/mocks/systemctl → templates/test/mocks/systemctl
diff --git a/test/test-harness.sh → templates/test/test-harness.sh b/test/test-harness.sh → templates/test/test-harness.sh
diff --git a/test/Dockerfile b/test/Dockerfile