Skip to content
This repository was archived by the owner on Oct 10, 2023. It is now read-only.

Commit 3683867

Browse files
avi-08avi-08
committed
Use per component dockerfile for optimizing build process
1 parent dc348ad commit 3683867

File tree

13 files changed

+116
-68
lines changed

13 files changed

+116
-68
lines changed

‎.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ hack/
44
packages/
55
docs/
66
test/
7+
*.Dockerfile

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,6 @@ coverage.txt
5252
/build
5353
/packages/package-values-sha256.yaml
5454
/packages/**/.imgpkg
55+
56+
# Build files related to build-tooling
57+
*.Dockerfile

‎Dockerfile

+7-12
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,32 @@ ARG COMPONENT
1111
ARG GOPROXY_ARG
1212
ENV GOPROXY=${GOPROXY_ARG}
1313
WORKDIR /workspace
14-
COPY "$COMPONENT"/go.* ./
14+
COPY "$COMPONENT" "$COMPONENT"
1515
RUN --mount=type=cache,target=/go/pkg/mod \
16-
go mod download
16+
cd $COMPONENT && go mod download
1717

1818
# Linting
1919
FROM harbor-repo.vmware.com/dockerhub-proxy-cache/golangci/golangci-lint:v1.50 AS lint-base
2020
FROM base AS lint
21-
RUN --mount=target=. \
22-
--mount=from=lint-base,src=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint \
21+
RUN --mount=from=lint-base,src=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint \
2322
--mount=type=cache,target=/go/pkg/mod \
2423
--mount=type=cache,target=/root/.cache/go-build \
2524
--mount=type=cache,target=/root/.cache/golangci-lint \
2625
cd $COMPONENT && golangci-lint run --config /workspace/.golangci.yaml --timeout 10m0s ./...
2726

2827
FROM base AS fmt
29-
RUN --mount=target=. \
30-
--mount=type=cache,target=/go/pkg/mod \
28+
RUN --mount=type=cache,target=/go/pkg/mod \
3129
--mount=type=cache,target=/root/.cache/go-build \
3230
cd $COMPONENT && go fmt ./...
3331

3432
FROM base AS vet
35-
RUN --mount=target=. \
36-
--mount=type=cache,target=/go/pkg/mod \
33+
RUN --mount=type=cache,target=/go/pkg/mod \
3734
--mount=type=cache,target=/root/.cache/go-build \
3835
cd $COMPONENT && go vet ./...
3936

4037
# Testing
4138
FROM base AS test
42-
RUN --mount=target=. \
43-
--mount=type=cache,target=/go/pkg/mod \
39+
RUN --mount=type=cache,target=/go/pkg/mod \
4440
--mount=type=cache,target=/root/.cache/go-build \
4541
cd $COMPONENT && mkdir /out && go test -v -coverprofile=/out/cover.out ./...
4642

@@ -50,8 +46,7 @@ ARG TARGETOS
5046
ARG TARGETARCH
5147
ARG LD_FLAGS
5248
ENV LD_FLAGS="$LD_FLAGS "'-extldflags "-static"'
53-
RUN --mount=target=. \
54-
--mount=type=cache,target=/go/pkg/mod \
49+
RUN --mount=type=cache,target=/go/pkg/mod \
5550
cd $COMPONENT && CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GO111MODULE=on go build -o /out/manager ./main.go
5651

5752
# Use distroless as minimal base image to package the manager binary

‎build-tooling.mk

+19-11
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ IMG_VERSION_OVERRIDE ?= $(IMG_DEFAULT_TAG)
1313
GOPROXY ?= "https://proxy.golang.org,direct"
1414
PLATFORM=local
1515
# check out step 2 in this documentation on how to set the COMPONENTS variable https://github.com/vmware-tanzu/build-tooling-for-integrations/blob/main/docs/build-tooling-getting-started.md
16-
COMPONENTS ?= capabilities/client capabilities/controller.capabilities-controller-manager.capabilities featuregates/client featuregates/controller.featuregates-controller-manager.featuregates
16+
COMPONENTS ?= capabilities/client \
17+
capabilities/controller.capabilities-controller-manager.capabilities \
18+
featuregates/client \
19+
featuregates/controller.featuregates-controller-manager.featuregates
1720

1821
BUILD_TOOLING_CONTAINER_IMAGE ?= ghcr.io/vmware-tanzu/build-tooling
1922
PACKAGING_CONTAINER_IMAGE ?= ghcr.io/vmware-tanzu/package-tooling
@@ -23,6 +26,9 @@ VERSION ?= v0.0.2
2326
find_main_go = $(shell find $(1) -name main.go)
2427
check_main_go = $(if $(call find_main_go,$(1)),Found,NotFound)
2528

