Commit Graph
3431 Commits
Author SHA1 Message Date
Alban Crequy cf507de619 integration/gce.sh: allow PROJECT override 2017-02-21 17:19:19 +01:00
Alban Crequy e031728b04 bin/setup-circleci-secrets: possibly use generic credentials
If the $SECRET_SCRIPT environment variable is defined in CircleCI, this
can override the GCE credentials.

I now use "base64" instead of "openssl base64" in order to support long
lines in base64 text. It's useful when the text comes from a long
environment variable like $SECRET_SCRIPT defined in CircleCI.

Also, the $PROJECT environment variable can now override the GCE project
name. Before, it needed to be named scope-integration-tests.

This was initially merged in https://github.com/weaveworks/scope/pull/2223
Then, reverted in https://github.com/weaveworks/scope/pull/2229

Since then, it has the following fixes:

 1. fix shell "unbound variable"

Since this shell script uses "set -u", we must not use unset variables
directly.

Symptoms:
> https://circleci.com/gh/weaveworks/scope/6384
> bin/setup-circleci-secrets: line 10: SECRET_SCRIPT: unbound variable

Instead, we should use the parameter expansion "+" to test if the
variable is set. See:
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02

 2. return value of read

I use the builtin "read" and this returns a non-zero value when reading
until EOF. I use "|| true" to accept that.
2017-02-21 17:19:18 +01:00
Alessandro Puccetti d1f5fcaaec Merge commit '6a1af9ac0e65098e0b4e914ce451f6bd1e659f60' into alessandro/integration-fix 2017-02-21 16:55:24 +01:00
Alessandro Puccetti 6a1af9ac0e Squashed 'tools/' changes from a3b18bf..52d695c
52d695c Merge pull request #77 from kinvolk/schu/fix-relative-weave-path
77aed01 Merge pull request #73 from weaveworks/mike/sched/fix-unicode-issue
7c080f4 integration/sanity_check: disable SC1090
d6d360a integration/gce.sh: update gcloud command
e8def2c provisioning/setup: fix shellcheck SC2140
cc02224 integration/config: fix weave path
9c0d6a5 Fix config_management/README.md
334708c Merge pull request #75 from kinvolk/alban/external-build-1
da2505d gce.sh: template: print creation date
e676854 integration tests: fix user account
8530836 host nameing: add repo name
b556c0a gce.sh: fix deletion of gce instances
2ecd1c2 integration: fix GCE --zones/--zone parameter
3e863df sched: Fix unicode encoding issues
51785b5 Use rm -f and set current dir using BASH_SOURCE.
f5c6d68 Merge pull request #71 from kinvolk/schu/fix-linter-warnings
0269628 Document requirement for `lint_sh`
9a3f09e Fix linter warnings
efcf9d2 Merge pull request #53 from weaveworks/2647-testing-mvp
d31ea57 Weave Kube playbook now works with multiple nodes.
27868dd Add GCP firewall rule for FastDP crypto.
edc8bb3 Differentiated name of dev and test playbooks, to avoid confusion.
efa3df7 Moved utility Ansible Yaml to library directory.
fcd2769 Add shorthands to run Ansible playbooks against Terraform-provisioned virtual machines.
f7946fb Add shorthands to SSH into Terraform-provisioned virtual machines.
aad5c6f Mention Terraform and Ansible in README.md.
dddabf0 Add Terraform output required for templates' creation.
dcc7d02 Add Ansible configuration playbooks for development environments.
f86481c Add Ansible configuration playbooks for Docker, K8S and Weave-Net.
efedd25 Git-ignore Ansible retry files.
765c4ca Add helper functions to setup Terraform programmatically.
801dd1d Add Terraform cloud provisioning scripts.
b8017e1 Install hclfmt on CircleCI.
4815e19 Git-ignore Terraform state files.
0aaebc7 Add script to generate cartesian product of dependencies of cross-version testing.
007d90a Add script to list OS images from GCP, AWS and DO.
ca65cc0 Add script to list relevant versions of Go, Docker and Kubernetes.
aa66f44 Scripts now source dependencies using absolute path (previously breaking make depending on current directory).
7865e86 Add -p option to parallelise lint.
36c1835 Merge pull request #69 from weaveworks/mflag
9857568 Use mflag and mflagext package from weaveworks/common.
9799112 Quote bash variable.
10a36b3 Merge pull request #67 from weaveworks/shfmt-ignore
a59884f Add support for .lintignore.
03cc598 Don't lint generated protobuf code.
2b55c2d Merge pull request #66 from weaveworks/reduce-test-timeout
d4e163c Make timeout a flag
49a8609 Reduce test timeout
8fa15cb Merge pull request #63 from weaveworks/test-defaults
b783528 Tweak test script so it can be run on a mca

