Skip to content

Commit a3bb8e3

Browse files
Olivier BoudetOlivier Boudet
Olivier Boudet
authored and
Olivier Boudet
committed
upgrade cert-manager deps to 1.14.5 and go to 1.20
Signed-off-by: Olivier Boudet <olivier.boudet@devmachine.fr>
1 parent cfe56f8 commit a3bb8e3

File tree

10 files changed

+355
-1123
lines changed

10 files changed

+355
-1123
lines changed

.github/workflows/release-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Go
1616
uses: actions/setup-go@v2
1717
with:
18-
go-version: '1.15'
18+
go-version: '1.20'
1919
#- name: Tests
2020
# run: |
2121
# go version

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.18.0-alpine AS build_deps
1+
FROM golang:1.20.0-alpine AS build_deps
22

33
RUN apk add --no-cache git
44

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ IMAGE_TAG := "latest"
66

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

9-
KUBE_VERSION=1.24.1
9+
KUBE_VERSION=1.30.0
1010

1111
$(shell mkdir -p "$(OUT)")
1212
export TEST_ASSET_ETCD=_test/kubebuilder/bin/etcd

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ spec:
128128
Modify testdata/alidns-solver to add a valid token for alidns.
129129

130130
```
131-
TEST_ZONE_NAME=example.com. make test # replace example.com with a zone which belongs to given credentials
131+
# replace example.com with a zone which belongs to given credentials
132+
TEST_ASSET_ETCD=kubebuilder/bin/etcd TEST_ASSET_KUBE_APISERVER=kubebuilder/bin/kube-apiserver TEST_ASSET_KUBECTL=kubebuilder/bin/kubectl TEST_ZONE_NAME=example.com. make test .
132133
```
133134

134135
## Build

charts/alidns-webhook/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v1
2-
appVersion: "0.7.0"
2+
appVersion: "0.8.0"
33
description: Deploys alidns webhook for cert-manager.
44
name: alidns-webhook
5-
version: 0.7.0
5+
version: 0.8.0

charts/alidns-webhook/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ certManager:
1515

1616
image:
1717
repository: ghcr.io/devmachine-fr/cert-manager-alidns-webhook/cert-manager-alidns-webhook
18-
tag: 0.2.0
18+
tag: 0.3.0
1919
pullPolicy: IfNotPresent
2020
privateRegistry:
2121
enabled: false

go.mod

Lines changed: 89 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,114 @@
11
module github.com/olivierboudet/cert-manager-alidns-webhook
22

3-
go 1.18
3+
go 1.20
44

55
require (
6-
github.com/aliyun/alibaba-cloud-sdk-go v1.62.105
7-
github.com/cert-manager/cert-manager v1.9.1
6+
github.com/aliyun/alibaba-cloud-sdk-go v1.62.737
7+
github.com/cert-manager/cert-manager v1.14.5
88
github.com/pkg/errors v0.9.1
9-
k8s.io/apiextensions-apiserver v0.24.2
10-
k8s.io/apimachinery v0.24.2
11-
k8s.io/client-go v0.24.2
9+
k8s.io/apiextensions-apiserver v0.29.0
10+
k8s.io/apimachinery v0.29.0
11+
k8s.io/client-go v0.29.0
1212
)
1313