29+
# utility function to generate component-specific Dockerfiles
30+
template_dockerfile = $(shell ./template-dockerfile.sh $(1))
31+
2632
##
2733
## Project Initialization Targets
2834
##
@@ -99,6 +105,8 @@ package-all: package-bundle-generate-all package-bundle-push-all
99105
.PHONY: $(COMPONENTS)
100106
$(COMPONENTS):
101107
$(eval COMPONENT_PATH = $(word 1,$(subst ., ,$@)))
108+
@echo "$(call template_dockerfile,$(COMPONENT_PATH))"
109+
$(eval COMPONENT_DOCKERFILE = $(word 1,$(subst /,.,$(COMPONENT_PATH))).Dockerfile)
102110
$(eval IMAGE_NAME = $(word 2,$(subst ., ,$@)))
103111
$(eval PACKAGE_PATH = $(word 3,$(subst ., ,$@)))
104112
$(eval IMAGE = $(IMAGE_NAME):$(IMG_VERSION_OVERRIDE))
@@ -111,7 +119,7 @@ $(COMPONENTS):
111119
$(MAKE) publish IMAGE=$(IMAGE) DEFAULT_IMAGE=$(DEFAULT_IMAGE) PACKAGE_PATH=$(PACKAGE_PATH) BUILD_BIN=$(BUILD_BIN); \
112120
fi \
113121
else \
114-
$(MAKE) build COMPONENT=$(COMPONENT) IMAGE_NAME=$(IMAGE_NAME) IMAGE=$(IMAGE) PACKAGE_PATH=$(PACKAGE_PATH) BUILD_BIN=$(BUILD_BIN); \
122+
$(MAKE) build COMPONENT=$(COMPONENT) COMPONENT_DOCKERFILE=$(COMPONENT_DOCKERFILE) IMAGE_NAME=$(IMAGE_NAME) IMAGE=$(IMAGE) PACKAGE_PATH=$(PACKAGE_PATH) BUILD_BIN=$(BUILD_BIN); \
115123
fi
116124

117125
.PHONY: validate-component
@@ -124,7 +132,7 @@ endif
124132

125133
.PHONY: build
126134
build:
127-
$(MAKE) COMPONENT=$(COMPONENT) test
135+
$(MAKE) COMPONENT=$(COMPONENT) COMPONENT_DOCKERFILE=$(COMPONENT_DOCKERFILE) test
128136
@if [ "$(call check_main_go,$(COMPONENT))" = "Found" ]; then \
129137
if [ "$(BUILD_BIN)" = "true" ]; then \
130138
$(MAKE) COMPONENT=$(COMPONENT) binary-build; \
@@ -144,37 +152,37 @@ publish:
144152
lint:
145153
ifneq ($(strip $(COMPONENT)),.)
146154
cp .golangci.yaml $(COMPONENT)
147-
$(DOCKER) build . -f Dockerfile --target lint --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
155+
$(DOCKER) build . -f $(COMPONENT_DOCKERFILE) --target lint --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
148156
rm -rf $(COMPONENT)/.golangci.yaml
149157
else
150-
$(DOCKER) build . -f Dockerfile --target lint --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
158+
$(DOCKER) build . -f $(COMPONENT_DOCKERFILE) --target lint --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
151159
endif
152160

153161
.PHONY: fmt
154162
# Run go fmt against code
155163
fmt:
156-
$(DOCKER) build . -f Dockerfile --target fmt --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
164+
$(DOCKER) build . -f $(COMPONENT_DOCKERFILE) --target fmt --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
157165

158166
.PHONY: vet
159167
# Perform static analysis of code
160168
vet:
161-
$(DOCKER) build . -f Dockerfile --target vet --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
169+
$(DOCKER) build . -f $(COMPONENT_DOCKERFILE) --target vet --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
162170

163171
.PHONY: test
164172
# Run tests
165173
test: fmt vet
166-
$(DOCKER) build . -f Dockerfile --target test --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
167-
@$(DOCKER) build . -f Dockerfile --target unit-test-coverage --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY) --output build/$(COMPONENT)/coverage
174+
$(DOCKER) build . -f $(COMPONENT_DOCKERFILE) --target test --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
175+
@$(DOCKER) build . -f $(COMPONENT_DOCKERFILE) --target unit-test-coverage --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY) --output build/$(COMPONENT)/coverage
168176

