Skip to content
This repository was archived by the owner on Feb 22, 2022. It is now read-only.

[stable/weave-cloud] sync with upstream #1804

Merged
lachie83 merged 1 commit into from
Aug 23, 2017
Merged

[stable/weave-cloud] sync with upstream #1804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions stable/weave-cloud/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: weave-cloud
version: 0.1.0
version: 0.1.1
description: |
Weave Cloud Agents

Weave Cloud is a add-on to Kubernetes which provides Continuous Delivery, along with hosted Prometheus Monitoring and a visual dashboard for exploring & debugging microservices
home: https://weave.works
maintainers:
Expand Down
6 changes: 3 additions & 3 deletions stable/weave-cloud/templates/cortex.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ items:
- '-config.file=/etc/prometheus/prometheus.yml'
- '-web.listen-address=:8080'
- '-storage.local.engine=none'
image: 'prom/prometheus:v1.6.3'
image: 'prom/prometheus:v1.7.1'
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
Expand Down Expand Up @@ -130,7 +130,7 @@ items:
serviceAccountName: weave-cortex
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
operator: Exists
Copy link
Contributor

@lachie83 lachie83 Aug 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you still need the key here?

Copy link
Contributor Author

@errordeveloper errordeveloper Aug 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. Unfortunatelly the docs don't cover this, but it's clear from code comments:

// The matching follows the rules below:
// (1) Empty toleration.effect means to match all taint effects,
//     otherwise taint effect must equal to toleration.effect.
// (2) If toleration.operator is 'Exists', it means to match all taint values.
// (3) Empty toleration.key means to match all taint keys.
//     If toleration.key is empty, toleration.operator must be 'Exists';
//     this combination means to match all taint values and all taint keys.

Copy link
Contributor

@lachie83 lachie83 Aug 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow. Now I'm really confused. I'm going to make it a point to update the docs.

updateStrategy:
type: RollingUpdate
- apiVersion: v1
Expand All @@ -149,7 +149,7 @@ items:
remote_write:
- url: 'https://cloud.weave.works/api/prom/push'
basic_auth:
password: '{{ .Values.ServiceToken }}'
password: '{{.Values.ServiceToken}}'
scrape_configs:
- job_name: kubernetes-service-endpoints
kubernetes_sd_configs:
Expand Down
4 changes: 2 additions & 2 deletions stable/weave-cloud/templates/flux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ items:
containers:
- name: agent
args:
- '--token={{ .Values.ServiceToken }}'
image: 'quay.io/weaveworks/fluxd:0.2.0'
- '--token={{.Values.ServiceToken}}'
image: 'quay.io/weaveworks/fluxd:0.3.0'
imagePullPolicy: IfNotPresent
serviceAccountName: weave-flux
11 changes: 8 additions & 3 deletions stable/weave-cloud/templates/scope.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ items:
- '--probe.docker.bridge=docker0'
- '--probe.docker=true'
- '--probe.kubernetes=true'
- '--service-token={{ .Values.ServiceToken }}'
image: 'weaveworks/scope:1.4.0'
- '--service-token={{.Values.ServiceToken}}'
image: 'weaveworks/scope:1.6.2'
imagePullPolicy: IfNotPresent
securityContext:
privileged: true
Expand All @@ -73,18 +73,23 @@ items:
mountPath: /var/run/docker.sock
- name: scope-plugins
mountPath: /var/run/scope/plugins
- name: sys-kernel-debug
mountPath: /sys/kernel/debug
hostNetwork: true
hostPID: true
serviceAccountName: weave-scope
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
operator: Exists
volumes:
- name: docker-socket
hostPath:
path: /var/run/docker.sock
- name: scope-plugins
hostPath:
path: /var/run/scope/plugins
- name: sys-kernel-debug
hostPath:
path: /sys/kernel/debug
updateStrategy:
type: RollingUpdate