feat(*): upgrade all core components (#153)

This commit introduces the following upgrades: Linux: v4.18.13 Containerd: v1.2.0-rc.1 Kubernetes: v1.12.1 Docker: v18.06.1-ce Sonobuoy: v0.12.0
siderolabs · Oct 13, 2018 · 92ef602 · 92ef602
1 parent b34debe
commit 92ef602
Show file tree

Hide file tree

Showing 17 changed files with 161 additions and 115 deletions.
diff --git a/go.mod b/go.mod
@@ -0,0 +1,8 @@
+module github.com/autonomy/dianemo
+
+require (
+	k8s.io/api v0.0.0-20181005203742-357ec6384fa7 // indirect
+	k8s.io/apimachinery v0.0.0-20180913025736-6dd46049f395 // indirect
+	k8s.io/client-go v9.0.0+incompatible // indirect
+	k8s.io/kubernetes v1.12.1 // indirect
+)
diff --git a/go.sum b/go.sum
@@ -0,0 +1,11 @@
+k8s.io/api v0.0.0-20181005203742-357ec6384fa7 h1:cmeeh4O02+Rpgl6znrIkYB7Zu/bBIQoDa7IGZDa1Gz8=
+k8s.io/api v0.0.0-20181005203742-357ec6384fa7/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
+k8s.io/apimachinery v0.0.0-20180913025736-6dd46049f395 h1:X+c9tYTDc9Pmt+Z1YSMqmUTCYf13VYe1u+ZwzjgpK0M=
+k8s.io/apimachinery v0.0.0-20180913025736-6dd46049f395/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
+k8s.io/apimachinery v0.0.0-20181013010248-dcb88206cd7f h1:J4RMsuKRhuF+JxWL8Ip+w+lVxS/kypd+j0R93qPBD2c=
+k8s.io/client-go v2.0.0-alpha.0.0.20181005204318-cb4883f3dea0+incompatible h1:MuEpj71HTIXKoItJuIrkHWli0S997k3bYcep2/54Cq0=
+k8s.io/client-go v2.0.0-alpha.0.0.20181005204318-cb4883f3dea0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/client-go v9.0.0+incompatible h1:NXWpDuPFeVB5lYP1fTqJUtwigjtmRXJNtndnN53ldGI=
+k8s.io/client-go v9.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/kubernetes v1.12.1 h1:ud3qsh7xkSlwtboMEH1KLP2YlI0NYVYjVI/mX0jBRbY=
+k8s.io/kubernetes v1.12.1/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
diff --git a/src/conformance/.conform.yaml b/src/conformance/.conform.yaml
@@ -1,8 +1,8 @@
 metadata:
   repository: dianemo/conformance
   variables:
-    srcKubectl: https://storage.googleapis.com/kubernetes-release/release/v1.11.2/bin/linux/amd64/kubectl
-    srcSonobuoy: https://github.com/heptio/sonobuoy/releases/download/v0.11.4/sonobuoy_0.11.4_linux_amd64.tar.gz
+    srcKubectl: https://storage.googleapis.com/kubernetes-release/release/v1.12.1/bin/linux/amd64/kubectl
+    srcSonobuoy: https://github.com/heptio/sonobuoy/releases/download/v0.12.0/sonobuoy_0.12.0_linux_amd64.tar.gz
 pipeline:
   stages:
   - test

diff --git a/src/conformance/src/sonobuoy-conformance.yaml b/src/conformance/src/sonobuoy-conformance.yaml
@@ -45,7 +45,7 @@ rules:
 apiVersion: v1
 data:
   config.json: |
-    {"Description":"DEFAULT","UUID":"3cdfd89f-30c7-4872-9ed5-fcba4fae1616","Version":"v0.11.4","ResultsDir":"/tmp/sonobuoy","Resources":["CertificateSigningRequests","ClusterRoleBindings","ClusterRoles","ComponentStatuses","CustomResourceDefinitions","Nodes","PersistentVolumes","PodSecurityPolicies","ServerGroups","ServerVersion","StorageClasses","ConfigMaps","ControllerRevisions","CronJobs","DaemonSets","Deployments","Endpoints","Ingresses","Jobs","LimitRanges","NetworkPolicies","PersistentVolumeClaims","PodDisruptionBudgets","PodTemplates","Pods","ReplicaSets","ReplicationControllers","ResourceQuotas","RoleBindings","Roles","ServiceAccounts","Services","StatefulSets"],"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"LimitSize":"","LimitTime":""}},"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":10800},"Plugins":[{"name":"e2e"}],"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"heptio-sonobuoy","LoadedPlugins":null,"WorkerImage":"gcr.io/heptio-images/sonobuoy:latest","ImagePullPolicy":"Always"}
+    {"Description":"DEFAULT","UUID":"42f96975-cecd-404a-872b-d224879763ab","Version":"v0.12.0","ResultsDir":"/tmp/sonobuoy","Resources":["CertificateSigningRequests","ClusterRoleBindings","ClusterRoles","ComponentStatuses","CustomResourceDefinitions","Nodes","PersistentVolumes","PodSecurityPolicies","ServerGroups","ServerVersion","StorageClasses","ConfigMaps","ControllerRevisions","CronJobs","DaemonSets","Deployments","Endpoints","Ingresses","Jobs","LimitRanges","NetworkPolicies","PersistentVolumeClaims","PodDisruptionBudgets","PodTemplates","Pods","ReplicaSets","ReplicationControllers","ResourceQuotas","RoleBindings","Roles","ServiceAccounts","Services","StatefulSets"],"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"LimitSize":"","LimitTime":""}},"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":10800},"Plugins":[{"name":"e2e"}],"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"heptio-sonobuoy","LoadedPlugins":null,"WorkerImage":"gcr.io/heptio-images/sonobuoy:latest","ImagePullPolicy":"Always"}
 kind: ConfigMap
 metadata:
   labels:
@@ -63,9 +63,9 @@ data:
     spec:
       env:
       - name: E2E_FOCUS
-        value: '\[Conformance\]'
+        value: 'Pods should be submitted and removed'
       - name: E2E_SKIP
-        value: 'Alpha|Kubectl|\[(Disruptive|Feature:[^\]]+|Flaky)\]'
+        value: 'Alpha|\[(Disruptive|Feature:[^\]]+|Flaky)\]'
       - name: E2E_PARALLEL
         value: '1'
       command: ["/run_e2e.sh"]
@@ -76,6 +76,8 @@ data:
       - mountPath: /tmp/results
         name: results
         readOnly: false
+      tolerations:
+        - operator: "Exists"
   systemd-logs.yaml: |
     sonobuoy-config:
       driver: DaemonSet
@@ -131,7 +133,7 @@ spec:
       valueFrom:
         fieldRef:
           fieldPath: status.podIP
-    image: gcr.io/heptio-images/sonobuoy:v0.11.4
+    image: gcr.io/heptio-images/sonobuoy:v0.12.0
     imagePullPolicy: Always
     name: kube-sonobuoy
     volumeMounts:

diff --git a/src/initramfs/cmd/init/pkg/constants/constants.go b/src/initramfs/cmd/init/pkg/constants/constants.go
@@ -59,6 +59,17 @@ const (
 	// is not the initial node.
 	KubeadmInitTypeDependent = "dependent"
 
+	// KubernetesImage is the hyperkube image to use for the control plane.
+	KubernetesImage = "gcr.io/google_containers/hyperkube:v1.12.1"
+
+	// DockerImage is the docker image to use as the container runtime for
+	// Kubernetes.
+	DockerImage = "docker.io/library/docker:18.06.1-ce-dind"
+
+	// CRIOImage is the cri-o image to use as the container runtime for
+	// Kubernetes.
+	CRIOImage = "docker.io/autonomy/cri-o:latest"
+
 	// UserDataPath is the path to the downloaded user data.
 	UserDataPath = "/var/run/userdata.yaml"
 )

diff --git a/src/initramfs/cmd/init/pkg/system/services/crt.go b/src/initramfs/cmd/init/pkg/system/services/crt.go
@@ -98,7 +98,7 @@ func (c *CRT) Start(data *userdata.UserData) error {
 
 	switch data.Services.Kubeadm.ContainerRuntime {
 	case constants.ContainerRuntimeDocker:
-		image = "docker.io/library/docker:17.03-dind"
+		image = constants.DockerImage
 		args = runner.Args{
 			ID: c.ID(data),
 			ProcessArgs: []string{"dockerd",
@@ -114,10 +114,6 @@ func (c *CRT) Start(data *userdata.UserData) error {
 			},
 		}
 		dockerMounts := []specs.Mount{
-			// Since /var/run is not a symlink to /run in the docker image, we
-			// must mount /run to /var/run and /run in order to expose the
-			// docker socket and /run/<cni plugin> (e.g. /run/flannel).
-			{Type: "bind", Destination: "/var/run", Source: "/run", Options: []string{"rbind", "rshared", "rw"}},
 			{Type: "bind", Destination: "/var/lib/docker", Source: "/var/lib/docker", Options: []string{"rbind", "rshared", "rw"}},
 		}
 		mounts = append(mounts, dockerMounts...)
@@ -126,7 +122,7 @@ func (c *CRT) Start(data *userdata.UserData) error {
 		// TODO(andrewrynhard): We should use
 		// registry.centos.org/projectatomic/cri-o:latest, but a 403 is returned
 		// with attempting to pull the image.
-		image = "docker.io/autonomy/cri-o:latest"
+		image = constants.CRIOImage
 		args = runner.Args{
 			ID: c.ID(data),
 			ProcessArgs: []string{

diff --git a/src/initramfs/cmd/init/pkg/system/services/kubeadm.go b/src/initramfs/cmd/init/pkg/system/services/kubeadm.go
@@ -37,7 +37,7 @@ cd /etc/kubernetes
 apt-get update -y
 apt-get install -y curl
 
-curl -L https://download.docker.com/linux/static/stable/x86_64/docker-17.03.2-ce.tgz | tar -xz --strip-components=1 -C /bin docker/docker
+curl -L https://download.docker.com/linux/static/stable/x86_64/docker-18.06.1-ce.tgz | tar -xz --strip-components=1 -C /bin docker/docker
 chmod +x /bin/docker
 
 trap 'kubeadm reset --force' ERR
@@ -191,7 +191,7 @@ func (k *Kubeadm) Start(data *userdata.UserData) error {
 	if data.Services.Kubeadm != nil && data.Services.Kubeadm.Image != "" {
 		image = data.Services.Kubeadm.Image
 	} else {
-		image = "gcr.io/google_containers/hyperkube:v1.11.2"
+		image = constants.KubernetesImage
 	}
 
 	// Set the process arguments.

diff --git a/src/initramfs/cmd/init/pkg/system/services/kubelet.go b/src/initramfs/cmd/init/pkg/system/services/kubelet.go
@@ -70,7 +70,7 @@ func (k *Kubelet) Start(data *userdata.UserData) error {
 	if data.Services.Kubelet != nil && data.Services.Kubelet.Image != "" {
 		image = data.Services.Kubelet.Image
 	} else {
-		image = "gcr.io/google_containers/hyperkube:v1.11.2"
+		image = constants.KubernetesImage
 	}
 
 	// Set the process arguments.

diff --git a/src/initramfs/cmd/osd/pkg/reg/reg.go b/src/initramfs/cmd/osd/pkg/reg/reg.go
@@ -152,7 +152,7 @@ func (r *Registrator) Reset(ctx context.Context, in *empty.Empty) (reply *proto.
 	if r.Data.Services.Kubeadm != nil && r.Data.Services.Kubeadm.Image != "" {
 		image = r.Data.Services.Kubeadm.Image
 	} else {
-		image = "gcr.io/google_containers/hyperkube:v1.11.2"
+		image = constants.KubernetesImage
 	}
 
 	// Set the process arguments.

diff --git a/src/initramfs/cmd/osd/proto/api.pb.go b/src/initramfs/cmd/osd/proto/api.pb.go