Skip to content

Commit cf03202

Browse files
xmlkingxmlking
committed
build(root): moving to go.work
1 parent c75011c commit cf03202

File tree

13 files changed

+131
-189
lines changed

13 files changed

+131
-189
lines changed

‎.dockerignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
config/base
2+
config/components
23
config/envs
34
config/README.md
5+
config/k3d.yml
6+
config/Taskfile.yml
47

58
.github
69
.vscode

‎Dockerfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,26 @@ RUN go build -a \
3838
-o /app ./$TYPE/$TARGET/main.go
3939

4040
# Compress the binary
41-
# RUN upx --best --lzma /app
41+
RUN upx -v --ultra-brute --best /app || true
4242

4343
# Final stage: the running container.
44-
FROM gcr.io/distroless/static:nonroot AS final
4544

46-
# copy grpc-health-probe to use with readinessProbe
47-
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
45+
# Use `static:debug` to create debuggable container. for prod, use `static:nonroot`
46+
FROM gcr.io/distroless/static:debug AS final
47+
#FROM gcr.io/distroless/static:nonroot AS final
4848

49+
# copy grpc-health-probe to use with readinessProbe
50+
COPY --from=builder --chown=nonroot:nonroot /bin/grpc_health_probe /bin/grpc_health_probe
4951
# copygrpcurl to use with livenessProbe
50-
COPY --from=builder /bin/grpcurl /bin/grpcurl
51-
52+
COPY --from=builder --chown=nonroot:nonroot /bin/grpcurl /bin/grpcurl
5253
# copy dumb-ini from base
53-
COPY --from=builder /usr/bin/dumb-init /usr/bin/dumb-init
54-
55-
# Import the compiled executable from the second stage.
54+
COPY --from=builder --chown=nonroot:nonroot /usr/bin/dumb-init /bin/dumb-init
55+
# copy the compiled executable from the second stage.
5656
ARG VERSION=0.0.1
5757
ARG TYPE=service
5858
ARG TARGET=account
59-
COPY --from=builder /app /app
60-
COPY --from=builder src/config /config
59+
COPY --from=builder --chown=nonroot:nonroot /app /app
60+
COPY --from=builder --chown=nonroot:nonroot src/config /config
6161

6262
# Declare the port on which the webserver will be exposed.
6363
# As we're going to run the executable as an unprivileged user, we can't bind
@@ -94,4 +94,4 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
9494
org.opencontainers.image.documentation="docker run -it -e CONFY_ENV=production -p 8080:8080 ${DOCKER_REGISTRY:+${DOCKER_REGISTRY}/}${DOCKER_CONTEXT_PATH}/${TARGET}-${TYPE}:${VERSION}"
9595

9696
# Run the compiled binary.
97-
ENTRYPOINT ["/usr/bin/dumb-init", "/app"]
97+
ENTRYPOINT ["/bin/dumb-init", "/app"]

‎Dockerfile.base

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
FROM golang:1-alpine AS base
1+
ARG GO_VERSION=1
2+
ARG UPX_VERSION=3.96
23

3-
# TODO: apk --no-cache add upx
4-
# Install UPX
5-
ARG UPX_VERSION="3.96"
6-
ENV UPX_VERSION=${UPX_VERSION}
4+
FROM --platform=$BUILDPLATFORM pratikimprowise/upx:${UPX_VERSION} AS upx
5+
FROM golang:${GO_VERSION}-alpine AS base
76

