sync with master

Author: goku321

.circleci/config.yml

@@ -3,12 +3,16 @@ version: 2
 defaults: &defaults
   working_directory: /go/src/github.com/weaveworks/scope
   docker:
-    - image: weaveworks/scope-backend-build:master-22aa742b
+    - image: weaveworks/scope-backend-build:build-updates-1b1c9664
 
 client-defaults: &client-defaults
   working_directory: /home/weave/scope
   docker:
-    - image: weaveworks/scope-ui-build:master-bf6af9cf
+    - image: node:10.19
+  environment:
+      NPM_CONFIG_LOGLEVEL: warn
+      NPM_CONFIG_PROGRESS: false
+      XDG_CACHE_HOME: /home/weave/scope/.cache
 
 workflows:
   version: 2
@@ -51,7 +55,7 @@ jobs:
     parallelism: 1
     steps:
       - checkout
-      - run: COVERDIR=./coverage make BUILD_IN_CONTAINER=false CODECGEN_UID=23 tests
+      - run: COVERDIR=./coverage NO_SCHEDULER=t make BUILD_IN_CONTAINER=false CODECGEN_UID=23 tests
       - persist_to_workspace:
           root: .
           paths:
@@ -175,16 +179,17 @@ jobs:
           path: /tmp/artifacts
 
   deploy:
-    <<: *defaults
+    machine:
+      image: circleci/classic:201709-01
+    working_directory: /home/circleci/src/github.com/weaveworks/scope
     environment:
       IMAGES: scope cloud-agent
+      SCOPE_SKIP_UI_ASSETS: true
     steps:
       - checkout
-      - setup_remote_docker
       - attach_workspace:
           at: .
       - run: |
-          pip install awscli
           docker load -i scope.tar
           docker load -i cloud-agent.tar
       - run: |

.gitignore

@@ -64,6 +64,7 @@ prog/staticui/staticui.go
 prog/externalui/externalui.go
 client/build-pkg
 client/bundle
+client/.yarnrc
 
 # Website
 site-build

.lintignore