1414
require (
1515
github.com/NYTimes/gziphandler v1.1.1 // indirect
16-
github.com/PuerkitoBio/purell v1.1.1 // indirect
17-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
16+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
17+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
1818
github.com/beorn7/perks v1.0.1 // indirect
1919
github.com/blang/semver/v4 v4.0.0 // indirect
20-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
21-
github.com/coreos/go-semver v0.3.0 // indirect
22-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
23-
github.com/davecgh/go-spew v1.1.1 // indirect
24-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
25-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
26-
github.com/felixge/httpsnoop v1.0.1 // indirect
27-
github.com/fsnotify/fsnotify v1.5.1 // indirect
28-
github.com/go-logr/logr v1.2.2 // indirect
29-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
30-
github.com/go-openapi/jsonreference v0.19.5 // indirect
31-
github.com/go-openapi/swag v0.19.14 // indirect
20+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
21+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
22+
github.com/coreos/go-semver v0.3.1 // indirect
23+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
24+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
25+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
27+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
28+
github.com/felixge/httpsnoop v1.0.4 // 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/stdr v1.2.2 // indirect
32+
github.com/go-logr/zapr v1.3.0 // indirect
33+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
34+
github.com/go-openapi/jsonreference v0.20.4 // indirect
35+
github.com/go-openapi/swag v0.22.7 // indirect
3236
github.com/gogo/protobuf v1.3.2 // indirect
3337
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
34-
github.com/golang/protobuf v1.5.2 // indirect
35-
github.com/google/gnostic v0.6.9 // indirect
36-
github.com/google/go-cmp v0.5.6 // indirect
38+
github.com/golang/protobuf v1.5.3 // indirect
39+
github.com/google/cel-go v0.17.7 // indirect
40+
github.com/google/gnostic-models v0.6.8 // indirect
41+
github.com/google/go-cmp v0.6.0 // indirect
3742
github.com/google/gofuzz v1.2.0 // indirect
38-
github.com/google/uuid v1.3.0 // indirect
43+
github.com/google/uuid v1.5.0 // indirect
3944
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
40-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
41-
github.com/imdario/mergo v0.3.12 // indirect
42-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
43-
github.com/jmespath/go-jmespath v0.4.0 // indirect
45+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
46+
github.com/imdario/mergo v0.3.16 // indirect
47+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
48+
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
4449
github.com/josharian/intern v1.0.0 // indirect
4550
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/mailru/easyjson v0.7.6 // indirect
47-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
48-
github.com/miekg/dns v1.1.47 // indirect
51+
github.com/mailru/easyjson v0.7.7 // indirect
52+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
53+
github.com/miekg/dns v1.1.57 // indirect
4954
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5055
github.com/modern-go/reflect2 v1.0.2 // indirect
5156
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5257
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
53-
github.com/prometheus/client_golang v1.12.1 // indirect
54-
github.com/prometheus/client_model v0.2.0 // indirect
55-
github.com/prometheus/common v0.32.1 // indirect
56-
github.com/prometheus/procfs v0.7.3 // indirect
57-
github.com/spf13/cobra v1.4.0 // indirect
58+
github.com/prometheus/client_golang v1.18.0 // indirect
59+
github.com/prometheus/client_model v0.5.0 // indirect
60+
github.com/prometheus/common v0.45.0 // indirect
61+
github.com/prometheus/procfs v0.12.0 // indirect
62+
github.com/spf13/cobra v1.8.0 // indirect
5863
github.com/spf13/pflag v1.0.5 // indirect
59-
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
60-
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
61-
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
62-
go.opentelemetry.io/contrib v0.20.0 // indirect
63-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
64-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
65-
go.opentelemetry.io/otel v1.3.0 // indirect
66-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
67-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
68-
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
69-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
70-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
71-
go.opentelemetry.io/otel/trace v1.3.0 // indirect
72-
go.opentelemetry.io/proto/otlp v0.11.0 // indirect
73-
go.uber.org/atomic v1.9.0 // indirect
74-
go.uber.org/multierr v1.6.0 // indirect
75-
go.uber.org/zap v1.19.1 // indirect
76-
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
77-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
78-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
79-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
80-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
81-
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
82-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
83-
golang.org/x/text v0.3.7 // indirect
84-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
85-
golang.org/x/tools v0.1.10 // indirect
86-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
87-
google.golang.org/appengine v1.6.7 // indirect
88-
google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 // indirect
89-
google.golang.org/grpc v1.43.0 // indirect
90-
google.golang.org/protobuf v1.27.1 // indirect
64+
github.com/stoewer/go-strcase v1.3.0 // indirect
65+
go.etcd.io/etcd/api/v3 v3.5.11 // indirect
66+
go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
67+
go.etcd.io/etcd/client/v3 v3.5.11 // indirect
68+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
69+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
70+
go.opentelemetry.io/otel v1.21.0 // indirect
71+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
72+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
73+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
74+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
75+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
76+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
77+
go.uber.org/multierr v1.11.0 // indirect
78+
go.uber.org/zap v1.26.0 // indirect
79+
golang.org/x/crypto v0.22.0 // indirect
80+
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
81+
golang.org/x/mod v0.14.0 // indirect
82+
golang.org/x/net v0.24.0 // indirect
83+
golang.org/x/oauth2 v0.15.0 // indirect
84+
golang.org/x/sync v0.5.0 // indirect
85+
golang.org/x/sys v0.19.0 // indirect
86+
golang.org/x/term v0.19.0 // indirect
87+
golang.org/x/text v0.14.0 // indirect
88+
golang.org/x/time v0.5.0 // indirect
89+
golang.org/x/tools v0.16.1 // indirect
90+
google.golang.org/appengine v1.6.8 // indirect
91+
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
92+
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
93+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
94+
google.golang.org/grpc v1.60.1 // indirect
95+
google.golang.org/protobuf v1.33.0 // indirect
9196
gopkg.in/inf.v0 v0.9.1 // indirect
92-
gopkg.in/ini.v1 v1.66.2 // indirect
93-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
97+
gopkg.in/ini.v1 v1.67.0 // indirect
98+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
9499
gopkg.in/yaml.v2 v2.4.0 // indirect
95-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
96-
k8s.io/api v0.24.2 // indirect
97-
k8s.io/apiserver v0.24.2 // indirect
98-
k8s.io/component-base v0.24.2 // indirect
99-
k8s.io/klog/v2 v2.70.0 // indirect
100-
k8s.io/kube-aggregator v0.24.2 // indirect
101-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
102-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
103-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
104-
sigs.k8s.io/controller-runtime v0.11.2 // indirect
105-
sigs.k8s.io/gateway-api v0.4.3 // indirect
106-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
107-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
108-
sigs.k8s.io/yaml v1.3.0 // indirect
109-
)
110-
111-
replace (
112-
github.com/containerd/containerd => github.com/containerd/containerd v1.5.10
113-
github.com/miekg/dns v1.1.41 => github.com/miekg/dns v1.1.34
114-
go.opentelemetry.io/contrib => go.opentelemetry.io/contrib v0.20.0
115-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0
116-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0
117-
go.opentelemetry.io/otel => go.opentelemetry.io/otel v0.20.0
118-
go.opentelemetry.io/otel/exporters/otlp => go.opentelemetry.io/otel/exporters/otlp v0.20.0
119-
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v0.20.0
120-
go.opentelemetry.io/otel/oteltest => go.opentelemetry.io/otel/oteltest v0.20.0
121-
go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v0.20.0
122-
go.opentelemetry.io/otel/sdk/export/metric => go.opentelemetry.io/otel/sdk/export/metric v0.20.0
123-
go.opentelemetry.io/otel/sdk/metric => go.opentelemetry.io/otel/sdk/metric v0.20.0
124-
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v0.20.0
125-
go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.7.0
126-
golang.org/x/net => golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
127-
128-
// Update gengo to ensure we have the --trim-path-prefix feature in code-generator tools.
129-
k8s.io/gengo => k8s.io/gengo v0.0.0-20211115164449-b448ea381d54
100+
gopkg.in/yaml.v3 v3.0.1 // indirect
101+
k8s.io/api v0.29.0 // indirect
102+
k8s.io/apiserver v0.29.0 // indirect
103+
k8s.io/component-base v0.29.0 // indirect
104+
k8s.io/klog/v2 v2.110.1 // indirect
105+
k8s.io/kms v0.29.0 // indirect
106+
k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 // indirect
107+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
108+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
109+
sigs.k8s.io/controller-runtime v0.16.3 // indirect
110+
sigs.k8s.io/gateway-api v1.0.0 // indirect
111+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
112+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
113+
sigs.k8s.io/yaml v1.4.0 // indirect
130114
)

0 commit comments

Comments
 (0)