Merge pull request #98 from yzewei/main

mr

bitnami/metrics-server/0.6.1/0001-add-loong64-support.patch

@@ -0,0 +1,93 @@
+diff --git a/.dockerignore b/.dockerignore
+index dd9c2d9..992be53 100644
+--- a/.dockerignore
++++ b/.dockerignore
+@@ -1,3 +1,2 @@
+ /_output
+-/metrics-server
+-/.git
+\ No newline at end of file
++/.git
+diff --git a/Dockerfile b/Dockerfile
+index a43c9c0..cf8ce93 100644
+--- a/Dockerfile
++++ b/Dockerfile
+@@ -1,12 +1,12 @@
+ # Update the base image in Makefile when updating golang version. This has to
+ # be pre-pulled in order to work on GCB.
+ ARG ARCH
+-FROM golang:1.17.6 as build
++FROM lcr.loongnix.cn/library/golang:1.19 as build
+
+ WORKDIR /go/src/sigs.k8s.io/metrics-server
+ COPY go.mod .
+ COPY go.sum .
+-RUN go mod download
++#RUN go mod download
+
+ COPY pkg pkg
+ COPY cmd cmd
+@@ -15,9 +15,10 @@ COPY Makefile Makefile
+ ARG ARCH
+ ARG GIT_COMMIT
+ ARG GIT_TAG
+-RUN make metrics-server
++COPY metrics-server .
++#RUN make metrics-server
+
+-FROM gcr.io/distroless/static:latest-$ARCH
++FROM lcr.loongnix.cn/library/alpine:3.19
+ COPY --from=build /go/src/sigs.k8s.io/metrics-server/metrics-server /
+ USER 65534
+-ENTRYPOINT ["/metrics-server"]
++#ENTRYPOINT ["/metrics-server"]
+diff --git a/Makefile b/Makefile
+index 520943e..d905dab 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ # Common User-Settable Flags
+ # --------------------------
+ REGISTRY?=gcr.io/k8s-staging-metrics-server
+-ARCH?=amd64
++ARCH?=loong64
+
+ # Release variables
+ # ------------------
+@@ -44,8 +44,8 @@ CONTAINER_ARCH_TARGETS=$(addprefix container-,$(ALL_ARCHITECTURES))
+ container:
+ 	# Pull base image explicitly. Keep in sync with Dockerfile, otherwise
+ 	# GCB builds will start failing.
+-	docker pull golang:1.17.6
+-	docker build -t $(REGISTRY)/metrics-server-$(ARCH):$(CHECKSUM) --build-arg ARCH=$(ARCH) --build-arg GIT_TAG=$(GIT_TAG) --build-arg GIT_COMMIT=$(GIT_COMMIT) .
++	docker pull lcr.loongnix.cn/library/golang:1.19
++	docker build -t lcr.loongnix.cn/bitnami/metrics-server:0.6.1 --build-arg https_proxy=$(https_proxy) --build-arg GOPROXY=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg GIT_TAG=$(GIT_TAG) --build-arg GIT_COMMIT=$(GIT_COMMIT) .
+
+ .PHONY: container-all
+ container-all: $(CONTAINER_ARCH_TARGETS);
+diff --git a/go.mod b/go.mod
+index 2fa2f61..361b1d3 100644
+--- a/go.mod
++++ b/go.mod
+@@ -95,7 +95,7 @@ require (
+ 	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
+ 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
+ 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+-	golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
++	golang.org/x/sys v0.25.0 // indirect
+ 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
+ 	golang.org/x/text v0.3.7 // indirect
+ 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+diff --git a/go.sum b/go.sum
+index 9a335b8..77b1950 100644
+--- a/go.sum
++++ b/go.sum
+@@ -751,6 +751,8 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
+ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
+ golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
++golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+ golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
+ golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

bitnami/metrics-server/0.6.1/Makefile

@@ -0,0 +1,28 @@
+# This file is generated by the template.
+
+REGISTRY	?=lcr.loongnix.cn
+ORGANIZATION	?=bitnami
+REPOSITORY	?=metrics-server
+TAG		?=0.6.1
+LATEST		?=true
+
+IMAGE=$(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG)
+LATEST_IMAGE=$(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):latest
+
+default: image
+
+src:
+	git clone -b v0.6.1 --depth 1 https://github.com/kubernetes-sigs/metrics-server src && \
+	cd src && git apply ../0001-add-loong64-support.patch
+
+image: src
+	cd src && make metrics-server && make container
+
+push:
+	docker push $(IMAGE)
+	#latest image
+	@if [ $(LATEST) = "true" ]; \
+		then \
+		docker tag $(IMAGE) $(LATEST_IMAGE); \
+		docker push $(LATEST_IMAGE); \
+	fi

jaegertracing/all-in-one/1.35/0001-add-loong64-support.patch

@@ -0,0 +1,141 @@
+diff --git a/Makefile b/Makefile
+index 3e04bf1..bd1cb64 100644
+--- a/Makefile
++++ b/Makefile
+@@ -68,6 +68,9 @@ MOCKERY=mockery
+
+ .DEFAULT_GOAL := test-and-lint
+
++build:  init-submodules build-all-in-one
++	docker build --build-arg base_image="lcr.loongnix.cn/library/alpine:3.19" --build-arg debug_image="lcr.loongnix.cn/library/alpine:3.19" -t lcr.loongnix.cn/jaegertracing/all-in-one:1.35 -f cmd/all-in-one/Dockerfile ./cmd/all-in-one
++
+ .PHONY: test-and-lint
+ test-and-lint: test fmt lint
+
+@@ -263,6 +266,10 @@ build-binaries-arm64:
+ build-binaries-ppc64le:
+ 	GOOS=linux GOARCH=ppc64le $(MAKE) build-platform-binaries
+
++.PHONY: build-binaries-loong64
++build-binaries-loong64:
++	GOOS=linux GOARCH=loong64 $(MAKE) build-platform-binaries
++
+ .PHONY: build-platform-binaries
+ build-platform-binaries: build-agent \
+ 	build-agent-debug \
+@@ -281,7 +288,7 @@ build-platform-binaries: build-agent \
+ 	build-es-rollover
+
+ .PHONY: build-all-platforms
+-build-all-platforms: build-binaries-linux build-binaries-windows build-binaries-darwin build-binaries-darwin-arm64 build-binaries-s390x build-binaries-arm64 build-binaries-ppc64le
++build-all-platforms: build-binaries-linux build-binaries-windows build-binaries-darwin build-binaries-darwin-arm64 build-binaries-s390x build-binaries-arm64 build-binaries-ppc64le build-binaries-loong64
+
+ .PHONY: docker-images-cassandra
+ docker-images-cassandra:
+diff --git a/cmd/all-in-one/Dockerfile b/cmd/all-in-one/Dockerfile
+index e92c89c..733fd57 100644
+--- a/cmd/all-in-one/Dockerfile
++++ b/cmd/all-in-one/Dockerfile
+@@ -28,14 +28,14 @@ EXPOSE 16686
+ # Default configuration file for setting sampling strategies
+ ENV SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json
+
+-COPY all-in-one-linux-$TARGETARCH /go/bin/all-in-one-linux
++COPY all-in-one-linux-loong64 /go/bin/all-in-one-linux
+ COPY sampling_strategies.json /etc/jaeger/
+
+ VOLUME ["/tmp"]
+ ENTRYPOINT ["/go/bin/all-in-one-linux"]
+
+ FROM $debug_image AS debug
+-ARG TARGETARCH=amd64
++ARG TARGETARCH=loong64
+
+ # Agent zipkin.thrift compact
+ EXPOSE 5775/udp
+@@ -64,7 +64,7 @@ EXPOSE 12345
+ # Default configuration file for setting sampling strategies
+ ENV SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json
+
+-COPY all-in-one-debug-linux-$TARGETARCH /go/bin/all-in-one-linux
++COPY all-in-one-linux-loong64 /go/bin/all-in-one-linux
+ COPY sampling_strategies.json /etc/jaeger/
+
+ VOLUME ["/tmp"]
+diff --git a/cmd/query/app/ui/actual/.gitignore b/cmd/query/app/ui/actual/.gitignore
+deleted file mode 100644
+index d6b7ef3..0000000
+--- a/cmd/query/app/ui/actual/.gitignore
++++ /dev/null
+@@ -1,2 +0,0 @@
+-*
+-!.gitignore
+diff --git a/go.mod b/go.mod
+index 7620432..1b2497d 100644
+--- a/go.mod
++++ b/go.mod
+@@ -52,7 +52,7 @@ require (
+ 	go.uber.org/automaxprocs v1.5.1
+ 	go.uber.org/zap v1.21.0
+ 	golang.org/x/net v0.0.0-20220412020605-290c469a71a5
+-	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
++	golang.org/x/sys v0.26.0
+ 	google.golang.org/grpc v1.46.2
+ 	google.golang.org/protobuf v1.28.0
+ 	gopkg.in/yaml.v2 v2.4.0
+diff --git a/go.sum b/go.sum
+index 691f2bf..50237f8 100644
+--- a/go.sum
++++ b/go.sum
+@@ -980,6 +980,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
+ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
+ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
++golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+diff --git a/scripts/build-all-in-one-image.sh b/scripts/build-all-in-one-image.sh
+index 116ebbb..c125557 100755
+--- a/scripts/build-all-in-one-image.sh
++++ b/scripts/build-all-in-one-image.sh
+@@ -8,7 +8,7 @@ BRANCH=${BRANCH:?'missing BRANCH env var'}
+ # `GOARCH=<target arch> ./scripts/build-all-in-one-image.sh`.
+ GOARCH=${GOARCH:-$(go env GOARCH)}
+
+-expected_version="v10"
++expected_version="v18"
+ version=$(node --version)
+ major_version=${version%.*.*}
+ if [ "$major_version" = "$expected_version" ] ; then
+@@ -31,13 +31,14 @@ run_integration_test() {
+   docker kill $CID
+ }
+
+-make create-baseimg-debugimg
++#make create-baseimg-debugimg
+
+ make build-all-in-one GOOS=linux GOARCH=amd64
+ make build-all-in-one GOOS=linux GOARCH=s390x
+ make build-all-in-one GOOS=linux GOARCH=ppc64le
+ make build-all-in-one GOOS=linux GOARCH=arm64
+-platforms="linux/amd64,linux/s390x,linux/ppc64le,linux/arm64"
++make build-all-in-one GOOS=linux GOARCH=loong64
++platforms="linux/amd64,linux/s390x,linux/ppc64le,linux/arm64,linux/loong64"
+ repo=jaegertracing/all-in-one
+ #build all-in-one image locally for integration test
+ bash scripts/build-upload-a-docker-image.sh -l -b -c all-in-one -d cmd/all-in-one -p "${platforms}" -t release
+diff --git a/scripts/build-upload-a-docker-image.sh b/scripts/build-upload-a-docker-image.sh
+index 50d71ee..3b2f63a 100644
+--- a/scripts/build-upload-a-docker-image.sh
++++ b/scripts/build-upload-a-docker-image.sh
+@@ -6,7 +6,7 @@ base_debug_img_arg=""
+ docker_file_arg="Dockerfile"
+ target_arg=""
+ local_test_only='N'
+-platforms="linux/amd64"
++platforms="linux/loong64"
+ name_space="jaegertracing"
+
+ while getopts "lbc:d:f:p:t:" opt; do

jaegertracing/all-in-one/1.35/Makefile

@@ -0,0 +1,31 @@
+# This file is generated by the template.
+
+REGISTRY	?=lcr.loongnix.cn
+ORGANIZATION	?=jaegertracing
+REPOSITORY	?=jaeger
+TAG		?=1.35
+LATEST		?=true
+
+IMAGE=$(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):$(TAG)
+LATEST_IMAGE=$(REGISTRY)/$(ORGANIZATION)/$(REPOSITORY):latest
+
+default: image
+
+#由于webpack及node的版本问题 需要设置该变量
+env:
+	export NODE_OPTIONS=--openssl-legacy-provider
+
+src:
+	 git clone --depth 1 -b v1.35.0 https://github.com/jaegertracing/jaeger && cd jaeger && git apply ../0001-add-loong64-support.patch
+
+image: env src
+	export NODE_OPTIONS="--openssl-legacy-provider" && cd jaeger && make build
+
+push:
+	docker push $(IMAGE)
+	#latest image
+	@if [ $(LATEST) = "true" ]; \
+		then \
+		docker tag $(IMAGE) $(LATEST_IMAGE); \
+		docker push $(LATEST_IMAGE); \
+	fi

jimmidyson/configmap-reload/0.5.0/0001-add-loong64-support.patch

@@ -0,0 +1,100 @@
+diff --git a/Dockerfile b/Dockerfile
+index 2bc931f..a7bae0b 100644
+--- a/Dockerfile
++++ b/Dockerfile
+@@ -1,4 +1,4 @@
+-ARG BASEIMAGE=busybox
++ARG BASEIMAGE=lcr.loongnix.cn/library/busybox:1.32.0
+ FROM $BASEIMAGE
+
+ USER 65534
+diff --git a/Makefile b/Makefile
+index eec6d87..e51de92 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,14 +22,14 @@ GOOS ?= $(shell go env GOOS)
+ GOARCH ?= $(shell go env GOARCH)
+ ORG := github.com/jimmidyson
+ REPOPATH ?= $(ORG)/configmap-reload
+-DOCKER_IMAGE_NAME ?= jimmidyson/configmap-reload
+-DOCKER_IMAGE_TAG ?= latest
++DOCKER_IMAGE_NAME ?= lcr.loongnix.cn/jimmidyson/configmap-reload
++DOCKER_IMAGE_TAG ?= 0.5.0
+
+ LDFLAGS := -s -w -extldflags '-static'
+
+ SRCFILES := $(shell find . ! -path './out/*' ! -path './.git/*' -type f)
+
+-ALL_ARCH=amd64 arm arm64 ppc64le s390x
++ALL_ARCH=amd64 arm arm64 ppc64le s390x loong64
+ ML_PLATFORMS=$(addprefix linux/,$(ALL_ARCH))
+ ALL_BINARIES ?= $(addprefix out/configmap-reload-, \
+ 									$(addprefix linux-,$(ALL_ARCH)) \
+@@ -41,6 +41,7 @@ DEFAULT_BASEIMAGE_arm     := arm32v7/busybox:1.33.0
+ DEFAULT_BASEIMAGE_arm64   := arm64v8/busybox:1.33.0
+ DEFAULT_BASEIMAGE_ppc64le := ppc64le/busybox:1.33.0
+ DEFAULT_BASEIMAGE_s390x   := s390x/busybox:1.33.0
++DEFAULT_BASEIMAGE_loong64 := lcr.loongnix.cn/library/busybox:1.32.0
+
+ BASEIMAGE ?= $(DEFAULT_BASEIMAGE_$(GOARCH))
+
+@@ -71,7 +72,7 @@ clean:
+
+ .PHONY: docker
+ docker: out/configmap-reload-$(GOOS)-$(GOARCH) Dockerfile
+-	docker build --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg BINARY=$(BINARY) -t $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)-$(GOARCH) .
++	docker build --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg BINARY=$(BINARY) -t $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) .
+
+ manifest-tool:
+ 	curl -fsSL https://github.com/estesp/manifest-tool/releases/download/v1.0.0-rc3/manifest-tool-linux-amd64 > ./manifest-tool
+diff --git a/go.mod b/go.mod
+index 4c4ab42..22e631e 100644
+--- a/go.mod
++++ b/go.mod
+@@ -5,5 +5,6 @@ go 1.14
+ require (
+ 	github.com/fsnotify/fsnotify v1.4.9
+ 	github.com/prometheus/client_golang v1.7.0
+-	golang.org/x/sys v0.0.0-20200620081246-981b61492c35 // indirect
++	github.com/prometheus/procfs v0.15.1 // indirect
++	golang.org/x/sys v0.26.0 // indirect
+ )
+diff --git a/go.sum b/go.sum
+index 9568655..b450cb8 100644
+--- a/go.sum
++++ b/go.sum
+@@ -35,6 +35,7 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
+ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
++github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+@@ -73,6 +74,8 @@ github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNG
+ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+ github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
+ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
++github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
++github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+@@ -87,6 +90,7 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL
+ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+@@ -99,6 +103,9 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 h1:ogLJMz+qpzav7lGMh10LMvAkM
+ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20200620081246-981b61492c35 h1:wb/9mP8eUAmHfkM8RmpeLq6nUA7c2i5+bQOtcDftjaE=
+ golang.org/x/sys v0.0.0-20200620081246-981b61492c35/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
++golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
++golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=