Skip to content

Commit 5131c1f

Browse files
jetstack-botjetstack-bot
authored
Merge pull request cert-manager#56 from SgtCoDFish/bumpdeps
Bump deps + fix makefile
2 parents 140b81d + bfdd9cc commit 5131c1f

File tree

5 files changed

+229
-568
lines changed

5 files changed

+229
-568
lines changed

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19-alpine AS build_deps
1+
FROM golang:1.21-alpine3.18 AS build_deps
22

33
RUN apk add --no-cache git
44

@@ -15,7 +15,7 @@ COPY . .
1515

1616
RUN CGO_ENABLED=0 go build -o webhook -ldflags '-w -extldflags "-static"' .
1717

18-
FROM alpine:3.9
18+
FROM alpine:3.18
1919

2020
RUN apk add --no-cache ca-certificates
2121

‎Makefile

+21-18
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,39 @@ IMAGE_TAG := "latest"
77

88
OUT := $(shell pwd)/_out
99

10-
KUBE_VERSION=1.25.0
10+
KUBEBUILDER_VERSION=1.28.0
1111

12-
$(shell mkdir -p "$(OUT)")
13-
export TEST_ASSET_ETCD=_test/kubebuilder/etcd
14-
export TEST_ASSET_KUBE_APISERVER=_test/kubebuilder/kube-apiserver
15-
export TEST_ASSET_KUBECTL=_test/kubebuilder/kubectl
12+
HELM_FILES := $(shell find deploy/example-webhook)
1613

17-
test: _test/kubebuilder
14+
test: _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl
15+
TEST_ASSET_ETCD=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd \
16+
TEST_ASSET_KUBE_APISERVER=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver \
17+
TEST_ASSET_KUBECTL=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl \
1818
$(GO) test -v .
1919

