Merge pull request #299 from weaveworks/298-update-k8st-manifests-that-have

Update manifests from v1beta1 -> v1

Author: bboreham

.circleci/config.yml

@@ -26,14 +26,14 @@ job_environment_v1_14_2: &job_environment_v1_14_2
     CHANGE_MINIKUBE_NONE_USER: true
     KUBE_SERVER_VERSION: echo v1.14.2
     KUBECTL_VERSION: echo v1.14.2
-    MINIKUBE_VERSION: echo latest
+    MINIKUBE_VERSION: echo v1.2.0
 
 job_environment_vstable: &job_environment_vstable
   environment:
     CHANGE_MINIKUBE_NONE_USER: true
     KUBE_SERVER_VERSION: curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt
     KUBECTL_VERSION: curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt
-    MINIKUBE_VERSION: echo latest
+    MINIKUBE_VERSION: echo v1.2.0
 
 workflow_job_defaults: &workflow_job_defaults
   requires:

Gopkg.lock

@@ -95,8 +95,3 @@ branch = "release-1.11"
 [[constraint]]
   name = "github.com/prometheus/client_golang"
   version = "v0.9.0-pre1"
-
-[[constraint]]
-  name = "github.com/dlespiau/kube-test-harness"
-  revision = "6dfa02a8c9926e2caffa14aa405dd699363bd9d3"
-

Gopkg.toml

@@ -1 +1 @@
-KUBECTL_VERSION=v1.11.10
+KUBECTL_VERSION=v1.13.11

docker/kubectl.version

@@ -43,7 +43,7 @@ items:
     metadata:
       name: flux-git-deploy
     type: Opaque
-  - apiVersion: apps/v1beta1
+  - apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: weave-flux-memcached
@@ -54,6 +54,12 @@ items:
         weave-flux-component: memcached
     spec:
       replicas: 1
+      selector:
+        matchLabels:
+          name: weave-flux-memcached
+          app: weave-flux
+          weave-cloud-component: flux
+          weave-flux-component: memcached
       template:
         metadata:
           annotations:
@@ -93,7 +99,7 @@ items:
         app: weave-flux
         weave-cloud-component: flux
         weave-flux-component: memcached
-  - apiVersion: apps/v1beta1
+  - apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: weave-flux-agent
@@ -104,6 +110,12 @@ items:
         weave-flux-component: agent
     spec:
       replicas: 1
+      selector:
+        matchLabels:
+          name: weave-flux-agent
+          app: weave-flux
+          weave-cloud-component: flux
+          weave-flux-component: agent
       strategy:
         type: Recreate
       template:
@@ -172,7 +184,7 @@ items:
       - kind: ServiceAccount
         name: weave-scope
         namespace: kube-system
-  - apiVersion: extensions/v1beta1
+  - apiVersion: apps/v1
     kind: DaemonSet
     metadata:
       name: weave-scope-agent
@@ -182,6 +194,12 @@ items:
         weave-cloud-component: scope
         weave-scope-component: agent
     spec:
+      selector:
+        matchLabels:
+          name: weave-scope-agent
+          app: weave-scope
+          weave-cloud-component: scope
+          weave-scope-component: agent
       template:
         metadata:
           labels:
@@ -265,7 +283,7 @@ items:
       - kind: ServiceAccount
         name: weave-cortex
         namespace: kube-system
-  - apiVersion: apps/v1beta1
+  - apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: weave-cortex-agent
@@ -276,6 +294,12 @@ items:
         weave-cortex-component: agent
     spec:
       replicas: 1
+      selector:
+        matchLabels:
+          name: weave-cortex-agent
+          app: weave-cortex
+          weave-cloud-component: cortex
+          weave-cortex-component: agent
       template:
         metadata:
           annotations:
@@ -305,7 +329,7 @@ items:
             - name: agent-config-volume
               configMap:
                 name: weave-cortex-agent-config
-  - apiVersion: extensions/v1beta1
+  - apiVersion: apps/v1
     kind: DaemonSet
     metadata:
       name: weave-cortex-node-exporter
@@ -315,6 +339,12 @@ items:
         weave-cloud-component: cortex
         weave-cortex-component: node-exporter
     spec:
+      selector:
+        matchLabels:
+          name: weave-cortex-node-exporter
+          app: weave-cortex
+          weave-cloud-component: cortex
+          weave-cortex-component: node-exporter
       template:
         metadata:
           annotations:
@@ -342,7 +372,7 @@ items:
               operator: Exists
       updateStrategy:
         type: RollingUpdate
-  - apiVersion: apps/v1beta1
+  - apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: weave-cortex-state-metrics
@@ -353,6 +383,12 @@ items:
         weave-cortex-component: state-metrics
     spec:
       replicas: 1
+      selector:
+        matchLabels:
+          name: weave-cortex-state-metrics
+          app: weave-cortex
+          weave-cloud-component: cortex
+          weave-cortex-component: state-metrics
       template:
         metadata:
           annotations:

integration-tests/k8s/k8s-kube-system.yaml.in

@@ -71,6 +71,8 @@ run_self_update_test () {
     echo "• Check the agent updated correctly"
     if [[ $(kubectl get pods -n weave -l name=weave-agent -o jsonpath="{.items[0].metadata.labels.newLabel}") != "foo" ]]; then
         echo "Failed to self update. Label newLabel=foo does not exist."
+        echo "Logs from weave-agent pods:"
+        kubectl logs -n weave -l name=weave-agent
         exit 1
     fi
 }

integration-tests/tests/install-update-flow.sh

@@ -42,13 +42,16 @@ items:
       - kind: ServiceAccount
         name: weave-agent
         namespace: weave
-  - apiVersion: apps/v1beta1
+  - apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: weave-agent
       namespace: weave
     spec:
       replicas: 1
+      selector:
+        matchLabels:
+          name: weave-agent
       # Wait 30 seconds to see if new version crashes before rolling next pod
       minReadySeconds: 30
       # Rolling update with 1 new instance added before removing any old instances