@@ -0,0 +1,8 @@
+# Generated files
+./cri/runtime/api.pb.go
+# Files from different repo
+./client/.config/yarn/*
+./docker/weave
+./tools/*
+# Extra programs that aren't really part of Scope
+./extras/*

CHANGELOG.md

@@ -1,3 +1,56 @@
+## Release 1.13.2
+
+Mostly updates to dependencies, plus a couple of small improvements.
+
+Thanks to everyone who contributed to this release: @gaby, @Kielek, @knrt10
+
+### Enhancements
+- Set hostname to Kubernetes node name
+        [#3827](https://github.com/weaveworks/scope/pull/3827)
+- Stop rendering if Context is cancelled
+        [#3801](https://github.com/weaveworks/scope/pull/3801)
+
+### Bug fixes
+- Only mount plugins directory if it exists
+        [#3825](https://github.com/weaveworks/scope/pull/3825)
+- Multitenant billing: cope with spy-interval set longer than publish-interval
+        [#3796](https://github.com/weaveworks/scope/pull/3796)
+- Multitenant query: don't drop topologies so much
+        [#3791](https://github.com/weaveworks/scope/pull/3791)
+- Multitenant: scan container command-lines as well as process
+        [#3789](https://github.com/weaveworks/scope/pull/3789)
+
+### Dependencies updates
+
+- Update alpine base image to 3.13
+        [#3838](https://github.com/weaveworks/scope/pull/3838)
+- Update build tools including Go 1.16.2
+        [#3833](https://github.com/weaveworks/scope/pull/3833)
+        [#3797](https://github.com/weaveworks/scope/pull/3797)
+        [#3821](https://github.com/weaveworks/scope/pull/3821)
+- update lodash to 4.17.20 (CVE-2020-8203)
+        [#3831](https://github.com/weaveworks/scope/pull/3831)
+- update dot-prop, webpack and terser-webpack-plugin
+        [#3816](https://github.com/weaveworks/scope/pull/3816)
+- bump http-proxy from 1.16.2 to 1.18.1 in /client
+        [#3819](https://github.com/weaveworks/scope/pull/3819)
+- bump elliptic from 6.4.0 to 6.5.3 in /client
+        [#3814](https://github.com/weaveworks/scope/pull/3814)
+- bump lodash from 4.17.15 to 4.17.19 in /client
+        [#3812](https://github.com/weaveworks/scope/pull/3812)
+- Update to most recent weaveworks/ui-components
+        [#3795](https://github.com/weaveworks/scope/pull/3795)
+- update JS kind-of to 6.0.3
+        [#3785](https://github.com/weaveworks/scope/pull/3785)
+
+### Build & test
+
+- Run AWS CLI from a container image
+        [#3841](https://github.com/weaveworks/scope/pull/3841)
+- Remove obsolete dependency github.com/fatih/hclfmt
+        [#3834](https://github.com/weaveworks/scope/pull/3834)
+
+
 ## Release 1.13.1
 
 This release fixes a bug on 'kubernetes describe' operations, where

CONTRIBUTING.md

@@ -25,6 +25,8 @@ When sending email, it's usually best to use the mailing list. The maintainers a
 
 We also meet regularly at the [Scope community meeting](https://docs.google.com/document/d/103_60TuEkfkhz_h2krrPJH8QOx-vRnPpbcCZqrddE1s/). Don't feel discouraged to attend the meeting due to not being a developer. Everybody is welcome!
 
+We follow the [CNCF Code of Conduct](CODE-OF-CONDUCT.md).
+
 # Getting Started
 
 - Fork the repository on GitHub

MAINTAINERS

@@ -2,4 +2,4 @@ Alfonso Acosta <[email protected]> (@2opremio)
 Filip Barl <[email protected]> (@fbarl)
 Bryan Boreham <[email protected]> (@bboreham)
 Satyam Zode <[email protected]> (@satyamz)
-Akash Srivastava <akash.[email protected]> (@qiell)
+Akash Srivastava <akash.[email protected]> (@qiell)

Makefile

@@ -6,32 +6,26 @@ DOCKERHUB_USER=weaveworks
 SCOPE_EXE=prog/scope
 SCOPE_EXPORT=scope.tar
 CLOUD_AGENT_EXPORT=cloud-agent.tar
-SCOPE_UI_BUILD_IMAGE=$(DOCKERHUB_USER)/scope-ui-build
-SCOPE_UI_BUILD_UPTODATE=.scope_ui_build.uptodate
+SCOPE_UI_BUILD_IMAGE=node:10.19
 SCOPE_BACKEND_BUILD_IMAGE=$(DOCKERHUB_USER)/scope-backend-build
 SCOPE_BACKEND_BUILD_UPTODATE=.scope_backend_build.uptodate
 SCOPE_VERSION=$(shell git rev-parse --short HEAD)
 GIT_REVISION=$(shell git rev-parse HEAD)
-WEAVENET_VERSION=2.1.3
+WEAVENET_VERSION=2.8.1
 RUNSVINIT=vendor/github.com/peterbourgon/runsvinit/runsvinit
 CODECGEN_DIR=vendor/github.com/ugorji/go/codec/codecgen
-CODECGEN_EXE=$(CODECGEN_DIR)/bin/codecgen_$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
 CODECGEN_UID=0
 GET_CODECGEN_DEPS=$(shell find $(1) -maxdepth 1 -type f -name '*.go' -not -name '*_test.go' -not -name '*.codecgen.go' -not -name '*.generated.go')
 CODECGEN_TARGETS=report/report.codecgen.go render/detailed/detailed.codecgen.go
 RM=--rm
 RUN_FLAGS=-ti
 BUILD_IN_CONTAINER=true
 GO_ENV=GOGC=off
-GO_BUILD_TAGS='netgo unsafe'
+GO_BUILD_TAGS='netgo osusergo unsafe'
 GO_BUILD_FLAGS=-mod vendor -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION) -s -w" -tags $(GO_BUILD_TAGS)
-GOOS=$(shell go tool dist env | grep GOOS | sed -e 's/GOOS="\(.*\)"/\1/')
-
-ifeq ($(GOOS),linux)
-GO_ENV+=CGO_ENABLED=1
-endif
 
 ifeq ($(GOARCH),arm)
+GO_ENV+=CGO_ENABLED=1
 ARM_CC=CC=/usr/bin/arm-linux-gnueabihf-gcc
 endif
 
@@ -72,7 +66,7 @@ docker/%: %
 
 $(CLOUD_AGENT_EXPORT): docker/Dockerfile.cloud-agent docker/$(SCOPE_EXE) docker/weave docker/weaveutil
 
-$(SCOPE_EXPORT): docker/Dockerfile.scope $(CLOUD_AGENT_EXPORT) docker/$(RUNSVINIT) docker/demo.json docker/run-app docker/run-probe docker/entrypoint.sh
+$(SCOPE_EXPORT): docker/Dockerfile.scope $(CLOUD_AGENT_EXPORT) docker/$(RUNSVINIT) docker/run-app docker/run-probe docker/entrypoint.sh
 
 $(RUNSVINIT): vendor/github.com/peterbourgon/runsvinit/*.go
 
@@ -89,9 +83,12 @@ ifeq ($(BUILD_IN_CONTAINER),true)
 $(SCOPE_EXE) $(RUNSVINIT) lint tests shell prog/staticui/staticui.go prog/externalui/externalui.go: $(SCOPE_BACKEND_BUILD_UPTODATE)
 	@mkdir -p $(shell pwd)/.pkg
 	$(SUDO) docker run $(RM) $(RUN_FLAGS) \
-		-v $(shell pwd):/go/src/github.com/weaveworks/scope \
-		-v $(shell pwd)/.pkg:/go/pkg \
+		-v $(shell pwd):/go/src/github.com/weaveworks/scope:delegated,z \
+		-v $(shell pwd)/.pkg:/go/pkg:delegated,z \
+		-v $(shell pwd)/.cache:/go/cache:delegated,z \
+		-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
 		--net=host \
+		-e HOME=/go/src/github.com/weaveworks/scope \
 		-e GOARCH -e GOOS -e CIRCLECI -e CIRCLE_BUILD_NUM -e CIRCLE_NODE_TOTAL \
 		-e CIRCLE_NODE_INDEX -e COVERDIR -e SLOW -e TESTDIRS \
 		$(SCOPE_BACKEND_BUILD_IMAGE) SCOPE_VERSION=$(SCOPE_VERSION) CODECGEN_UID=$(CODECGEN_UID) $@
@@ -101,6 +98,8 @@ else
 $(SCOPE_EXE):
 	time $(GO) build $(GO_BUILD_FLAGS) -o $@ ./$(@D)
 
+CODECGEN_EXE=$(CODECGEN_DIR)/bin/codecgen_$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
+
 %.codecgen.go: $(CODECGEN_EXE)
 	rm -f $@; $(GO_HOST) build $(GO_BUILD_FLAGS) ./$(@D) # workaround for https://github.com/ugorji/go/issues/145
 	cd $(@D) && $(WITH_GO_HOST_ENV) GO111MODULE=off $(shell pwd)/$(CODECGEN_EXE) -d $(CODECGEN_UID) -rt $(GO_BUILD_TAGS) -u -o $(@F) $(notdir $(call GET_CODECGEN_DEPS,$(@D)))
@@ -118,98 +117,66 @@ shell:
 tests: $(CODECGEN_TARGETS) prog/staticui/staticui.go prog/externalui/externalui.go
 	./tools/test -no-go-get -tags $(GO_BUILD_TAGS)
 
-lint:
+lint: prog/staticui/staticui.go prog/externalui/externalui.go 
 	./tools/lint
 
 prog/staticui/staticui.go:
 	mkdir -p prog/staticui
-	esc -o $@ -pkg staticui -prefix client/build client/build
+	$(NO_CROSS_COMP); go run -mod vendor github.com/mjibson/esc -o $@ -pkg staticui -prefix client/build client/build
 
 prog/externalui/externalui.go:
 	mkdir -p prog/externalui
-	esc -o $@ -pkg externalui -prefix client/build-external -include '\.html$$' client/build-external
+	$(NO_CROSS_COMP); go run -mod vendor github.com/mjibson/esc -o $@ -pkg externalui -prefix client/build-external -include '\.html$$' client/build-external
 
 endif
 
 ifeq ($(BUILD_IN_CONTAINER),true)
 
 SCOPE_UI_TOOLCHAIN=.cache/build_node_modules
 SCOPE_UI_TOOLCHAIN_UPTODATE=$(SCOPE_UI_TOOLCHAIN)/.uptodate
+SCOPE_UI_BUILD_CMD=$(SUDO) docker run $(RM) $(RUN_FLAGS) \
+			-v $(shell pwd)/.cache:/home/weave/scope/.cache:delegated,z \
+			-v $(shell pwd)/client:/home/weave/scope/client:delegated,z \
+			-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules:delegated,z \
+			-w /home/weave/scope/client \
+			-e HOME=/home/weave/scope/client \
+			-e NPM_CONFIG_LOGLEVEL=warn \
+			-e NPM_CONFIG_PROGRESS=false \
+			-e XDG_CACHE_HOME=/home/weave/scope/.cache \
+			-u $(shell id -u ${USER}):$(shell id -g ${USER})
 
 $(SCOPE_UI_TOOLCHAIN_UPTODATE): client/yarn.lock $(SCOPE_UI_BUILD_UPTODATE)
 	mkdir -p $(SCOPE_UI_TOOLCHAIN) client/node_modules
 	if test "true" != "$(SCOPE_SKIP_UI_ASSETS)"; then \
-		$(SUDO) docker run $(RM) $(RUN_FLAGS) \
-			-v $(shell pwd)/.cache:/home/weave/scope/.cache \
-			-v $(shell pwd)/client:/home/weave/scope/client \
-			-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-			-w /home/weave/scope/client \
-			-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
-			$(SCOPE_UI_BUILD_IMAGE) yarn install; \
+		$(SCOPE_UI_BUILD_CMD) $(SCOPE_UI_BUILD_IMAGE) yarn install; \
 	fi
 	touch $(SCOPE_UI_TOOLCHAIN_UPTODATE)
 
 client/build/index.html: $(shell find client/app -type f) $(SCOPE_UI_TOOLCHAIN_UPTODATE)
 	mkdir -p client/build
 	if test "true" != "$(SCOPE_SKIP_UI_ASSETS)"; then \
-		$(SUDO) docker run $(RM) $(RUN_FLAGS) \
-			-v $(shell pwd)/.cache:/home/weave/scope/.cache \
-			-v $(shell pwd)/client:/home/weave/scope/client \
-			-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-			-w /home/weave/scope/client \
-			-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
-			$(SCOPE_UI_BUILD_IMAGE) yarn run build; \
+		$(SCOPE_UI_BUILD_CMD) $(SCOPE_UI_BUILD_IMAGE) yarn run build; \
 	fi
 
 client/build-external/index.html: $(shell find client/app -type f) $(SCOPE_UI_TOOLCHAIN_UPTODATE)
 	mkdir -p client/build-external
 	if test "true" != "$(SCOPE_SKIP_UI_ASSETS)"; then \
-		$(SUDO) docker run $(RM) $(RUN_FLAGS) \
-			-v $(shell pwd)/.cache:/home/weave/scope/.cache \
-			-v $(shell pwd)/client:/home/weave/scope/client \
-			-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-			-w /home/weave/scope/client \
-			-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
-			$(SCOPE_UI_BUILD_IMAGE) yarn run build-external; \
+		$(SCOPE_UI_BUILD_CMD) $(SCOPE_UI_BUILD_IMAGE) yarn run build-external; \
 	fi
 
 client-test: $(shell find client/app/scripts -type f) $(SCOPE_UI_TOOLCHAIN_UPTODATE)
-	$(SUDO) docker run $(RM) $(RUN_FLAGS) \
-		-v $(shell pwd)/.cache:/home/weave/scope/.cache \
-		-v $(shell pwd)/client:/home/weave/scope/client \
-		-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-		-w /home/weave/scope/client \
-		-u $(id -u ${USER}):$(id -g ${USER}) \
-		$(SCOPE_UI_BUILD_IMAGE) yarn test
+	$(SCOPE_UI_BUILD_CMD) $(SCOPE_UI_BUILD_IMAGE) yarn test
 
 client-lint: $(SCOPE_UI_TOOLCHAIN_UPTODATE)
-	$(SUDO) docker run $(RM) $(RUN_FLAGS) \
-		-v $(shell pwd)/.cache:/home/weave/scope/.cache \
-		-v $(shell pwd)/client:/home/weave/scope/client \
-		-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-		-w /home/weave/scope/client \
-		-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
-		$(SCOPE_UI_BUILD_IMAGE) yarn run lint
+	$(SCOPE_UI_BUILD_CMD) $(SCOPE_UI_BUILD_IMAGE) yarn run lint
 
 client-start: $(SCOPE_UI_TOOLCHAIN_UPTODATE)
-	$(SUDO) docker run $(RM) $(RUN_FLAGS) --net=host \
-		-v $(shell pwd)/.cache:/home/weave/scope/.cache \
-		-v $(shell pwd)/client:/home/weave/scope/client \
-		-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
+	$(SCOPE_UI_BUILD_CMD) --net=host \
 		-e WEBPACK_SERVER_HOST \
-		-w /home/weave/scope/client \
-		-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
 		$(SCOPE_UI_BUILD_IMAGE) yarn start
 
 client/bundle/weave-scope.tgz: $(shell find client/app -type f) $(SCOPE_UI_TOOLCHAIN_UPTODATE)
-	$(sudo) docker run $(RUN_FLAGS) \
-		-v $(shell pwd)/.cache:/home/weave/scope/.cache \
-		-v $(shell pwd)/client:/home/weave/scope/client \
-		-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-		-v $(shell pwd)/tmp:/home/weave/tmp \
-		-w /home/weave/scope/client \
-		-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
-		$(SCOPE_UI_BUILD_IMAGE) yarn run bundle
+	$(SCOPE_UI_BUILD_CMD) $(SCOPE_UI_BUILD_IMAGE) yarn run bundle
 
 else
 
@@ -230,25 +197,23 @@ client/build-external/index.html: $(SCOPE_UI_TOOLCHAIN_UPTODATE)
 
 endif
 
-$(SCOPE_UI_BUILD_UPTODATE): client/Dockerfile client/package.json client/webpack.local.config.js client/webpack.production.config.js client/server.js client/.eslintrc
-	$(SUDO) docker build -t $(SCOPE_UI_BUILD_IMAGE) client
-	$(SUDO) docker tag $(SCOPE_UI_BUILD_IMAGE) $(SCOPE_UI_BUILD_IMAGE):$(IMAGE_TAG)
-	touch $@
-
 $(SCOPE_BACKEND_BUILD_UPTODATE): backend/*
 	$(SUDO) docker build -t $(SCOPE_BACKEND_BUILD_IMAGE) backend
 	$(SUDO) docker tag $(SCOPE_BACKEND_BUILD_IMAGE) $(SCOPE_BACKEND_BUILD_IMAGE):$(IMAGE_TAG)
 	touch $@
 
+# Run aws CLI from a container image so we don't have to install Python, etc.
+AWS_COMMAND=docker run $(RM) $(RUN_FLAGS) \
+	-e AWS_ACCESS_KEY_ID=$$UI_BUCKET_KEY_ID \
+	-e AWS_SECRET_ACCESS_KEY=$$UI_BUCKET_KEY_SECRET \
+	-v $(shell pwd):/scope \
+	amazon/aws-cli:2.1.35
+
 ui-upload: client/build-external/index.html
-	AWS_ACCESS_KEY_ID=$$UI_BUCKET_KEY_ID \
-	AWS_SECRET_ACCESS_KEY=$$UI_BUCKET_KEY_SECRET \
-	aws s3 cp client/build-external/ s3://static.weave.works/scope-ui/ --recursive --exclude '*.html'
+	$(AWS_COMMAND) s3 cp /scope/client/build-external/ s3://static.weave.works/scope-ui/ --recursive --exclude '*.html'
 
 ui-pkg-upload: client/bundle/weave-scope.tgz
-	AWS_ACCESS_KEY_ID=$$UI_BUCKET_KEY_ID \
-	AWS_SECRET_ACCESS_KEY=$$UI_BUCKET_KEY_SECRET \
-	aws s3 cp client/bundle/weave-scope.tgz s3://weaveworks-js-modules/weave-scope/$(shell echo $(SCOPE_VERSION))/weave-scope.tgz
+	$(AWS_COMMAND) s3 cp /scope/client/bundle/weave-scope.tgz s3://weaveworks-js-modules/weave-scope/$(shell echo $(SCOPE_VERSION))/weave-scope.tgz
 
 # We don't rmi images here; rm'ing the .uptodate files is enough to
 # get the build images rebuilt, and rm'ing the scope exe is enough to
@@ -257,7 +222,7 @@ ui-pkg-upload: client/bundle/weave-scope.tgz
 # rmi'ng images is desirable sometimes. Invoke `realclean` for that.
 clean:
 	$(GO) clean ./...
-	rm -rf $(SCOPE_EXPORT) $(SCOPE_UI_BUILD_UPTODATE) $(SCOPE_UI_TOOLCHAIN_UPTODATE) $(SCOPE_BACKEND_BUILD_UPTODATE) \
+	rm -rf $(SCOPE_EXPORT) $(SCOPE_UI_TOOLCHAIN_UPTODATE) $(SCOPE_BACKEND_BUILD_UPTODATE) \
 		$(SCOPE_EXE) $(RUNSVINIT) prog/staticui/staticui.go prog/externalui/externalui.go client/build/*.js client/build-external/*.js docker/weave .pkg \
 		$(CODECGEN_TARGETS) $(CODECGEN_DIR)/bin
 
@@ -274,19 +239,17 @@ clean-codecgen:
 # Doing this is important for release builds.
 realclean: clean
 	rm -rf $(SCOPE_UI_TOOLCHAIN)
-	$(SUDO) docker rmi -f $(SCOPE_UI_BUILD_IMAGE) $(SCOPE_BACKEND_BUILD_IMAGE) \
+	$(SUDO) docker rmi -f $(SCOPE_BACKEND_BUILD_IMAGE) \
 		$(DOCKERHUB_USER)/scope $(DOCKERHUB_USER)/cloud-agent \
 		$(DOCKERHUB_USER)/scope:$(IMAGE_TAG) $(DOCKERHUB_USER)/cloud-agent:$(IMAGE_TAG) \
 		weaveworks/weaveexec:$(WEAVENET_VERSION) \
-		ubuntu:yakkety alpine:3.5 node:6.9.0 2>/dev/null || true
+		ubuntu:bionic alpine:3.11 node:6.9.0 2>/dev/null || true
 
 # Dependencies are intentionally build without enforcing any tags
 # since they are build on the host
 deps:
 	$(GO) get -u -f \
-		github.com/FiloSottile/gvt \
 		github.com/mattn/goveralls \
-		github.com/weaveworks/github-release \
 		github.com/2opremio/trifles/wscat
 
 # This target is only intended for use in Netlify CI environment for generating preview pages on feature branches and pull requests.