8-
RUN mkdir /user \
9-
&& apk --no-cache add make git gcc libtool musl-dev dumb-init \
7+
COPY --from=upx /usr/local/bin/upx /bin/upx
8+
9+
ARG GRPC_HEALTH_PROBE_VERSION=v0.4.8
10+
ARG GRPCURL_VERSION=1.8.6
11+
ARG GRPCURL_SHA256=5d6768248ea75b30fba09c09ff8ba91fbc0dd1a33361b847cdaf4825b1b514a7
12+
13+
RUN apk --no-cache add make git gcc libtool musl-dev dumb-init \
1014
&& rm -rf /var/cache/apk/* /tmp/* \
11-
&& GRPC_HEALTH_PROBE_VERSION=v0.4.8 \
1215
&& wget -q -O /bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 \
1316
&& chmod +x /bin/grpc_health_probe \
14-
&& GRPCURL_VERSION=1.8.6 \
15-
&& GRPCURL_SHA256=5d6768248ea75b30fba09c09ff8ba91fbc0dd1a33361b847cdaf4825b1b514a7 \
1617
&& wget -nv -O /tmp/grpcurl.tar.gz https://github.com/fullstorydev/grpcurl/releases/download/v${GRPCURL_VERSION}/grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz \
1718
&& echo "${GRPCURL_SHA256} /tmp/grpcurl.tar.gz" | sha256sum -c - \
1819
&& tar -xzf /tmp/grpcurl.tar.gz -C /bin/ grpcurl \
19-
&& rm /tmp/grpcurl.tar.gz \
20-
&& wget https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-amd64_linux.tar.xz \
21-
&& tar -xf upx-${UPX_VERSION}-amd64_linux.tar.xz \
22-
&& mv upx-${UPX_VERSION}-amd64_linux/upx /usr/local/bin/ && rm -rf upx*
20+
&& chmod +x /bin/grpcurl \
21+
&& rm /tmp/grpcurl.tar.gz
2322

2423
# Metadata params
2524
ARG VERSION

‎Dockerfile.cgo

+13-12
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ FROM ghcr.io/xmlking/grpc-starter-kit/base:${BASE_VERSION} AS builder
88
# * CGO_ENABLED=0 to build a statically-linked executable
99
# * GOFLAGS=-mod=vendor to force `go build` to look into the `/vendor` folder.
1010
# * GOPROXY="https://nexus.mycomp.com,direct" to set corp nexus goproxy and fallback to direct.
11+
# * GOWORK=off to desable go.work which is used for local development
1112
# e.g., ENV CGO_ENABLED=0 GOFLAGS=-mod=vendor
12-
ENV CGO_ENABLED=1 GOOS=linux GOPROXY="https://proxy.golang.org,direct"
13+
ENV CGO_ENABLED=1 GOOS=linux GOPROXY="https://proxy.golang.org,direct" GOWORK=off
1314
# when runing behind corporate proxy, you may need following settings
1415
#ENV GOPRIVATE=github.com/mycomp
1516
#ENV GONOSUMDB=github.com/*,gopkg.in/*,google.golang.org/*,cloud.google.com/*
@@ -37,26 +38,26 @@ RUN go build -a \
3738
-o /app ./$TYPE/$TARGET/main.go
3839

3940
# Compress the binary
40-
# RUN upx --best --lzma /app
41+
RUN upx -v --ultra-brute --best /app || true
4142

4243
# Final stage: the running container.
44+
45+
# Use `static:debug` to create debuggable container. for prod, use `static:nonroot`
46+
#FROM gcr.io/distroless/static:debug AS final
4347
FROM gcr.io/distroless/static:nonroot AS final
4448

4549
# copy grpc-health-probe to use with readinessProbe
46-
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
47-
50+
COPY --from=builder --chown=nonroot:nonroot /bin/grpc_health_probe /bin/grpc_health_probe
4851
# copygrpcurl to use with livenessProbe
49-
COPY --from=builder /bin/grpcurl /bin/grpcurl
50-
52+
COPY --from=builder --chown=nonroot:nonroot /bin/grpcurl /bin/grpcurl
5153
# copy dumb-ini from base
52-
COPY --from=builder /usr/bin/dumb-init /usr/bin/dumb-init
53-
54-
# Import the compiled executable from the second stage.
54+
COPY --from=builder --chown=nonroot:nonroot /usr/bin/dumb-init /bin/dumb-init
55+
# copy the compiled executable from the second stage.
5556
ARG VERSION=0.0.1
5657
ARG TYPE=service
5758
ARG TARGET=account
58-
COPY --from=builder /app /app
59-
COPY --from=builder src/config /config
59+
COPY --from=builder --chown=nonroot:nonroot /app /app
60+
COPY --from=builder --chown=nonroot:nonroot src/config /config
6061

6162
# Declare the port on which the webserver will be exposed.
6263
# As we're going to run the executable as an unprivileged user, we can't bind
@@ -93,4 +94,4 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
9394
org.opencontainers.image.documentation="docker run -it -e CONFY_ENV=production -p 8080:8080 ${DOCKER_REGISTRY:+${DOCKER_REGISTRY}/}${DOCKER_CONTEXT_PATH}/${TARGET}-${TYPE}:${VERSION}"
9495

9596
# Run the compiled binary.
96-
ENTRYPOINT ["/usr/bin/dumb-init", "/app"]
97+
ENTRYPOINT ["/bin/dumb-init", "/app"]

‎Dockerfile.no_cgo

+13-12
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ FROM ghcr.io/xmlking/grpc-starter-kit/base:${BASE_VERSION} AS builder
88
# * CGO_ENABLED=0 to build a statically-linked executable
99
# * GOFLAGS=-mod=vendor to force `go build` to look into the `/vendor` folder.
1010
# * GOPROXY="https://nexus.mycomp.com,direct" to set corp nexus goproxy and fallback to direct.
11+
# * GOWORK=off to desable go.work which is used for local development
1112
# e.g., ENV CGO_ENABLED=0 GOFLAGS=-mod=vendor
12-
ENV CGO_ENABLED=0 GOOS=linux GOPROXY="https://proxy.golang.org,direct"
13+
ENV CGO_ENABLED=0 GOOS=linux GOPROXY="https://proxy.golang.org,direct" GOWORK=off
1314
# when runing behind corporate proxy, you may need following settings
1415
#ENV GOPRIVATE=github.com/mycomp
1516
#ENV GONOSUMDB=github.com/*,gopkg.in/*,google.golang.org/*,cloud.google.com/*
@@ -37,26 +38,26 @@ RUN go build -a \
3738
-o /app ./$TYPE/$TARGET/main.go
3839

3940
# Compress the binary
40-
# RUN upx --best --lzma /app
41+
RUN upx -v --ultra-brute --best /app || true
4142

4243
# Final stage: the running container.
44+
45+
# Use `static:debug` to create debuggable container. for prod, use `static:nonroot`
46+
#FROM gcr.io/distroless/static:debug AS final
4347
FROM gcr.io/distroless/static:nonroot AS final
4448

4549
# copy grpc-health-probe to use with readinessProbe
46-
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
47-
50+
COPY --from=builder --chown=nonroot:nonroot /bin/grpc_health_probe /bin/grpc_health_probe
4851
# copygrpcurl to use with livenessProbe
49-
COPY --from=builder /bin/grpcurl /bin/grpcurl
50-
52+
COPY --from=builder --chown=nonroot:nonroot /bin/grpcurl /bin/grpcurl
5153
# copy dumb-ini from base
52-
COPY --from=builder /usr/bin/dumb-init /usr/bin/dumb-init
53-
54-
# Import the compiled executable from the second stage.
54+
COPY --from=builder --chown=nonroot:nonroot /usr/bin/dumb-init /bin/dumb-init
55+
# copy the compiled executable from the second stage.
5556
ARG VERSION=0.0.1
5657
ARG TYPE=service
5758
ARG TARGET=account
58-
COPY --from=builder /app /app
59-
COPY --from=builder src/config /config
59+
COPY --from=builder --chown=nonroot:nonroot /app /app
60+
COPY --from=builder --chown=nonroot:nonroot src/config /config
6061

6162
# Declare the port on which the webserver will be exposed.
6263
# As we're going to run the executable as an unprivileged user, we can't bind
@@ -93,4 +94,4 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
9394
org.opencontainers.image.documentation="docker run -it -e CONFY_ENV=production -p 8080:8080 ${DOCKER_REGISTRY:+${DOCKER_REGISTRY}/}${DOCKER_CONTEXT_PATH}/${TARGET}-${TYPE}:${VERSION}"
9495

9596
# Run the compiled binary.
96-
ENTRYPOINT ["/usr/bin/dumb-init", "/app"]
97+
ENTRYPOINT ["/bin/dumb-init", "/app"]

‎Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ deploy/prod:
279279
################################################################################
280280
# Target: docker #
281281
################################################################################
282-
283282
docker docker-%:
284283
@if [ -z $(TARGET) ]; then \
285284
echo "Building images for all services..."; \
@@ -301,7 +300,7 @@ docker docker-%:
301300
done \
302301
else \
303302
echo "Building image for ${TARGET}-${TYPE}..."; \
304-
nerdctl build \
303+
nerdctl build --progress=plain \
305304
--build-arg VERSION=$(VERSION) \
306305
--build-arg TYPE=${TYPE} \
307306
--build-arg TARGET=${TARGET} \
@@ -322,7 +321,7 @@ docker_clean:
322321

323322
docker_push:
324323
@echo "Publishing images with VCS_REF=$(shell git rev-parse --short HEAD)"
325-
@nerdctl images -f "label=org.label-schema.vcs-ref=$(shell git rev-parse --short HEAD)" --format {{.Repository}}:{{.Tag}} | \
324+
@nerdctl images -f "label=org.opencontainers.image.ref.name=$(shell git rev-parse --short HEAD)" --format {{.Repository}}:{{.Tag}} | \
326325
while read -r image; do \
327326
echo Now pushing $$image; \
328327
nerdctl push $$image; \

‎apps/hello/go.mod

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,9 @@ go 1.18
44

55
require github.com/maxence-charriere/go-app/v9 v9.4.1
66

7-
require github.com/google/uuid v1.3.0 // indirect
7+
require (
8+
github.com/davecgh/go-spew v1.1.1 // indirect
9+
github.com/google/uuid v1.3.0 // indirect
10+
github.com/stretchr/testify v1.7.1 // indirect
11+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
12+
)

‎apps/hello/go.sum

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
21
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/gomarkdown/markdown v0.0.0-20210408062403-ad838ccf8cdd/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
44
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
55
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
66
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
7-
github.com/maxence-charriere/go-app/v9 v9.3.0 h1:PWNZWcme5hnMR9/cSdSRv+9WvPowETj0qhfy+3HCQRM=
8-
github.com/maxence-charriere/go-app/v9 v9.3.0/go.mod h1:zo0n1kh4OMKn7P+MrTUUi7QwUMU2HOfHsZ293TITtxI=
97
github.com/maxence-charriere/go-app/v9 v9.4.1 h1:uDrMIvjzkXwBjw5594i7ZqD5LY5iN7j1KeMImjWAYiw=
108
github.com/maxence-charriere/go-app/v9 v9.4.1/go.mod h1:zo0n1kh4OMKn7P+MrTUUi7QwUMU2HOfHsZ293TITtxI=
119
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1210
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1311
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
14-
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
1512
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
13+
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
1614
golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
1715
golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
1816
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -21,5 +19,5 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
2119
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
2220
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
2321
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
24-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
2522
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
23+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=

‎docs/introduction/makefile.md

+24-14
Original file line numberDiff line numberDiff line change
@@ -117,27 +117,29 @@ make release VERSION=v0.1.1 GITHUB_TOKEN=123...
117117

118118
#### Base
119119
This will build and publish base image: `ghcr.io/xmlking/grpc-starter-kit/base`
120+
Optionally set `nerdctl build --progress=plain` in `Makefile` to show **RUN** command output, to debug **nerdctl** builds
120121

121122
```bash
122-
make docker_base VERSION=v0.2.0
123-
# Sign the image with Keyless mode
124-
nerdctl push --sign=cosign ghcr.io/xmlking/grpc-starter-kit/base:v0.2.0
123+
make docker_base VERSION=v0.2.1
124+
# Sign and push the image with Keyless mode.Login if needed
125+
# echo $GITHUB_PACKAGES_TOKEN | nerdctl login ghcr.io -u xmlking --password-stdin
126+
nerdctl push --sign=cosign ghcr.io/xmlking/grpc-starter-kit/base:v0.2.1
125127
nerdctl push --sign=cosign ghcr.io/xmlking/grpc-starter-kit/base:latest
126-
# or keyless
127-
COSIGN_EXPERIMENTAL=1 cosign sign ghcr.io/xmlking/grpc-starter-kit/base:v0.2.0
128-
COSIGN_EXPERIMENTAL=1 cosign verify ghcr.io/xmlking/grpc-starter-kit/base:v0.2.0
128+
129+
# Verify the image with Keyless mode
130+
nerdctl pull --verify=cosign ghcr.io/xmlking/grpc-starter-kit/base:latest
129131
```
130132

131133
#### Services
132-
Optionally set `export DOCKER_BUILDKIT=1` to use `moby`
134+
Optionally set `nerdctl build --progress=plain` in `Makefile` to show **RUN** command output, to debug **nerdctl** builds
133135

134136
```bash
135-
make docker-account VERSION=v0.1.1
136-
make docker-account-service VERSION=v0.1.1
137-
make docker TARGET=account VERSION=v0.1.1
138-
make docker TARGET=account TYPE=service VERSION=v0.1.1
137+
make docker-account VERSION=v0.1.5
138+
make docker-account-service VERSION=v0.1.5
139+
make docker TARGET=account VERSION=v0.1.5
140+
make docker TARGET=account TYPE=service VERSION=v0.1.5
139141
make docker TARGET=account DOCKER_REGISTRY=us.gcr.io DOCKER_CONTEXT_PATH=<MY_PROJECT_ID>/grpc-starter-kit
140-
make docker TARGET=account DOCKER_REGISTRY=us.gcr.io DOCKER_CONTEXT_PATH=<MY_PROJECT_ID>/grpc-starter-kit BASE_VERSION=v0.1.0
142+
make docker TARGET=account DOCKER_REGISTRY=us.gcr.io DOCKER_CONTEXT_PATH=<MY_PROJECT_ID>/grpc-starter-kit BASE_VERSION=v0.2.1
141143
# short hand for TARGET and TYPE args
142144
make docker-emailer-service
143145

@@ -156,10 +158,18 @@ make docker_push
156158
make docker_clean
157159

158160
# explore and run
159-
dive ghcr.io/xmlking/grpc-starter-kit/account-service:v0.1.1
160-
nerdctl run --rm -it ghcr.io/xmlking/grpc-starter-kit/account-service:v0.1.1
161+
dive ghcr.io/xmlking/grpc-starter-kit/account-service:v0.1.5
162+
nerdctl run --rm -it ghcr.io/xmlking/grpc-starter-kit/account-service:v0.1.5
163+
# when built from `gcr.io/distroless/static:debug`, you can debug with:
164+
nerdctl run --rm -it --entrypoint=sh ghcr.io/xmlking/grpc-starter-kit/account-service:v0.1.5
165+
# Sign and push with Keyless mode
166+
# echo $GITHUB_PACKAGES_TOKEN | nerdctl login ghcr.io -u xmlking --password-stdin
167+
nerdctl push --sign=cosign ghcr.io/xmlking/grpc-starter-kit/account-service:v0.1.5
168+
# Verify the image with Keyless mode
169+
nerdctl pull --verify=cosign ghcr.io/xmlking/grpc-starter-kit/account-service:v0.1.5
161170
```
162171

172+
163173
### kustomize
164174

165175
> generate `build/kubernetes.yaml` for given `overlay` and `namespace` using **kustomize**

‎go.mod

-30
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,6 @@ module github.com/xmlking/grpc-starter-kit
22

33
go 1.18
44

5-
//replace github.com/xmlking/toolkit => ../toolkit
6-
7-
//replace github.com/xmlking/toolkit/confy => ../toolkit/confy
8-
9-
//replace github.com/xmlking/toolkit/logger => ../toolkit/logger
10-
11-
//replace github.com/xmlking/toolkit/telemetry => ../toolkit/telemetry
12-
13-
//replace github.com/xmlking/toolkit => github.com/xmlking/toolkit v0.1.2-0.20210125025404-51fc2d71fb2d
14-
15-
//replace github.com/xmlking/toolkit/xds => ../toolkit/xds
16-
17-
replace github.com/xmlking/toolkit/xds => github.com/xmlking/toolkit/xds v0.2.5-0.20220327073200-7a0bd5cf638b
18-
195
require (
206
entgo.io/contrib v0.2.0
217
entgo.io/ent v0.10.1
@@ -77,11 +63,8 @@ require (
7763
github.com/gogo/protobuf v1.3.2 // indirect
7864
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7965
github.com/google/go-cmp v0.5.7 // indirect
80-
github.com/google/gofuzz v1.1.0 // indirect
8166
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
82-
github.com/googleapis/gnostic v0.5.5 // indirect
8367
github.com/hashicorp/hcl/v2 v2.11.1 // indirect
84-
github.com/imdario/mergo v0.3.5 // indirect
8568
github.com/jhump/protoreflect v1.10.1 // indirect
8669
github.com/json-iterator/go v1.1.12 // indirect
8770
github.com/kr/pretty v0.3.0 // indirect
@@ -99,7 +82,6 @@ require (
9982
github.com/prometheus/common v0.32.1 // indirect
10083
github.com/prometheus/procfs v0.7.3 // indirect
10184
github.com/rogpeppe/go-internal v1.8.1 // indirect
102-
github.com/spf13/pflag v1.0.5 // indirect
10385
github.com/stoewer/go-strcase v1.2.0 // indirect
10486
github.com/stretchr/objx v0.3.0 // indirect
10587
github.com/zclconf/go-cty v1.10.0 // indirect
@@ -119,24 +101,12 @@ require (
119101
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
120102
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
121103
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
122-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
123104
golang.org/x/text v0.3.7 // indirect
124-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
125105
golang.org/x/tools v0.1.9-0.20211216111533-8d383106f7e7 // indirect
126106
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
127107
google.golang.org/api v0.65.0 // indirect
128108
google.golang.org/appengine v1.6.7 // indirect
129109
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
130-
gopkg.in/inf.v0 v0.9.1 // indirect
131110
gopkg.in/yaml.v2 v2.4.0 // indirect
132111
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
133-
k8s.io/api v0.23.5 // indirect
134-
k8s.io/apimachinery v0.23.5 // indirect
135-
k8s.io/client-go v0.23.5 // indirect
136-
k8s.io/klog/v2 v2.30.0 // indirect
137-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
138-
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
139-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
140-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
141-
sigs.k8s.io/yaml v1.2.0 // indirect
142112
)

0 commit comments

Comments
 (0)