Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Commit

Permalink
Update to latest launch generator output
Browse files Browse the repository at this point in the history 
stripped of annotations preserved here to show version and args:

        cloud.weave.works/launcher-info: |-
          {
            "server-version": "master-050965d",
            "original-request": {
              "url": "/k8s/v1.5/net?weavedb-hostpath=/var/lib/weave&version=latest",
              "date": "Thu May 25 2017 13:16:43 GMT+0000 (UTC)"
            },
            "email-address": "[email protected]"
          }
  • Loading branch information
@bboreham
bboreham committed May 25, 2017
1 parent ba74c7d commit 170ab1c
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 60 deletions.
71 changes: 36 additions & 35 deletions prog/weave-kube/weave-daemonset-k8s-1.6.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
apiVersion: v1
kind: List
items:
- metadata:
- apiVersion: v1
kind: ServiceAccount
metadata:
name: weave-net
labels:
name: weave-net
- apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
name: weave-net
apiVersion: v1
kind: ServiceAccount
- metadata:
labels:
name: weave-net
name: weave-net
rules:
- apiGroups:
- ''
Expand All @@ -30,48 +32,50 @@ items:
- get
- list
- watch
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
- metadata:
- apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: weave-net
labels:
name: weave-net
name: weave-net
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: weave-net
apiGroup: rbac.authorization.k8s.io
subjects:
- kind: ServiceAccount
name: weave-net
namespace: kube-system
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
- metadata:
- apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: weave-net
labels:
name: weave-net
name: weave-net
spec:
template:
metadata:
labels:
name: weave-net
spec:
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
containers:
- name: weave
image: 'weaveworks/weave-kube:latest'
imagePullPolicy: Always
command:
- /home/weave/launch.sh
env: []
image: 'weaveworks/weave-kube:latest'
imagePullPolicy: Always
livenessProbe:
initialDelaySeconds: 30
httpGet:
host: 127.0.0.1
path: /status
port: 6784
initialDelaySeconds: 30
resources:
requests:
cpu: 10m
securityContext:
privileged: true
volumeMounts:
- name: weavedb
mountPath: /weavedb
Expand All @@ -85,11 +89,6 @@ items:
mountPath: /host/var/lib/dbus
- name: lib-modules
mountPath: /lib/modules
resources:
requests:
cpu: 10m
securityContext:
privileged: true
- name: weave-npc
image: 'weaveworks/weave-npc:latest'
imagePullPolicy: Always
Expand All @@ -98,9 +97,20 @@ items:
cpu: 10m
securityContext:
privileged: true
hostNetwork: true
hostPID: true
restartPolicy: Always
securityContext:
seLinuxOptions:
type: spc_t
serviceAccountName: weave-net
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
volumes:
- name: weavedb
emptyDir: {}
hostPath:
path: /var/lib/weave
- name: cni-bin
hostPath:
path: /opt
Expand All @@ -116,12 +126,3 @@ items:
- name: lib-modules
hostPath:
path: /lib/modules
hostPID: true
hostNetwork: true
serviceAccountName: weave-net
restartPolicy: Always
securityContext:
seLinuxOptions:
type: spc_t
apiVersion: extensions/v1beta1
kind: DaemonSet
51 changes: 26 additions & 25 deletions prog/weave-kube/weave-daemonset.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,45 @@
apiVersion: v1
kind: List
items:
- metadata:
- apiVersion: v1
kind: ServiceAccount
metadata:
name: weave-net
labels:
name: weave-net
- apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: weave-net
apiVersion: v1
kind: ServiceAccount
- metadata:
labels:
name: weave-net
name: weave-net
spec:
template:
metadata:
labels:
name: weave-net
annotations:
scheduler.alpha.kubernetes.io/tolerations: >-
[{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"}]
labels:
name: weave-net
spec:
containers:
- name: weave
image: 'weaveworks/weave-kube:latest'
imagePullPolicy: Always
command:
- /home/weave/launch.sh
env: []
image: 'weaveworks/weave-kube:latest'
imagePullPolicy: Always
livenessProbe:
initialDelaySeconds: 30
httpGet:
host: 127.0.0.1
path: /status
port: 6784
initialDelaySeconds: 30
resources:
requests:
cpu: 10m
securityContext:
privileged: true
volumeMounts:
- name: weavedb
mountPath: /weavedb
Expand All @@ -46,11 +53,6 @@ items:
mountPath: /host/var/lib/dbus
- name: lib-modules
mountPath: /lib/modules
resources:
requests:
cpu: 10m
securityContext:
privileged: true
- name: weave-npc
image: 'weaveworks/weave-npc:latest'
imagePullPolicy: Always
Expand All @@ -59,9 +61,17 @@ items:
cpu: 10m
securityContext:
privileged: true
hostNetwork: true
hostPID: true
restartPolicy: Always
securityContext:
seLinuxOptions:
type: spc_t
serviceAccountName: weave-net
volumes:
- name: weavedb
emptyDir: {}
hostPath:
path: /var/lib/weave
- name: cni-bin
hostPath:
path: /opt
Expand All @@ -77,12 +87,3 @@ items:
- name: lib-modules
hostPath:
path: /lib/modules
hostPID: true
hostNetwork: true
serviceAccountName: weave-net
restartPolicy: Always
securityContext:
seLinuxOptions:
type: spc_t
apiVersion: extensions/v1beta1
kind: DaemonSet

0 comments on commit 170ab1c

Please sign in to comment.