diff --git a/test/e2e b/test/e2e new file mode 120000 index 000000000..0df40b8da --- /dev/null +++ b/test/e2e @@ -0,0 +1 @@ +../cluster/gce/cloud-init/ \ No newline at end of file diff --git a/test/e2e/master.yaml b/test/e2e/master.yaml deleted file mode 100644 index 4c195a18f..000000000 --- a/test/e2e/master.yaml +++ /dev/null @@ -1,231 +0,0 @@ -#cloud-config - -write_files: -# Setup cri-containerd. - - path: /etc/systemd/system/cri-containerd-installation.service - permissions: 0644 - owner: root - content: | - # installed by cloud-init - [Unit] - Description=Download and install cri-containerd binaries and configurations. - After=network-online.target - - [Service] - Type=oneshot - RemainAfterExit=yes - ExecStartPre=/bin/mkdir -p /home/cri-containerd - ExecStartPre=/bin/mount --bind /home/cri-containerd /home/cri-containerd - ExecStartPre=/bin/mount -o remount,exec /home/cri-containerd - ExecStartPre=/usr/bin/curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" -o /home/cri-containerd/configure.sh http://metadata.google.internal/computeMetadata/v1/instance/attributes/cri-containerd-configure-sh - ExecStartPre=/bin/chmod 544 /home/cri-containerd/configure.sh - ExecStart=/home/cri-containerd/configure.sh - - [Install] - WantedBy=cri-containerd.target - - - path: /etc/containerd/config.toml - permissions: 0644 - owner: root - content: | - # installed by cloud-init - oom_score = -999 - - [plugins.linux] - shim = "/home/cri-containerd/usr/local/bin/containerd-shim" - runtime = "/home/cri-containerd/usr/local/sbin/runc" - - - path: /etc/systemd/system/containerd.service - permissions: 0644 - owner: root - content: | - # installed by cloud-init - [Unit] - Description=containerd container runtime - Documentation=https://containerd.io - After=cri-containerd-installation.service - - [Service] - Restart=always - RestartSec=5 - Delegate=yes - KillMode=process - LimitNOFILE=1048576 - # Having non-zero Limit*s causes performance problems due to accounting overhead - # in the kernel. We recommend using cgroups to do container-local accounting. - LimitNPROC=infinity - LimitCORE=infinity - ExecStartPre=/sbin/modprobe overlay - ExecStart=/home/cri-containerd/usr/local/bin/containerd --log-level debug - - [Install] - WantedBy=cri-containerd.target - - - path: /etc/systemd/system/cri-containerd.service - permissions: 0644 - owner: root - content: | - # installed by cloud-init - [Unit] - Description=Kubernetes containerd CRI shim - Requires=network-online.target - After=cri-containerd-installation.service - - [Service] - Restart=always - RestartSec=5 - LimitNOFILE=1048576 - # Having non-zero Limit*s causes performance problems due to accounting overhead - # in the kernel. We recommend using cgroups to do container-local accounting. - LimitNPROC=infinity - LimitCORE=infinity - # cri-containerd on master uses the cni binary and config in the - # release tarball. - ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \ - --logtostderr --v=4 \ - --network-bin-dir=/home/cri-containerd/opt/cni/bin \ - --network-conf-dir=/home/cri-containerd/etc/cni/net.d - - [Install] - WantedBy=cri-containerd.target - - - path: /etc/systemd/system/cri-containerd-monitor.service - permissions: 0644 - owner: root - content: | - [Unit] - Description=Kubernetes health monitoring for cri-containerd and containerd - After=containerd.service cri-containerd.service - - [Service] - Restart=always - RestartSec=10 - RemainAfterExit=yes - RemainAfterExit=yes - ExecStartPre=/bin/chmod 544 /home/cri-containerd/opt/cri-containerd/cluster/health-monitor.sh - ExecStart=/home/cri-containerd/opt/cri-containerd/cluster/health-monitor.sh - - [Install] - WantedBy=cri-containerd.target - - # TODO(random-liu): Guarantee order. - - path: /etc/systemd/system/cri-containerd.target - permissions: 0644 - owner: root - content: | - [Unit] - Description=CRI Containerd - - [Install] - WantedBy=kubernetes.target - -# Setup kubernetes. - - path: /etc/systemd/system/kube-master-installation.service - permissions: 0644 - owner: root - content: | - [Unit] - Description=Download and install k8s binaries and configurations - After=network-online.target - - [Service] - Type=oneshot - RemainAfterExit=yes - ExecStartPre=/bin/mkdir -p /home/kubernetes/bin - ExecStartPre=/bin/mount --bind /home/kubernetes/bin /home/kubernetes/bin - ExecStartPre=/bin/mount -o remount,exec /home/kubernetes/bin - ExecStartPre=/usr/bin/curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" -o /home/kubernetes/bin/configure.sh http://metadata.google.internal/computeMetadata/v1/instance/attributes/configure-sh - ExecStartPre=/bin/chmod 544 /home/kubernetes/bin/configure.sh - ExecStart=/home/kubernetes/bin/configure.sh - - [Install] - WantedBy=kubernetes.target - - - path: /etc/systemd/system/kube-master-configuration.service - permissions: 0644 - owner: root - content: | - [Unit] - Description=Configure kubernetes master - After=kube-master-installation.service - - [Service] - Type=oneshot - RemainAfterExit=yes - ExecStartPre=/bin/chmod 544 /home/kubernetes/bin/configure-helper.sh - ExecStart=/home/kubernetes/bin/configure-helper.sh - - [Install] - WantedBy=kubernetes.target - - - path: /etc/systemd/system/kubelet-monitor.service - permissions: 0644 - owner: root - content: | - [Unit] - Description=Kubernetes health monitoring for kubelet - After=kube-master-configuration.service - - [Service] - Restart=always - RestartSec=10 - RemainAfterExit=yes - RemainAfterExit=yes - ExecStartPre=/bin/chmod 544 /home/kubernetes/bin/health-monitor.sh - ExecStart=/home/kubernetes/bin/health-monitor.sh kubelet - - [Install] - WantedBy=kubernetes.target - - - path: /etc/systemd/system/kube-logrotate.timer - permissions: 0644 - owner: root - content: | - [Unit] - Description=Hourly kube-logrotate invocation - - [Timer] - OnCalendar=hourly - - [Install] - WantedBy=kubernetes.target - - - path: /etc/systemd/system/kube-logrotate.service - permissions: 0644 - owner: root - content: | - [Unit] - Description=Kubernetes log rotation - After=kube-master-configuration.service - - [Service] - Type=oneshot - ExecStart=-/usr/sbin/logrotate /etc/logrotate.conf - - [Install] - WantedBy=kubernetes.target - - - path: /etc/systemd/system/kubernetes.target - permissions: 0644 - owner: root - content: | - [Unit] - Description=Kubernetes - - [Install] - WantedBy=multi-user.target - -runcmd: - - systemctl daemon-reload - - systemctl enable containerd.service - - systemctl enable cri-containerd-installation.service - - systemctl enable cri-containerd.service - - systemctl enable cri-containerd-monitor.service - - systemctl enable cri-containerd.target - - systemctl enable kube-master-installation.service - - systemctl enable kube-master-configuration.service - - systemctl enable kubelet-monitor.service - - systemctl enable kube-logrotate.timer - - systemctl enable kube-logrotate.service - - systemctl enable kubernetes.target - - systemctl start kubernetes.target diff --git a/test/e2e/node.yaml b/test/e2e/node.yaml deleted file mode 100644 index bf39ce8fa..000000000 --- a/test/e2e/node.yaml +++ /dev/null @@ -1,234 +0,0 @@ -#cloud-config - -write_files: -# Setup cri-containerd. - - path: /etc/systemd/system/cri-containerd-installation.service - permissions: 0644 - owner: root - content: | - # installed by cloud-init - [Unit] - Description=Download and install cri-containerd binaries and configurations. - After=network-online.target - - [Service] - Type=oneshot - RemainAfterExit=yes - # cri-containerd requires the existence of cni config directory. - # TODO(random-liu): Eliminate the requirement in ocicni. - ExecStartPre=/bin/mkdir -p /etc/cni/net.d - ExecStartPre=/bin/mkdir -p /home/cri-containerd - ExecStartPre=/bin/mount --bind /home/cri-containerd /home/cri-containerd - ExecStartPre=/bin/mount -o remount,exec /home/cri-containerd - ExecStartPre=/usr/bin/curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" -o /home/cri-containerd/configure.sh http://metadata.google.internal/computeMetadata/v1/instance/attributes/cri-containerd-configure-sh - ExecStartPre=/bin/chmod 544 /home/cri-containerd/configure.sh - ExecStart=/home/cri-containerd/configure.sh - - [Install] - WantedBy=cri-containerd.target - - - path: /etc/containerd/config.toml - permissions: 0644 - owner: root - content: | - # installed by cloud-init - oom_score = -999 - - [plugins.linux] - shim = "/home/cri-containerd/usr/local/bin/containerd-shim" - runtime = "/home/cri-containerd/usr/local/sbin/runc" - - # TODO(random-liu): Add health monitor for containerd/cri-containerd. - - path: /etc/systemd/system/containerd.service - permissions: 0644 - owner: root - content: | - # installed by cloud-init - [Unit] - Description=containerd container runtime - Documentation=https://containerd.io - After=cri-containerd-installation.service - - [Service] - Restart=always - RestartSec=5 - Delegate=yes - KillMode=process - LimitNOFILE=1048576 - # Having non-zero Limit*s causes performance problems due to accounting overhead - # in the kernel. We recommend using cgroups to do container-local accounting. - LimitNPROC=infinity - LimitCORE=infinity - ExecStartPre=/sbin/modprobe overlay - ExecStart=/home/cri-containerd/usr/local/bin/containerd --log-level debug - - [Install] - WantedBy=cri-containerd.target - - - path: /etc/systemd/system/cri-containerd.service - permissions: 0644 - owner: root - content: | - # installed by cloud-init - [Unit] - Description=Kubernetes containerd CRI shim - Requires=network-online.target - After=cri-containerd-installation.service - - [Service] - Restart=always - RestartSec=5 - LimitNOFILE=1048576 - # Having non-zero Limit*s causes performance problems due to accounting overhead - # in the kernel. We recommend using cgroups to do container-local accounting. - LimitNPROC=infinity - LimitCORE=infinity - # Point to /home/kubernetes/bin where calico setup cni binary in kube-up.sh. - # Point to /etc/cni/net.d where calico put cni config in kube-up.sh. - ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \ - --logtostderr --v=4 \ - --network-bin-dir=/home/kubernetes/bin \ - --network-conf-dir=/etc/cni/net.d - - [Install] - WantedBy=cri-containerd.target - - - path: /etc/systemd/system/cri-containerd-monitor.service - permissions: 0644 - owner: root - content: | - [Unit] - Description=Kubernetes health monitoring for cri-containerd and containerd - After=containerd.service cri-containerd.service - - [Service] - Restart=always - RestartSec=10 - RemainAfterExit=yes - RemainAfterExit=yes - ExecStartPre=/bin/chmod 544 /home/cri-containerd/opt/cri-containerd/cluster/health-monitor.sh - ExecStart=/home/cri-containerd/opt/cri-containerd/cluster/health-monitor.sh - - [Install] - WantedBy=cri-containerd.target - - - path: /etc/systemd/system/cri-containerd.target - permissions: 0644 - owner: root - content: | - [Unit] - Description=CRI Containerd - - [Install] - WantedBy=kubernetes.target - -# Setup kubernetes. - - path: /etc/systemd/system/kube-node-installation.service - permissions: 0644 - owner: root - content: | - [Unit] - Description=Download and install k8s binaries and configurations - After=network-online.target - - [Service] - Type=oneshot - RemainAfterExit=yes - ExecStartPre=/bin/mkdir -p /home/kubernetes/bin - ExecStartPre=/bin/mount --bind /home/kubernetes/bin /home/kubernetes/bin - ExecStartPre=/bin/mount -o remount,exec /home/kubernetes/bin - ExecStartPre=/usr/bin/curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" -o /home/kubernetes/bin/configure.sh http://metadata.google.internal/computeMetadata/v1/instance/attributes/configure-sh - ExecStartPre=/bin/chmod 544 /home/kubernetes/bin/configure.sh - ExecStart=/home/kubernetes/bin/configure.sh - - [Install] - WantedBy=kubernetes.target - - - path: /etc/systemd/system/kube-node-configuration.service - permissions: 0644 - owner: root - content: | - [Unit] - Description=Configure kubernetes node - After=kube-node-installation.service - - [Service] - Type=oneshot - RemainAfterExit=yes - ExecStartPre=/bin/chmod 544 /home/kubernetes/bin/configure-helper.sh - ExecStart=/home/kubernetes/bin/configure-helper.sh - - [Install] - WantedBy=kubernetes.target - - - path: /etc/systemd/system/kubelet-monitor.service - permissions: 0644 - owner: root - content: | - [Unit] - Description=Kubernetes health monitoring for kubelet - After=kube-node-configuration.service - - [Service] - Restart=always - RestartSec=10 - RemainAfterExit=yes - RemainAfterExit=yes - ExecStartPre=/bin/chmod 544 /home/kubernetes/bin/health-monitor.sh - ExecStart=/home/kubernetes/bin/health-monitor.sh kubelet - - [Install] - WantedBy=kubernetes.target - - - path: /etc/systemd/system/kube-logrotate.timer - permissions: 0644 - owner: root - content: | - [Unit] - Description=Hourly kube-logrotate invocation - - [Timer] - OnCalendar=hourly - - [Install] - WantedBy=kubernetes.target - - - path: /etc/systemd/system/kube-logrotate.service - permissions: 0644 - owner: root - content: | - [Unit] - Description=Kubernetes log rotation - After=kube-node-configuration.service - - [Service] - Type=oneshot - ExecStart=-/usr/sbin/logrotate /etc/logrotate.conf - - [Install] - WantedBy=kubernetes.target - - - path: /etc/systemd/system/kubernetes.target - permissions: 0644 - owner: root - content: | - [Unit] - Description=Kubernetes - - [Install] - WantedBy=multi-user.target - -runcmd: - - systemctl daemon-reload - - systemctl enable containerd.service - - systemctl enable cri-containerd-installation.service - - systemctl enable cri-containerd.service - - systemctl enable cri-containerd-monitor.service - - systemctl enable cri-containerd.target - - systemctl enable kube-node-installation.service - - systemctl enable kube-node-configuration.service - - systemctl enable kubelet-monitor.service - - systemctl enable kube-logrotate.timer - - systemctl enable kube-logrotate.service - - systemctl enable kubernetes.target - - systemctl start kubernetes.target