169177
.PHONY: binary-build
170178
# Build the binary
171179
binary-build:
172-
$(DOCKER) build . -f Dockerfile --build-arg LD_FLAGS="$(LD_FLAGS)" --target bin --output build/$(COMPONENT)/bin --platform ${PLATFORM} --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
180+
$(DOCKER) build . -f $(COMPONENT_DOCKERFILE) --build-arg LD_FLAGS="$(LD_FLAGS)" --target bin --output build/$(COMPONENT)/bin --platform ${PLATFORM} --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
173181

174182
.PHONY: docker-build
175183
# Build docker image
176184
docker-build:
177-
$(DOCKER) build . -t $(IMAGE) -f Dockerfile --target image --platform linux/amd64 --build-arg LD_FLAGS="$(LD_FLAGS)" --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
185+
$(DOCKER) build . -t $(IMAGE) -f $(COMPONENT_DOCKERFILE) --target image --platform linux/amd64 --build-arg LD_FLAGS="$(LD_FLAGS)" --build-arg COMPONENT=$(COMPONENT) --build-arg GOPROXY_ARG=$(GOPROXY)
178186

179187
.PHONY: docker-publish
180188
# Publish docker image

‎capabilities/client/go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ module github.com/vmware-tanzu/tanzu-framework/capabilities/client
22

33
go 1.18
44

