Skip to content

Commit 7533384

Browse files
returns back api to separate go module (#1007)
* returns back api to separate go module follow-up for a5d295b * fixed docker caching in CI (#1008) * fixed docker caching in CI * fix --------- Co-authored-by: Andrii Chubatiuk <andrew.chubatiuk@gmail.com>
1 parent 30835a4 commit 7533384

File tree

5 files changed

+330
-3
lines changed

5 files changed

+330
-3
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ ARG TARGETARCH
77

88
WORKDIR /workspace
99
# Copy the Go Modules manifests
10-
COPY go.mod go.mod
11-
COPY go.sum go.sum
10+
COPY go.* .
11+
COPY api/go.* api/
1212
# cache deps before building and copying source so that we don't need to re-download as much
1313
# and so that source changes don't invalidate our downloaded layer
1414
RUN go mod download

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
164164
--push \
165165
--platform=$(PLATFORMS) \
166166
--build-arg REPO=$(REPO) \
167-
$(DOCKER_BUILD_ARGS) \
167+
${DOCKER_BUILD_ARGS} \
168168
--tag $(REGISTRY)/$(ORG)/$(REPO):$(TAG) \
169169
--tag $(REGISTRY)/$(ORG)/$(REPO):$(BUILDINFO_TAG) \
170170
-f Dockerfile.cross .

api/go.mod

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
module github.com/VictoriaMetrics/operator/api
2+
3+
go 1.22.0
4+
5+
require (
6+
github.com/VictoriaMetrics/VictoriaMetrics v1.101.0
7+
github.com/onsi/ginkgo/v2 v2.17.2
8+
github.com/onsi/gomega v1.33.1
9+
github.com/stretchr/testify v1.9.0
10+
gopkg.in/yaml.v2 v2.4.0
11+
k8s.io/api v0.30.2
12+
k8s.io/apiextensions-apiserver v0.30.1
13+
k8s.io/apimachinery v0.30.2
14+
k8s.io/client-go v12.0.0+incompatible
15+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
16+
sigs.k8s.io/controller-runtime v0.18.4
17+
)
18+
19+
require (
20+
github.com/VictoriaMetrics/metrics v1.33.1 // indirect
21+
github.com/VictoriaMetrics/metricsql v0.75.1 // indirect
22+
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
24+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
25+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
27+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
28+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
29+
github.com/fsnotify/fsnotify v1.7.0 // indirect
30+
github.com/go-logr/logr v1.4.1 // indirect
31+
github.com/go-logr/zapr v1.3.0 // indirect
32+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
33+
github.com/go-openapi/jsonreference v0.20.2 // indirect
34+
github.com/go-openapi/swag v0.22.3 // indirect
35+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
36+
github.com/gogo/protobuf v1.3.2 // indirect
37+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
38+
github.com/golang/protobuf v1.5.4 // indirect
39+
github.com/google/gnostic-models v0.6.8 // indirect
40+
github.com/google/go-cmp v0.6.0 // indirect
41+
github.com/google/gofuzz v1.2.0 // indirect
42+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
43+
github.com/google/uuid v1.6.0 // indirect
44+
github.com/imdario/mergo v0.3.12 // indirect
45+
github.com/josharian/intern v1.0.0 // indirect
46+
github.com/json-iterator/go v1.1.12 // indirect
47+
github.com/klauspost/compress v1.17.8 // indirect
48+
github.com/mailru/easyjson v0.7.7 // indirect
49+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
50+
github.com/modern-go/reflect2 v1.0.2 // indirect
51+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
52+
github.com/pkg/errors v0.9.1 // indirect
53+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
54+
github.com/prometheus/client_golang v1.19.0 // indirect
55+
github.com/prometheus/client_model v0.6.1 // indirect
56+
github.com/prometheus/common v0.52.3 // indirect
57+
github.com/prometheus/procfs v0.13.0 // indirect
58+
github.com/spf13/pflag v1.0.5 // indirect
59+
github.com/valyala/bytebufferpool v1.0.0 // indirect
60+
github.com/valyala/fastjson v1.6.4 // indirect
61+
github.com/valyala/fastrand v1.1.0 // indirect
62+
github.com/valyala/fasttemplate v1.2.2 // indirect
63+
github.com/valyala/gozstd v1.20.1 // indirect
64+
github.com/valyala/histogram v1.2.0 // indirect
65+
github.com/valyala/quicktemplate v1.7.0 // indirect
66+
go.uber.org/multierr v1.11.0 // indirect
67+
go.uber.org/zap v1.26.0 // indirect
68+
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
69+
golang.org/x/net v0.24.0 // indirect
70+
golang.org/x/oauth2 v0.19.0 // indirect
71+
golang.org/x/sys v0.19.0 // indirect
72+
golang.org/x/term v0.19.0 // indirect
73+
golang.org/x/text v0.14.0 // indirect
74+
golang.org/x/time v0.5.0 // indirect
75+
golang.org/x/tools v0.20.0 // indirect
76+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
77+
google.golang.org/protobuf v1.33.0 // indirect
78+
gopkg.in/inf.v0 v0.9.1 // indirect
79+
gopkg.in/yaml.v3 v3.0.1 // indirect
80+
k8s.io/klog/v2 v2.120.1 // indirect
81+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
82+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
83+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
84+
sigs.k8s.io/yaml v1.4.0 // indirect
85+
)
86+
87+
replace (
88+
k8s.io/api => k8s.io/api v0.30.2
89+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.2
90+
k8s.io/apimachinery => k8s.io/apimachinery v0.30.2
91+
k8s.io/client-go => k8s.io/client-go v0.30.2
92+
k8s.io/component-base => k8s.io/component-base v0.30.2
93+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a
94+
)

0 commit comments

Comments
 (0)