20-
_test/kubebuilder:
21-
curl -fsSL https://go.kubebuilder.io/test-tools/$(KUBE_VERSION)/$(OS)/$(ARCH) -o kubebuilder-tools.tar.gz
22-
mkdir -p _test/kubebuilder
23-
tar -xvf kubebuilder-tools.tar.gz
24-
mv kubebuilder/bin/* _test/kubebuilder/
25-
rm kubebuilder-tools.tar.gz
26-
rm -R kubebuilder
20+
_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH).tar.gz: | _test
21+
curl -fsSL https://go.kubebuilder.io/test-tools/$(KUBEBUILDER_VERSION)/$(OS)/$(ARCH) -o $@
2722

28-
clean: clean-kubebuilder
23+
_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl: _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH).tar.gz | _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)
24+
tar xfO $< kubebuilder/bin/$(notdir $@) > $@ && chmod +x $@
2925

30-
clean-kubebuilder:
31-
rm -Rf _test/kubebuilder
26+
.PHONY: clean
27+
clean:
28+
rm -r _test $(OUT)
3229

30+
.PHONY: build
3331
build:
3432
docker build -t "$(IMAGE_NAME):$(IMAGE_TAG)" .
3533

3634
.PHONY: rendered-manifest.yaml
37-
rendered-manifest.yaml:
35+
rendered-manifest.yaml: $(OUT)/rendered-manifest.yaml
36+
37+
$(OUT)/rendered-manifest.yaml: $(HELM_FILES) | $(OUT)
3838
helm template \
3939
--name example-webhook \
4040
--set image.repository=$(IMAGE_NAME) \
4141
--set image.tag=$(IMAGE_TAG) \
42-
deploy/example-webhook > "$(OUT)/rendered-manifest.yaml"
42+
deploy/example-webhook > $@
43+
44+
_test $(OUT) _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH):
45+
mkdir -p $@

‎go.mod

+58-59
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,49 @@
11
module github.com/cert-manager/webhook-example
22

3-
go 1.19
4-
5-
// This is needed till a we release a version of cert-manager with https://github.com/cert-manager/cert-manager/pull/5736
6-
// The version was generated by adding replace github.com/cert-manager/cert-manager => github.com/cert-manager/cert-manager release-1.11 and running go mod tidy
7-
replace github.com/cert-manager/cert-manager => github.com/cert-manager/cert-manager v1.11.1-0.20230119150913-7ebb5f515e4f
3+
go 1.20
84

95
require (
10-
github.com/cert-manager/cert-manager v1.11.0
6+
github.com/cert-manager/cert-manager v1.12.6
117
github.com/miekg/dns v1.1.50
12-
github.com/stretchr/testify v1.8.1
13-
k8s.io/apiextensions-apiserver v0.26.0
14-
k8s.io/client-go v0.26.0
8+
github.com/stretchr/testify v1.8.4
9+
k8s.io/apiextensions-apiserver v0.27.2
10+
k8s.io/client-go v0.27.2
1511
)
1612

1713
require (
1814
github.com/NYTimes/gziphandler v1.1.1 // indirect
1915
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
16+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2017
github.com/beorn7/perks v1.0.1 // indirect
2118
github.com/blang/semver/v4 v4.0.0 // indirect
22-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
19+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2320
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2421
github.com/coreos/go-semver v0.3.0 // indirect
25-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
22+
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
2623
github.com/davecgh/go-spew v1.1.1 // indirect
2724
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2825
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
2926
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
3027
github.com/felixge/httpsnoop v1.0.3 // indirect
3128
github.com/fsnotify/fsnotify v1.6.0 // indirect
32-
github.com/go-logr/logr v1.2.3 // indirect
29+
github.com/go-logr/logr v1.2.4 // indirect
3330
github.com/go-logr/stdr v1.2.2 // indirect
31+
github.com/go-logr/zapr v1.2.4 // indirect
3432
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3533
github.com/go-openapi/jsonreference v0.20.1 // indirect
3634
github.com/go-openapi/swag v0.22.3 // indirect
3735
github.com/gogo/protobuf v1.3.2 // indirect
3836
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
39-
github.com/golang/protobuf v1.5.2 // indirect
40-
github.com/google/cel-go v0.12.5 // indirect
37+
github.com/golang/protobuf v1.5.3 // indirect
38+
github.com/google/cel-go v0.12.6 // indirect
4139
github.com/google/gnostic v0.6.9 // indirect
4240
github.com/google/go-cmp v0.5.9 // indirect
4341
github.com/google/gofuzz v1.2.0 // indirect
4442
github.com/google/uuid v1.3.0 // indirect
4543
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
46-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
44+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
4745
github.com/imdario/mergo v0.3.12 // indirect
48-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
46+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4947
github.com/josharian/intern v1.0.0 // indirect
5048
github.com/json-iterator/go v1.1.12 // indirect
5149
github.com/mailru/easyjson v0.7.7 // indirect
@@ -55,60 +53,61 @@ require (
5553
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5654
github.com/pkg/errors v0.9.1 // indirect
5755
github.com/pmezard/go-difflib v1.0.0 // indirect
58-
github.com/prometheus/client_golang v1.14.0 // indirect
59-
github.com/prometheus/client_model v0.3.0 // indirect
60-
github.com/prometheus/common v0.37.0 // indirect
61-
github.com/prometheus/procfs v0.8.0 // indirect
62-
github.com/spf13/cobra v1.6.1 // indirect
56+
github.com/prometheus/client_golang v1.15.1 // indirect
57+
github.com/prometheus/client_model v0.4.0 // indirect
58+
github.com/prometheus/common v0.42.0 // indirect
59+
github.com/prometheus/procfs v0.9.0 // indirect
60+
github.com/spf13/cobra v1.7.0 // indirect
6361
github.com/spf13/pflag v1.0.5 // indirect
6462
github.com/stoewer/go-strcase v1.2.0 // indirect
65-
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
66-
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
67-
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
68-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
69-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
70-
go.opentelemetry.io/otel v1.10.0 // indirect
71-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
72-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
73-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
74-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
75-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
76-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
77-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
63+
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
64+
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
65+
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
66+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
67+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
68+
go.opentelemetry.io/otel v1.19.0 // indirect
69+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
70+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
71+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
72+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
73+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
74+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
7875
go.uber.org/atomic v1.9.0 // indirect
7976
go.uber.org/multierr v1.6.0 // indirect
8077
go.uber.org/zap v1.24.0 // indirect
81-
golang.org/x/crypto v0.5.0 // indirect
82-
golang.org/x/mod v0.7.0 // indirect
83-
golang.org/x/net v0.5.0 // indirect
84-
golang.org/x/oauth2 v0.4.0 // indirect
85-
golang.org/x/sync v0.1.0 // indirect
86-
golang.org/x/sys v0.4.0 // indirect
87-
golang.org/x/term v0.4.0 // indirect
88-
golang.org/x/text v0.6.0 // indirect
78+
golang.org/x/crypto v0.15.0 // indirect
79+
golang.org/x/mod v0.10.0 // indirect
80+
golang.org/x/net v0.18.0 // indirect
81+
golang.org/x/oauth2 v0.10.0 // indirect
82+
golang.org/x/sync v0.3.0 // indirect
83+
golang.org/x/sys v0.14.0 // indirect
84+
golang.org/x/term v0.14.0 // indirect
85+
golang.org/x/text v0.14.0 // indirect
8986
golang.org/x/time v0.3.0 // indirect
90-
golang.org/x/tools v0.4.0 // indirect
87+
golang.org/x/tools v0.9.1 // indirect
9188
google.golang.org/appengine v1.6.7 // indirect
92-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
93-
google.golang.org/grpc v1.53.0 // indirect
94-
google.golang.org/protobuf v1.28.1 // indirect
89+
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
90+
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
91+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
92+
google.golang.org/grpc v1.58.3 // indirect
93+
google.golang.org/protobuf v1.31.0 // indirect
9594
gopkg.in/inf.v0 v0.9.1 // indirect
9695
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
9796
gopkg.in/yaml.v2 v2.4.0 // indirect
9897
gopkg.in/yaml.v3 v3.0.1 // indirect
99-
k8s.io/api v0.26.0 // indirect
100-
k8s.io/apimachinery v0.26.0 // indirect
101-
k8s.io/apiserver v0.26.0 // indirect
102-
k8s.io/component-base v0.26.0 // indirect
103-
k8s.io/klog/v2 v2.80.1 // indirect
104-
k8s.io/kms v0.26.0 // indirect
105-
k8s.io/kube-aggregator v0.26.0 // indirect
106-
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
107-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
108-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
109-
sigs.k8s.io/controller-runtime v0.14.1 // indirect
110-
sigs.k8s.io/gateway-api v0.6.0 // indirect
111-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
98+
k8s.io/api v0.27.2 // indirect
99+
k8s.io/apimachinery v0.27.2 // indirect
100+
k8s.io/apiserver v0.27.2 // indirect
101+
k8s.io/component-base v0.27.2 // indirect
102+
k8s.io/klog/v2 v2.100.1 // indirect
103+
k8s.io/kms v0.27.2 // indirect
104+
k8s.io/kube-aggregator v0.27.2 // indirect
105+
k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 // indirect
106+
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
107+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
108+
sigs.k8s.io/controller-runtime v0.15.0 // indirect
109+
sigs.k8s.io/gateway-api v0.7.0 // indirect
110+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
112111
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
113112
sigs.k8s.io/yaml v1.3.0 // indirect
114113
)

0 commit comments

Comments
 (0)