git-subtree-dir: tools
git-subtree-split: 52d695cc629c524ff17eb06e2de12d78701919c9
2017-02-21 16:55:24 +01:00
Jordan Pellizzari 341446fa93 Merge pull request #2237 from weaveworks/change-instance
Add logic to remove non-transferrable state when switching Cloud instances
2017-02-20 10:47:45 -08:00
jpellizzari 3d13e916af Added logic to remove non-transferrable state keys when switching Cloud instances 2017-02-20 10:28:01 -08:00
Jordan Pellizzari 3e810f76e7 Merge pull request #2260 from weaveworks/2236-csrf-token
Consolidate API requests into single helper; added CSRF header
2017-02-20 10:21:51 -08:00
Jordan Pellizzari 0a99d04b4b Consolidated API requests into single helper; added CSRF header 2017-02-20 09:34:18 -08:00
Filip Barl b5813a2551 Merge pull request #2244 from weaveworks/uncontained-filtering-fix
Fix filtering out uncontained nodes in DNS view
2017-02-20 12:16:59 +01:00
Filip Barl 2e9255b190 Addressed the comments and fixed the tests. 2017-02-20 11:40:40 +01:00
Filip Barl f1904a626f Fix filtering issue for uncontained nodes in DNS name view (#2170). 2017-02-20 11:38:21 +01:00
Filip Barl 76fec79ad5 Merge pull request #2221 from weaveworks/layout-rendering-dynamic-optimizations
Layout rendering dynamic optimizations
2017-02-20 11:35:09 +01:00
Filip Barl e5c655aa88 Addressed the comments. 2017-02-20 11:10:44 +01:00
Filip Barl 6d0066cd38 Polished the selectors code and fixed failing tests. 2017-02-20 10:58:26 +01:00
Filip Barl b9ba83ffca Moved the node networks computation to selectors. 2017-02-20 10:58:26 +01:00
Filip Barl 5bd8e8f690 Renamed 'subLabel' to 'labelMinor' and removed 'node_count' property. 2017-02-20 10:58:26 +01:00
Filip Barl 3987e95465 Moved the node layout metrics computation to selectors. 2017-02-20 10:58:26 +01:00
Filip Barl 2a54085c62 Node transformations done from NodeContainer. Put node searching logic in selectors. 2017-02-20 10:58:26 +01:00
Jordan Pellizzari a07d01b07c Merge pull request #2232 from weaveworks/1804-loading-topologies
Show loading indicator on topology changes
2017-02-19 18:52:08 -08:00
Jordan Pellizzari 037fc67a65 Merge pull request #2250 from weaveworks/release-1.2
Release 1.2.1
2017-02-16 11:33:32 -08:00
jpellizzari a470704b73 Change to release script tag check to numeric equality 2017-02-16 10:34:33 -08:00
jpellizzari 42e6360c46 Docs update with new version 2017-02-16 10:34:33 -08:00
jpellizzari 7420fb16f9 Release 1.2.1 CHANGELOG updates 2017-02-16 10:33:06 -08:00
Alfonso Acosta 9a507cc60d Merge pull request #2251 from weaveworks/revert-2249-revert-2238-docs-update-new-branch
Revert "Revert "update cloud description and small edits""
2017-02-15 20:27:44 +01:00
Alfonso Acosta 49b90ec483 Revert "Revert "update cloud description and small edits"" 2017-02-15 20:13:03 +01:00
Anita Buehrle 07aaef655d Merge pull request #2249 from weaveworks/revert-2238-docs-update-new-branch
something got crossed am remerging these changes
2017-02-15 12:45:25 -06:00
Anita Buehrle 014192e7b5 Revert "update cloud description and small edits" 2017-02-15 12:25:32 -06:00
Anita Buehrle c80ecc07e0 Merge pull request #2248 from weaveworks/docs-update-new-branch
cloud token image
2017-02-15 12:17:20 -06:00
abuehrle ee76dc9b6d cloud token image 2017-02-15 11:52:13 -06:00
Alfonso Acosta 7cee0715fd Merge pull request #2238 from weaveworks/docs-update-new-branch
update cloud description and small edits
2017-02-15 17:48:36 +01:00
abuehrle ccaf321d41 weave cloud token consistency 2017-02-15 10:36:01 -06:00
Jordan Pellizzari 58fa1c92ee Added clearNodes helper; Added initialNodes loaded to graph complexity check 2017-02-14 21:38:47 -08:00
abuehrle 920e1664b2 open new window punctuation 2017-02-14 14:42:59 -06:00
abuehrle 49af0dcbfd changed to pro link 2017-02-14 14:28:45 -06:00
abuehrle c24e497a36 added how to invite yourself to community slack 2017-02-14 14:14:05 -06:00
abuehrle a7fcb9f5b9 fix sentence 2017-02-14 14:02:18 -06:00
abuehrle b054bb3cdf update slack channel add meetup 2017-02-14 13:44:02 -06:00
jpellizzari c9048d8661 Revert "Merge pull request #2204 from weaveworks/contrast-as-component"
This reverts commit 68e8cbf4f6, reversing
changes made to 00408b84e8.

Reverts bug where contrast mode is showing by default
2017-02-14 10:59:34 -08:00
jpellizzari efb0d4dc03 Revert "Fix for contrast mode cache delete"
This reverts commit 80465c212f.
2017-02-14 10:52:51 -08:00
jpellizzari 80465c212f Fix for contrast mode cache delete 2017-02-14 10:25:07 -08:00
Jordan Pellizzari 68e8cbf4f6 Merge pull request #2204 from weaveworks/contrast-as-component
Added dynamic contrast-mode toggle
2017-02-14 09:54:23 -08:00
abuehrle 6f6de07716 update bullet point minor edits 2017-02-13 22:16:28 -06:00
Jordan Pellizzari 00408b84e8 Merge pull request #2230 from weaveworks/2227-search-help
Fix help menu not opening from 'search' hint
2017-02-13 11:14:07 -08:00
jpellizzari 404f0fc7b1 Show loading indicator on topology changes 2017-02-13 09:54:24 -08:00
jpellizzari 8e601ddfb3 Fixed bug where search help menu didn't open 2017-02-13 09:53:27 -08:00
jpellizzari 7b7d59ab24 Fix for undefined tableRowLabel 2017-02-13 09:53:27 -08:00
Jordan Pellizzari 7e0ccb4f7d Merge pull request #2202 from weaveworks/2154-api-url
Re-factor API URL generation code
2017-02-13 09:52:38 -08:00
jpellizzari 4e4848f3c4 Changed svg nodes to use contrastMode state 2017-02-13 09:49:55 -08:00
Jordan Pellizzari 63dc4e1b3e Added dynamic contrast-mode toggle 2017-02-13 09:49:55 -08:00
Alfonso Acosta cc59b4736e Merge pull request #2224 from weaveworks/fix-checkpoint-base-flags
Reintroduce probe checkpoint flags for kernel version and OS
2017-02-11 13:30:41 +01:00