mirror of https://github.com/k3s-io/k3s
test/node-e2e: Update CoreOS update disabling
This disables update-engine and locksmithd with ignition instead of cloud-init so that they're really totally 100% disabled. Pretty much every way of disabling them with cloud-init is mildly racy. Fixes #31633pull/6/head
parent
fe808ec2a4
commit
e58f3f61f8
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
"ignition":{"version": "2.0.0"},
|
||||
"systemd": {
|
||||
"units": [{
|
||||
"name": "update-engine.service",
|
||||
"mask": true
|
||||
},
|
||||
{
|
||||
"name": "locksmithd.service",
|
||||
"mask": true
|
||||
},
|
||||
{
|
||||
"name": "docker.service",
|
||||
"dropins": [{
|
||||
"name": "10-disable-systemd-cgroup-driver.conf",
|
||||
"contents": "[Service]\nCPUAccounting=yes\nMemoryAccounting=yes\nEnvironment=\"DOCKER_CGROUPS=\""
|
||||
}]
|
||||
}]
|
||||
},
|
||||
"passwd": {
|
||||
"users": [{
|
||||
"name": "jenkins",
|
||||
"create": {
|
||||
"groups": ["docker", "sudo"]
|
||||
}
|
||||
}]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
#cloud-config
|
||||
|
||||
users:
|
||||
- name: "jenkins"
|
||||
groups:
|
||||
- "docker"
|
||||
- "sudo"
|
||||
|
||||
|
||||
coreos:
|
||||
units:
|
||||
- name: "docker.service"
|
||||
enable: true
|
||||
drop-ins:
|
||||
- name: 10-disable-systemd-cgroup-driver.conf
|
||||
content: |
|
||||
[Service]
|
||||
CPUAccounting=yes
|
||||
MemoryAccounting=yes
|
||||
# Temporary, remove after https://github.com/coreos/bugs/issues/1435 is resolved
|
||||
Environment="DOCKER_CGROUPS="
|
||||
- name: "update-engine.service"
|
||||
mask: true
|
||||
- name: "locksmithd.service"
|
||||
mask: true
|
||||
- name: "node-e2e-test-setup.service"
|
||||
command: "start"
|
||||
content: |
|
||||
[Unit]
|
||||
Description=Setup a vanilla CoreOS image for use by Node e2e
|
||||
WantedBy=multi-user.target
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
# chain `ExecStartPre`'s here to do any setup
|
||||
ExecStart=/bin/true
|
|
@ -11,7 +11,7 @@ images:
|
|||
coreos-alpha:
|
||||
image: coreos-alpha-1122-0-0-v20160727
|
||||
project: coreos-cloud
|
||||
metadata: "user-data<test/e2e_node/jenkins/coreos-init.yaml"
|
||||
metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
|
||||
containervm:
|
||||
image: e2e-node-containervm-v20160321-image
|
||||
project: kubernetes-node-e2e-images
|
||||
|
|
Loading…
Reference in New Issue