Merge pull request #31653 from euank/kill-the-updates-for-the-nth-time

Automatic merge from submit-queue test/node-e2e: Update CoreOS update disabling Previously in this saga... #25004 This disables update-engine and locksmithd with ignition instead of cloud-init so that they're really totally 100% disabled. Our ignition guy promises. Pretty much every way of disabling them with cloud-init is mildly racy. Fixes #31633 I think @vishh can say "I told you so" after the comment on https://github.com/kubernetes/kubernetes/pull/30023#discussion-diff-73431324 .. he was right, but it turns out "stop" there doesn't really work either because of the mess that is cloud-init. Fortunately, converting our cloud-init to json and calling it "ignition" works quite well 😄 Testing done: I ssh'd in and verified that yes, they're disabled. I didn't wait on the e2e tests to pass, so we'll let this PR check that.

Merge pull request #31653 from euank/kill-the-updates-for-the-nth-time
22fe385c · Kubernetes Submit Queue · GitHub · 8c110675 · e58f3f61 · 22fe385c
Commit 22fe385c authored Aug 30, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 30, 2016
Showing with 30 additions and 37 deletions

coreos-init.json test/e2e_node/jenkins/coreos-init.json +29 -0

coreos-init.yaml test/e2e_node/jenkins/coreos-init.yaml +0 -36

image-config.yaml test/e2e_node/jenkins/image-config.yaml +1 -1

No files found.
--- a/test/e2e_node/jenkins/coreos-init.json
+++ b/test/e2e_node/jenkins/coreos-init.json
+{
+  "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"]
+      }
+    }]
+  }
+}
--- a/test/e2e_node/jenkins/coreos-init.yaml
+++ b/test/e2e_node/jenkins/coreos-init.yaml
-#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
--- a/test/e2e_node/jenkins/image-config.yaml
+++ b/test/e2e_node/jenkins/image-config.yaml
@@ -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