5+
replace github.com/vmware-tanzu/tanzu-framework/apis/run => ../../apis/run
6+
57
require (
68
github.com/google/gnostic v0.5.7-v3refs
7-
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-20230119181514-3c34115bc248
9+
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-00010101000000-000000000000
810
gopkg.in/yaml.v3 v3.0.1
911
k8s.io/api v0.24.2
1012
k8s.io/apimachinery v0.24.2

‎capabilities/client/go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -514,8 +514,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
514514
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
515515
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
516516
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
517-
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-20230119181514-3c34115bc248 h1:Oxp+iTBH105m9YnkvOF76wH8mNHUdLYPhf+aC70ZTyM=
518-
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-20230119181514-3c34115bc248/go.mod h1:8Kx/YbIyv07c3UZKVkb6i/jp0imJelAQS3YaDwXYM54=
519517
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
520518
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
521519
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

‎capabilities/controller/go.mod

+9-5
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,22 @@ module github.com/vmware-tanzu/tanzu-framework/capabilities/controller
33
go 1.18
44

55
replace (
6-
github.com/vmware-tanzu/tanzu-framework/apis/cli => github.com/vmware-tanzu/tanzu-framework/apis/cli v0.0.0-20230119181514-3c34115bc248
6+
github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../apis/cli
7+
github.com/vmware-tanzu/tanzu-framework/apis/core => ../../apis/core
8+
github.com/vmware-tanzu/tanzu-framework/apis/run => ../../apis/run
9+
github.com/vmware-tanzu/tanzu-framework/capabilities/client => ../client
10+
github.com/vmware-tanzu/tanzu-framework/cli/runtime => ../../cli/runtime
711
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.8
812
)
913

1014
require (
1115
github.com/go-logr/logr v1.2.3
1216
github.com/onsi/ginkgo v1.16.5
1317
github.com/onsi/gomega v1.19.0
14-
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-20230119181514-3c34115bc248
15-
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-20230119181514-3c34115bc248
16-
github.com/vmware-tanzu/tanzu-framework/capabilities/client v0.0.0-20230119181514-3c34115bc248
17-
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-20230119181514-3c34115bc248
18+
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-00010101000000-000000000000
19+
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-00010101000000-000000000000
20+
github.com/vmware-tanzu/tanzu-framework/capabilities/client v0.0.0-00010101000000-000000000000
21+
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-00010101000000-000000000000
1822
k8s.io/api v0.24.2
1923
k8s.io/apimachinery v0.24.2
2024
k8s.io/client-go v0.24.2

‎capabilities/controller/go.sum

-8
Original file line numberDiff line numberDiff line change
@@ -493,14 +493,6 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK
493493
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
494494
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
495495
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
496-
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-20230119181514-3c34115bc248 h1:mb+EBlaJ5NSS9LIS1zJer9p3u74wv2Wo0iWP0JWTd2k=
497-
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-20230119181514-3c34115bc248/go.mod h1:vjqilqQVGbzt4XpV8gEoLnehe7/IfQ49wikteZpKngU=
498-
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-20230119181514-3c34115bc248 h1:Oxp+iTBH105m9YnkvOF76wH8mNHUdLYPhf+aC70ZTyM=
499-
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-20230119181514-3c34115bc248/go.mod h1:8Kx/YbIyv07c3UZKVkb6i/jp0imJelAQS3YaDwXYM54=
500-
github.com/vmware-tanzu/tanzu-framework/capabilities/client v0.0.0-20230119181514-3c34115bc248 h1:VSbPOzDdpJ0cAmCt221Y8+KXAmb/h5XfsMQ84NBgsZ8=
501-
github.com/vmware-tanzu/tanzu-framework/capabilities/client v0.0.0-20230119181514-3c34115bc248/go.mod h1:rcIfoGpdav3evsyEMMzYH0xhGZOkIy+Ra3koypM8Aco=
502-
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-20230119181514-3c34115bc248 h1:LsJU0l37dcA9AMhtCNQUp5EVIzvEJN4tulZ0NQcZvP4=
503-
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-20230119181514-3c34115bc248/go.mod h1:VVSZnVr/a+jvXV0heOJS8CPHtqPG+RPmjGMpOowUsb0=
504496
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
505497
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
506498
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

‎featuregates/client/go.mod

+11-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@ module github.com/vmware-tanzu/tanzu-framework/featuregates/client
22

33
go 1.18
44

5-
replace github.com/vmware-tanzu/tanzu-framework/apis/cli => github.com/vmware-tanzu/tanzu-framework/apis/cli v0.0.0-20230119181514-3c34115bc248
5+
replace (
6+
github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../apis/cli
7+
github.com/vmware-tanzu/tanzu-framework/apis/config => ../../apis/config
8+
github.com/vmware-tanzu/tanzu-framework/apis/core => ../../apis/core
9+
github.com/vmware-tanzu/tanzu-framework/cli/runtime => ../../cli/runtime
10+
github.com/vmware-tanzu/tanzu-framework/util => ../../util
11+
)
612

713
require (
8-
github.com/vmware-tanzu/tanzu-framework/apis/config v0.0.0-20230302191204-eb0dfd6919e5
9-
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-20230302191204-eb0dfd6919e5
10-
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-20230302191204-eb0dfd6919e5
11-
github.com/vmware-tanzu/tanzu-framework/util v0.0.0-20230302191204-eb0dfd6919e5
14+
github.com/vmware-tanzu/tanzu-framework/apis/config v0.0.0-00010101000000-000000000000
15+
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-00010101000000-000000000000
16+
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-00010101000000-000000000000
17+
github.com/vmware-tanzu/tanzu-framework/util v0.0.0-00010101000000-000000000000
1218
k8s.io/api v0.24.4
1319
k8s.io/apimachinery v0.24.4
1420
k8s.io/client-go v0.24.4

‎featuregates/client/go.sum

-10
Original file line numberDiff line numberDiff line change
@@ -479,16 +479,6 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
479479
github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk=
480480
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
481481
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
482-
github.com/vmware-tanzu/tanzu-framework/apis/cli v0.0.0-20230119181514-3c34115bc248 h1:TMSOwZ7IXybuypRiHF3tmLDe8x6ozQFez5XEcLnqkoI=
483-
github.com/vmware-tanzu/tanzu-framework/apis/cli v0.0.0-20230119181514-3c34115bc248/go.mod h1:ADpe65BsXH5KM6W5b03PQ3+nVsiyc9CWVhT4tkYpNTE=
484-
github.com/vmware-tanzu/tanzu-framework/apis/config v0.0.0-20230302191204-eb0dfd6919e5 h1:n+l2BMo/VYjhhr8bKctFazZm39W+33vnx2p29BKoTo8=
485-
github.com/vmware-tanzu/tanzu-framework/apis/config v0.0.0-20230302191204-eb0dfd6919e5/go.mod h1:mMCXB73fu7O3mGuk5kqV64oMyjQtw47p/5kAjutqTCw=
486-
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-20230302191204-eb0dfd6919e5 h1:y73lXBPJ8PhvMAn+YIaFOmhhynz9i3mN0ywuYqem+io=
487-
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-20230302191204-eb0dfd6919e5/go.mod h1:vjqilqQVGbzt4XpV8gEoLnehe7/IfQ49wikteZpKngU=
488-
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-20230302191204-eb0dfd6919e5 h1:CGWFUG8ByfRdzelx81gRmys8Uy+omNIX17Uym2V6FbA=
489-
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-20230302191204-eb0dfd6919e5/go.mod h1:VVSZnVr/a+jvXV0heOJS8CPHtqPG+RPmjGMpOowUsb0=
490-
github.com/vmware-tanzu/tanzu-framework/util v0.0.0-20230302191204-eb0dfd6919e5 h1:pNtm/GlXHfOUqRn8tACArYEgPqZHBeguXJLdURZYUo8=
491-
github.com/vmware-tanzu/tanzu-framework/util v0.0.0-20230302191204-eb0dfd6919e5/go.mod h1:Ow3hZsiCqpkPuS1Nc/fclFiq0OzATz90YHd5RZYLeHg=
492482
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
493483
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
494484
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=

‎featuregates/controller/go.mod

+12-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,23 @@ module github.com/vmware-tanzu/tanzu-framework/featuregates/controller
22

33
go 1.18
44

5-
replace github.com/vmware-tanzu/tanzu-framework/util => github.com/vmware-tanzu/tanzu-framework/util v0.0.0-20230119181514-3c34115bc248
5+
replace (
6+
github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../apis/cli
7+
github.com/vmware-tanzu/tanzu-framework/apis/config => ../../apis/config
8+
github.com/vmware-tanzu/tanzu-framework/apis/core => ../../apis/core
9+
github.com/vmware-tanzu/tanzu-framework/cli/runtime => ../../cli/runtime
10+
github.com/vmware-tanzu/tanzu-framework/featuregates/client => ../client
11+
github.com/vmware-tanzu/tanzu-framework/util => ../../util
12+
)
613

714
require (
815
github.com/go-logr/logr v1.2.3
916
github.com/onsi/ginkgo v1.16.5
1017
github.com/onsi/gomega v1.20.2
11-
github.com/vmware-tanzu/tanzu-framework/apis/config v0.0.0-20230302191204-eb0dfd6919e5
12-
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-20230302191204-eb0dfd6919e5
13-
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-20230302191204-eb0dfd6919e5
14-
github.com/vmware-tanzu/tanzu-framework/featuregates/client v0.0.0-20230302191204-eb0dfd6919e5
18+
github.com/vmware-tanzu/tanzu-framework/apis/config v0.0.0-20220824221239-af5a644ffef7
19+
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-00010101000000-000000000000
20+
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-00010101000000-000000000000
21+
github.com/vmware-tanzu/tanzu-framework/featuregates/client v0.0.0-20221024130358-59eae49d96aa
1522
k8s.io/api v0.24.4
1623
k8s.io/apimachinery v0.24.4
1724
k8s.io/client-go v0.24.4

‎featuregates/controller/go.sum

-9
Original file line numberDiff line numberDiff line change
@@ -466,15 +466,6 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK
466466
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
467467
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
468468
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
469-
github.com/vmware-tanzu/tanzu-framework/apis/config v0.0.0-20230302191204-eb0dfd6919e5 h1:n+l2BMo/VYjhhr8bKctFazZm39W+33vnx2p29BKoTo8=
470-
github.com/vmware-tanzu/tanzu-framework/apis/config v0.0.0-20230302191204-eb0dfd6919e5/go.mod h1:mMCXB73fu7O3mGuk5kqV64oMyjQtw47p/5kAjutqTCw=
471-
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-20230302191204-eb0dfd6919e5 h1:y73lXBPJ8PhvMAn+YIaFOmhhynz9i3mN0ywuYqem+io=
472-
github.com/vmware-tanzu/tanzu-framework/apis/core v0.0.0-20230302191204-eb0dfd6919e5/go.mod h1:vjqilqQVGbzt4XpV8gEoLnehe7/IfQ49wikteZpKngU=
473-
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-20230302191204-eb0dfd6919e5 h1:CGWFUG8ByfRdzelx81gRmys8Uy+omNIX17Uym2V6FbA=
474-
github.com/vmware-tanzu/tanzu-framework/cli/runtime v0.0.0-20230302191204-eb0dfd6919e5/go.mod h1:VVSZnVr/a+jvXV0heOJS8CPHtqPG+RPmjGMpOowUsb0=
475-
github.com/vmware-tanzu/tanzu-framework/featuregates/client v0.0.0-20230302191204-eb0dfd6919e5 h1:HBWQ2tFQtlNfKnpppeqnj4zMIOpnV9+1s/3q+lFZ0o0=
476-
github.com/vmware-tanzu/tanzu-framework/featuregates/client v0.0.0-20230302191204-eb0dfd6919e5/go.mod h1:HQ3kjXE9xlTlamncfjZ6TgChn+Jk9JU3gI+3qS5QQFk=
477-
github.com/vmware-tanzu/tanzu-framework/util v0.0.0-20230119181514-3c34115bc248 h1:ZL/dT/T8o2mtIyqNxQYAO71qRBycpYnScXML5eCWjYs=
478469
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
479470
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
480471
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=

0 commit comments

Comments
 (0)