From a0064f7535f7fd37610eadafb4a02433e8c3da53 Mon Sep 17 00:00:00 2001 From: Marc CARRE Date: Mon, 26 Jun 2017 17:48:24 +0100 Subject: [PATCH] Update YAMLs to be what the Launch Generator serves. See also: - https://github.com/weaveworks/launch-generator/issues/133 - https://github.com/weaveworks/launch-generator/pull/134 Command used: ``` $ curl -fsSo prog/weave-kube/weave-daemonset-k8s-1.6.yaml "http://localhost:8080/k8s/v1.6/net?v=latest" $ curl -fsSo prog/weave-kube/weave-daemonset.yaml "http://localhost:8080/k8s/v1.5/net?v=latest" ``` Annotations then removed. --- prog/weave-kube/weave-daemonset-k8s-1.6.yaml | 4 ++-- prog/weave-kube/weave-daemonset.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml b/prog/weave-kube/weave-daemonset-k8s-1.6.yaml index 8c7b569c..4944dc1e 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.6.yaml @@ -5,9 +5,9 @@ items: kind: ServiceAccount metadata: name: weave-net - namespace: kube-system labels: name: weave-net + namespace: kube-system - apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: @@ -51,9 +51,9 @@ items: kind: DaemonSet metadata: name: weave-net - namespace: kube-system labels: name: weave-net + namespace: kube-system spec: template: metadata: diff --git a/prog/weave-kube/weave-daemonset.yaml b/prog/weave-kube/weave-daemonset.yaml index fd245a24..543102a2 100644 --- a/prog/weave-kube/weave-daemonset.yaml +++ b/prog/weave-kube/weave-daemonset.yaml @@ -5,16 +5,16 @@ items: kind: ServiceAccount metadata: name: weave-net - namespace: kube-system labels: name: weave-net + namespace: kube-system - apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: weave-net - namespace: kube-system labels: name: weave-net + namespace: kube-system spec: template: metadata: