Commit Graph

5852 Commits

Author SHA1 Message Date
Bryan Boreham
f800f6457b Use const for host topology name 2021-05-18 14:08:45 +00:00
Bryan Boreham
c6def0a92b refactor: add a generic MergeActiveControls method
Use this instead of hard-coded knowledge about expected
controls and counts when merging host topology.
2021-05-18 14:07:35 +00:00
Bryan Boreham
dacfd66e4d cosmetic: remove trailing space 2021-05-17 17:37:15 +00:00
Deepak
c3cd3afad9 probe: merge controls from different probes
This change creates a host topology from cluster-wide probe using
kubernetes nodes with cordon/un-cordon control. This also adds the
logic to merge the controls coming from different probes for host
topology.
2021-04-19 00:10:52 +05:30
Deepak
ee9ffbff60 Merge branch 'master' into 3810-cordon-control 2021-04-15 23:27:33 +05:30
Bryan Boreham
082ab61946 Merge pull request #3844 from dholbach/security-updates
update dependencies
2021-04-14 15:08:46 +01:00
Daniel Holbach
e4c4b2b52f update dependencies
update y18n, elliptic, ini, args-parser
	run "yarn-deduplicate"
2021-04-12 10:40:38 +02:00
Deepak
5f0a605643 sync with master 2021-04-10 17:38:13 +05:30
Bryan Boreham
053afd5689 Merge pull request #3843 from weaveworks/release-1.13
Release 1.13.2
2021-04-09 11:15:32 +01:00
Bryan Boreham
0e1d3f84d9 Release 1.13.2 v1.13.2 2021-04-09 09:46:09 +00:00
Bryan Boreham
189789ecb2 Skip rebuilding UI assets in deploy step 2021-04-07 10:37:54 +00:00
Bryan Boreham
f0b4094a6b Merge pull request #3841 from weaveworks/aws-cli-docker
Run AWS CLI from a container image
2021-04-07 11:15:03 +01:00
Bryan Boreham
85770038a2 Run AWS CLI from a container image
So we don't have to install it, or Python.
Need to run in 'machine' executor on CircleCI so we can mount
volumes into the Docker command.
2021-04-07 10:12:45 +00:00
Bryan Boreham
2b9a7a0ce7 Add missing vendor'd files 2021-04-07 09:28:35 +00:00
Bryan Boreham
02ba646a6e Merge pull request #3833 from weaveworks/build-updates
Update build tools including Go 1.16.2
2021-04-06 14:37:17 +01:00
Bryan Boreham
f405eee0f7 Update go.mod directive to 1.16
See docs at https://golang.org/ref/mod#go-mod-file-go

The expected benefit from making this change is that the vendor
directory will be used automatically, including tests.
2021-04-06 10:26:21 +00:00
Bryan Boreham
1da160f671 Update Weave Net dependency to 2.8.1
2.1.3 is very old, and seems to be failing the build
2021-04-04 14:14:11 +01:00
Bryan Boreham
f41b90a7d8 Clean up 'import' ordering 2021-04-04 13:47:27 +01:00
Bryan Boreham
71c16505f1 Ran 'go mod tidy' 2021-04-04 13:47:20 +01:00
Bryan Boreham
2cf48f2bdd Don't call Fatal() on background thread in test
It doesn't fail the test
2021-04-04 13:46:58 +01:00
Bryan Boreham
2ddcd9c067 Add quotes required by shellcheck 2021-04-04 13:45:05 +01:00
Bryan Boreham
28319e3f49 Use build image from this branch in CI 2021-04-04 13:45:05 +01:00
Bryan Boreham
1cd32cd3ac Add 'osusergo' tag
Avoids warnings like "Using 'getgrouplist' in statically linked
applications requires at runtime the shared libraries from the glibc
version used for linking"
2021-04-04 13:45:05 +01:00
Bryan Boreham
ca9e28e730 Update GOSHOUT package used in example 2021-04-04 13:45:05 +01:00
Bryan Boreham
b321f1c1e3 Simplify Go cross-compile settings
We only want to force CGO_ENABLED when cross-compiling for arm;
it is on by default for native linux compilation and off by default
for darwin cross-compilation.
2021-04-04 13:45:05 +01:00
Bryan Boreham
0d0ccd989b Remove 'demo.json' file, not used in Scope 2021-04-04 13:45:05 +01:00
Bryan Boreham
825a278ea5 Move codecgen exe inside build_in_container
It calls 'go', which may not be present outside the build container
2021-04-04 13:45:05 +01:00
Bryan Boreham
3c4adb6ed8 Remove unused 'deps' tools
gvt replaced by Go modules; github-release not used in CI
2021-04-04 13:45:05 +01:00
Bryan Boreham
da81514209 Update Go compiler to 1.16.2 2021-04-04 13:45:05 +01:00
Bryan Boreham
c2578b6fb7 Move 'esc' tool out of image into vendor'd source
Smaller that way, and more consistent

(Note we run it with GC enabled; it crashes in CI otherwise)
2021-04-04 13:45:05 +01:00
Bryan Boreham
c1514219e8 exclude more from lint 2021-04-04 13:45:05 +01:00
Bryan Boreham
a2a63f8660 Stop installing Python in build container
Scope itself doesn't have any Python code.

Disable Python test scheduler in CI
 - we set parallelism=1 so no point scheduling
2021-04-04 11:16:13 +01:00
Bryan Boreham
29b954d0cb Stop creating a NodeJS build image
All it does is set some environment variables so just set those on the command-line
2021-04-04 11:16:13 +01:00
Bryan Boreham
440892516f Set HOME for build containers
Otherwise it's blank on Apple M1 platform (at least) and builds fail

Now we have to git-ignore .yarnrc file, which is created in the HOME dir.
2021-04-04 11:16:13 +01:00
Bryan Boreham
894f35e52a Mount Go build cache from host
This speeds up subsequent compilations
2021-04-04 11:16:13 +01:00
Bryan Boreham
4a670856e5 Tell Docker to optimise build mounts
'delegated' says the container side is in charge, and Docker doesn't have to work hard to keep the host in sync

'z' is needed for SELinux
2021-04-04 11:16:13 +01:00
Bryan Boreham
d1129c41ae Refactor Makefile: extract repeated docker command
The command and arguments for yarn runs was repeated many times.
2021-04-04 11:16:13 +01:00
Bryan Boreham
833f947fb3 Run Go build as current user via -u flag
Remove complicated workaround in build.sh
2021-04-04 11:16:13 +01:00
Juan Calderon-Perez
69dd8853c4 Update alpine base image to 3.13 (#3838)
* Bump alpine to 3.13.2
2021-03-17 13:25:04 +00:00
Bryan Boreham
e29f474bb8 Merge pull request #3834 from Kielek/fix-build
Remove obsolete dependency github.com/fatih/hclfmt
2021-03-17 10:22:37 +00:00
Bryan Boreham
86add9a196 Merge pull request #3836 from weaveworks/no-controls-faq
Update faq.md - fix read-only mode gotcha
2021-03-17 09:37:10 +00:00
Kingdon Barrett
05596a9059 Update faq.md
* use double dashes for consistency
* fixup - says "set it to false", should be "true"
* fixup - the deployment and the daemonset both need this setting

Signed-off-by: Kingdon Barrett <kingdon@weave.works>
2021-03-09 09:10:33 -05:00
Piotr Kiełkowicz
8ce4743cb0 github.com/fatih/hclfmt was archived. Technically there is a possibility to fork (or used another forked version) to executle hclfmt.
But it leads to another issues - problems with importing https://github.com/hashicorp/hcl/hcl/printers. HCL was released in version 2 so that the file structure was changes.
I do not see any way to install it in changed Makefile. Go installs does not support pining to given tags so that always the newest version is installed.

For now, the impact on build process should be minimal. it is used only in ./tools/lint/lint() method. I was able to execute it locally without executing hclfmt.
2021-03-03 11:06:33 +01:00
Bryan Boreham
6d95f31883 Merge pull request #3831 from Kielek/update-lodash
fix CVE-2020-8203 (lodash vulnerability)
2021-02-10 13:29:13 +00:00
Piotr Kiełkowicz
4628ff8d54 fix CVE-2020-8203 (lodash vulnerability) 2021-02-10 09:15:20 +01:00
Daniel Holbach
8f116e9fdb Merge pull request #3828 from weaveworks/mention-coc
point out CoC more clearly
2021-02-08 14:26:09 +01:00
Daniel Holbach
aadad19dd9 point out CoC more clearly
Signed-off-by: Daniel Holbach <daniel@weave.works>
2021-02-08 14:11:06 +01:00
Bryan Boreham
084a1b9a90 Merge pull request #3827 from weaveworks/k8s-node-name
Set hostname to Kubernetes node name
2021-02-06 11:16:11 +00:00
Bryan Boreham
c86021ec05 Stop shellcheck warning on 'echo -v'
Non-portability is unlikely to be a problem
2021-01-30 15:37:56 +00:00
Bryan Boreham
cb032b00de Set hostname to Kubernetes node name
This will allow the app to match up data from node and cluster probes
2021-01-30 15:08:48 +00:00