Skip to content

Commit fcd9a11

Browse files
jetstack-botjetstack-bot
authored
Merge pull request #219 from SgtCoDFish/bumpdeps
Dependency bumps
2 parents eed2960 + 71af17d commit fcd9a11

File tree

10 files changed

+1459
-739
lines changed

10 files changed

+1459
-739
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the istio-csr binary
16-
FROM docker.io/library/golang:1.20 as builder
16+
FROM docker.io/library/golang:1.21 as builder
1717

1818
WORKDIR /workspace
1919
# Copy the Go Modules manifests

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ARCH ?= $(shell go env GOARCH)
1717
ISTIO_VERSION ?= 1.17.2
1818
K8S_VERSION ?= 1.27.1
1919
IMAGE_PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le
20-
VERSION_TAG=v0.7.0
20+
VERSION_TAG=v0.7.1
2121

2222
UNAME_S := $(shell uname -s)
2323
ifeq ($(UNAME_S),Linux)

‎cmd/app/app.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
clientv1 "k8s.io/client-go/kubernetes/typed/core/v1"
3030
"k8s.io/client-go/tools/record"
3131
ctrl "sigs.k8s.io/controller-runtime"
32+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3233

3334
"github.com/cert-manager/istio-csr/cmd/app/options"
3435
"github.com/cert-manager/istio-csr/pkg/certmanager"
@@ -86,8 +87,10 @@ func NewCommand(ctx context.Context) *cobra.Command {
8687
LeaderElectionReleaseOnCancel: true,
8788
ReadinessEndpointName: opts.ReadyzPath,
8889
HealthProbeBindAddress: fmt.Sprintf("0.0.0.0:%d", opts.ReadyzPort),
89-
MetricsBindAddress: fmt.Sprintf("0.0.0.0:%d", opts.MetricsPort),
90-
Logger: mlog,
90+
Metrics: metricsserver.Options{
91+
BindAddress: fmt.Sprintf("0.0.0.0:%d", opts.MetricsPort),
92+
},
93+
Logger: mlog,
9194
})
9295
if err != nil {
9396
return fmt.Errorf("failed to create manager: %w", err)

‎deploy/charts/istio-csr/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ maintainers:
1212
sources:
1313
- https://github.com/cert-manager/istio-csr
1414

15-
appVersion: v0.7.0
16-
version: v0.7.0
15+
appVersion: v0.7.1
16+
version: v0.7.1

‎deploy/charts/istio-csr/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# cert-manager-istio-csr
22

3-
![Version: v0.7.0](https://img.shields.io/badge/Version-v0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.0](https://img.shields.io/badge/AppVersion-v0.7.0-informational?style=flat-square)
3+
![Version: v0.7.1](https://img.shields.io/badge/Version-v0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.1](https://img.shields.io/badge/AppVersion-v0.7.1-informational?style=flat-square)
44

55
istio-csr enables the use of cert-manager for issuing certificates in Istio service meshes
66

@@ -55,7 +55,7 @@ istio-csr enables the use of cert-manager for issuing certificates in Istio serv
5555
| app.tls.trustDomain | string | `"cluster.local"` | The Istio cluster's trust domain. |
5656
| image.pullPolicy | string | `"IfNotPresent"` | Kubernetes imagePullPolicy on Deployment. |
5757
| image.repository | string | `"quay.io/jetstack/cert-manager-istio-csr"` | Target image repository. |
58-
| image.tag | string | `"v0.7.0"` | Target image version tag. |
58+
| image.tag | string | `"v0.7.1"` | Target image version tag. |
5959
| imagePullSecrets | list | `[]` | Optional secrets used for pulling the istio-csr container image. |
6060
| nodeSelector | object | `{}` | |
6161
| replicaCount | int | `1` | Number of replicas of istio-csr to run. |

‎deploy/charts/istio-csr/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ image:
55
# -- Target image repository.
66
repository: quay.io/jetstack/cert-manager-istio-csr
77
# -- Target image version tag.
8-
tag: v0.7.0
8+
tag: v0.7.1
99
# -- Kubernetes imagePullPolicy on Deployment.
1010
pullPolicy: IfNotPresent
1111

‎go.mod‎

Lines changed: 72 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,138 +1,148 @@
11
module github.com/cert-manager/istio-csr
22

3-
go 1.20
3+
go 1.21
4+
5+
// https://github.com/darccio/mergo/blob/cde9f0ea26cccb1168ee3900cf8ca457bb928c3c/README.md#100
6+
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
47

58
require (
69
github.com/cert-manager/cert-manager v1.12.1
710
github.com/fsnotify/fsnotify v1.6.0
811
github.com/go-logr/logr v1.2.4
912
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
1013
github.com/onsi/ginkgo v1.16.5
11-
github.com/onsi/gomega v1.27.7
12-
github.com/prometheus/client_golang v1.15.1
14+
github.com/onsi/gomega v1.28.0
15+
github.com/prometheus/client_golang v1.17.0
1316
github.com/spf13/cobra v1.7.0
1417
github.com/spf13/pflag v1.0.5
15-
github.com/stretchr/testify v1.8.3
16-
google.golang.org/grpc v1.55.0
17-
google.golang.org/protobuf v1.30.0
18-
istio.io/api v0.0.0-20230525160342-5ee20e270db3
19-
istio.io/istio v0.0.0-20230526150622-d4aa7e5a0289
18+
github.com/stretchr/testify v1.8.4
19+
google.golang.org/grpc v1.59.0
20+
google.golang.org/protobuf v1.31.0
21+
istio.io/api v1.19.0-alpha.1.0.20231024010302-7616d8fa4f1d
22+
istio.io/istio v0.0.0-20231024083543-4c65649a9b11
2023
istio.io/pkg v0.0.0-20230523202533-240922a4c9ad
21-
k8s.io/api v0.27.2
22-
k8s.io/apimachinery v0.27.2
23-
k8s.io/cli-runtime v0.27.2
24-
k8s.io/client-go v0.27.2
25-
k8s.io/component-base v0.27.2
24+
k8s.io/api v0.28.3
25+
k8s.io/apimachinery v0.28.3
26+
k8s.io/cli-runtime v0.28.3
27+
k8s.io/client-go v0.28.3
28+
k8s.io/component-base v0.28.3
2629
k8s.io/klog/v2 v2.100.1
27-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
28-
sigs.k8s.io/controller-runtime v0.15.0
30+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
31+
sigs.k8s.io/controller-runtime v0.16.3
2932
)
3033

3134
require (
32-
cloud.google.com/go v0.110.2 // indirect
33-
cloud.google.com/go/compute v1.19.3 // indirect
35+
cloud.google.com/go v0.110.8 // indirect
36+
cloud.google.com/go/compute v1.23.1 // indirect
3437
cloud.google.com/go/compute/metadata v0.2.3 // indirect
35-
cloud.google.com/go/logging v1.7.0 // indirect
36-
cloud.google.com/go/longrunning v0.4.2 // indirect
38+
cloud.google.com/go/logging v1.8.1 // indirect
39+
cloud.google.com/go/longrunning v0.5.2 // indirect
3740
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
3841
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 // indirect
3942
github.com/beorn7/perks v1.0.1 // indirect
4043
github.com/blang/semver/v4 v4.0.0 // indirect
4144
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
4245
github.com/cespare/xxhash/v2 v2.2.0 // indirect
43-
github.com/cncf/xds/go v0.0.0-20230428030218-4003588d1b74 // indirect
44-
github.com/davecgh/go-spew v1.1.1 // indirect
46+
github.com/cncf/xds/go v0.0.0-20231016030527-8bd2eac9fb4a // indirect
47+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4548
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
46-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
47-
github.com/envoyproxy/go-control-plane v0.11.1-0.20230512191503-8f629004dc9a // indirect
48-
github.com/envoyproxy/protoc-gen-validate v1.0.1 // indirect
49+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
50+
github.com/envoyproxy/go-control-plane v0.11.2-0.20231020231331-be7ae8824462 // indirect
51+
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
4952
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
50-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
53+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
5154
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
5255
github.com/go-errors/errors v1.4.2 // indirect
5356
github.com/go-ldap/ldap/v3 v3.4.4 // indirect
57+
github.com/go-logr/stdr v1.2.2 // indirect
5458
github.com/go-logr/zapr v1.2.4 // indirect
55-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
59+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
5660
github.com/go-openapi/jsonreference v0.20.2 // indirect
57-
github.com/go-openapi/swag v0.22.3 // indirect
61+
github.com/go-openapi/swag v0.22.4 // indirect
5862
github.com/goccy/go-json v0.10.2 // indirect
5963
github.com/gogo/protobuf v1.3.2 // indirect
6064
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6165
github.com/golang/protobuf v1.5.3 // indirect
6266
github.com/google/btree v1.1.2 // indirect
63-
github.com/google/cel-go v0.15.3 // indirect
64-
github.com/google/gnostic v0.6.9 // indirect
65-
github.com/google/go-cmp v0.5.9 // indirect
67+
github.com/google/cel-go v0.16.1 // indirect
68+
github.com/google/gnostic-models v0.6.8 // indirect
69+
github.com/google/go-cmp v0.6.0 // indirect
6670
github.com/google/gofuzz v1.2.0 // indirect
67-
github.com/google/s2a-go v0.1.4 // indirect
71+
github.com/google/s2a-go v0.1.7 // indirect
6872
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
69-
github.com/google/uuid v1.3.0 // indirect
70-
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
71-
github.com/googleapis/gax-go/v2 v2.9.1 // indirect
73+
github.com/google/uuid v1.3.1 // indirect
74+
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
75+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
7276
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
7377
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
7478
github.com/hashicorp/errwrap v1.1.0 // indirect
7579
github.com/hashicorp/go-multierror v1.1.1 // indirect
76-
github.com/imdario/mergo v0.3.15 // indirect
80+
github.com/imdario/mergo v1.0.0 // indirect
7781
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7882
github.com/josharian/intern v1.0.0 // indirect
7983
github.com/json-iterator/go v1.1.12 // indirect
8084
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
8185
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
8286
github.com/lestrrat-go/httpcc v1.0.1 // indirect
8387
github.com/lestrrat-go/iter v1.0.2 // indirect
84-
github.com/lestrrat-go/jwx v1.2.25 // indirect
88+
github.com/lestrrat-go/jwx v1.2.26 // indirect
8589
github.com/lestrrat-go/option v1.0.1 // indirect
8690
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
8791
github.com/mailru/easyjson v0.7.7 // indirect
88-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
92+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
8993
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9094
github.com/modern-go/reflect2 v1.0.2 // indirect
9195
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
9296
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9397
github.com/nxadm/tail v1.4.8 // indirect
9498
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
9599
github.com/pkg/errors v0.9.1 // indirect
96-
github.com/pmezard/go-difflib v1.0.0 // indirect
97-
github.com/prometheus/client_model v0.4.0 // indirect
98-
github.com/prometheus/common v0.44.0 // indirect
99-
github.com/prometheus/procfs v0.10.0 // indirect
100+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
101+
github.com/prometheus/client_model v0.5.0 // indirect
102+
github.com/prometheus/common v0.45.0 // indirect
103+
github.com/prometheus/procfs v0.11.1 // indirect
100104
github.com/stoewer/go-strcase v1.3.0 // indirect
101105
github.com/xlab/treeprint v1.2.0 // indirect
102106
go.opencensus.io v0.24.0 // indirect
103-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
107+
go.opentelemetry.io/otel v1.19.0 // indirect
108+
go.opentelemetry.io/otel/exporters/prometheus v0.42.0 // indirect
109+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
110+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
111+
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
112+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
113+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
104114
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
105115
go.uber.org/atomic v1.11.0 // indirect
106116
go.uber.org/multierr v1.11.0 // indirect
107-
go.uber.org/zap v1.24.0 // indirect
108-
golang.org/x/crypto v0.9.0 // indirect
109-
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
110-
golang.org/x/net v0.10.0 // indirect
111-
golang.org/x/oauth2 v0.8.0 // indirect
112-
golang.org/x/sync v0.2.0 // indirect
113-
golang.org/x/sys v0.8.0 // indirect
114-
golang.org/x/term v0.8.0 // indirect
115-
golang.org/x/text v0.9.0 // indirect
117+
go.uber.org/zap v1.26.0 // indirect
118+
golang.org/x/crypto v0.14.0 // indirect
119+
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
120+
golang.org/x/net v0.17.0 // indirect
121+
golang.org/x/oauth2 v0.13.0 // indirect
122+
golang.org/x/sync v0.4.0 // indirect
123+
golang.org/x/sys v0.13.0 // indirect
124+
golang.org/x/term v0.13.0 // indirect
125+
golang.org/x/text v0.13.0 // indirect
116126
golang.org/x/time v0.3.0 // indirect
117-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
118-
google.golang.org/api v0.124.0 // indirect
127+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
128+
google.golang.org/api v0.148.0 // indirect
119129
google.golang.org/appengine v1.6.7 // indirect
120-
google.golang.org/genproto v0.0.0-20230526015343-6ee61e4f9d5f // indirect
121-
google.golang.org/genproto/googleapis/api v0.0.0-20230526015343-6ee61e4f9d5f // indirect
122-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230526015343-6ee61e4f9d5f // indirect
130+
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
131+
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
132+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
123133
gopkg.in/inf.v0 v0.9.1 // indirect
124134
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
125135
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
126136
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
127137
gopkg.in/yaml.v2 v2.4.0 // indirect
128138
gopkg.in/yaml.v3 v3.0.1 // indirect
129-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
139+
k8s.io/apiextensions-apiserver v0.28.3 // indirect
130140
k8s.io/kube-aggregator v0.27.2 // indirect
131-
k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
132-
sigs.k8s.io/gateway-api v0.7.1-0.20230517171234-6b9b7346ca5b // indirect
141+
k8s.io/kube-openapi v0.0.0-20230811205723-7ac0aad8c58d // indirect
142+
sigs.k8s.io/gateway-api v1.0.0-rc1.0.20231023232744-ebe9f31ef278 // indirect
133143
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
134-
sigs.k8s.io/kustomize/api v0.13.4 // indirect
135-
sigs.k8s.io/kustomize/kyaml v0.14.2 // indirect
136-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
144+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
145+
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
146+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
137147
sigs.k8s.io/yaml v1.3.0 // indirect
138148
)

0 commit comments

Comments
 (0)