Skip to content

Commit 8ffd223

Browse files
authored
Merge branch 'cert-manager:main' into connector-for-k8s
2 parents a24924d + 7dc4f01 commit 8ffd223

File tree

9 files changed

+169
-57
lines changed

9 files changed

+169
-57
lines changed

.github/workflows/on-push-to-main-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
contents: read
1616
steps:
1717
- name: Check out code
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
2121
- name: Setup Dockerx

.github/workflows/on-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
contents: read
1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121
- name: Get release version
2222
id: tag
2323
uses: divyansh-gupta/action-get-tag@727a6f0a561be04e09013531e73a3983a65e3479

.github/workflows/on-safe-to-test-label.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Install Git
6969
run: sudo yum install git -y
7070
- name: Check out code into the Go module directory
71-
uses: actions/checkout@v3
71+
uses: actions/checkout@v4
7272
with:
7373
fetch-depth: 0
7474
ref: ${{ github.event.pull_request.head.ref }}
@@ -83,7 +83,7 @@ jobs:
8383
mkdir /home/ec2-user/.cache/go-mod
8484
mkdir /home/ec2-user/go
8585
mkdir /home/ec2-user/go/bin
86-
GOVERSION=go1.22.3
86+
GOVERSION=go1.23.5
8787
wget https://go.dev/dl/$GOVERSION.linux-${{ env.GO_ARCHITECTURE }}.tar.gz
8888
sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf $GOVERSION.linux-${{ env.GO_ARCHITECTURE }}.tar.gz
8989
PATH="$PATH:/usr/local/go/bin"

.github/workflows/sync.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout code
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v4
3131
with:
3232
ref: ${{ env.GH_PAGES_BRANCH }}
3333
- name: Push README to gh-pages branch
@@ -49,7 +49,7 @@ jobs:
4949
runs-on: ubuntu-latest
5050
steps:
5151
- name: Checkout code
52-
uses: actions/checkout@v2
52+
uses: actions/checkout@v4
5353
with:
5454
repository: ${{ github.event.pull_request.head.repo.full_name }}
5555
ref: ${{ github.head_ref }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=${BUILDPLATFORM} golang:1.22 as builder
2+
FROM --platform=${BUILDPLATFORM} golang:1.23 as builder
33
WORKDIR /workspace
44

55
ARG TARGETARCH

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ KIND := ${BIN}/kind-${KIND_VERSION}
4848
K8S_CLUSTER_NAME := pca-external-issuer
4949

5050
# cert-manager
51-
CERT_MANAGER_VERSION ?= v1.16.0
51+
CERT_MANAGER_VERSION ?= v1.16.3
5252

5353
# Controller tools
54-
CONTROLLER_GEN_VERSION := 0.15.0
54+
CONTROLLER_GEN_VERSION := 0.17.1
5555
CONTROLLER_GEN := ${BIN}/controller-gen-${CONTROLLER_GEN_VERSION}
5656

5757
# Helm tools

charts/aws-pca-issuer/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: aws-privateca-issuer
33
description: An addon for cert-manager to sign certificates using AWS PCA
44
type: application
5-
version: v1.4.0
6-
appVersion: v1.4.0
5+
version: v1.4.1
6+
appVersion: v1.4.1

go.mod

Lines changed: 54 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,47 @@
11
module github.com/cert-manager/aws-privateca-issuer
22

3-
go 1.22.0
3+
go 1.23.0
44

5-
toolchain go1.22.3
5+
toolchain go1.23.5
66

77
require (
8-
github.com/aws/aws-sdk-go-v2 v1.27.0
9-
github.com/aws/aws-sdk-go-v2/config v1.27.15
10-
github.com/aws/aws-sdk-go-v2/credentials v1.17.15
11-
github.com/aws/aws-sdk-go-v2/service/acmpca v1.29.5
12-
github.com/aws/aws-sdk-go-v2/service/iam v1.32.1
13-
github.com/aws/aws-sdk-go-v2/service/ram v1.25.5
14-
github.com/aws/aws-sdk-go-v2/service/sts v1.28.9
15-
github.com/cert-manager/cert-manager v1.15.4
16-
github.com/go-logr/logr v1.4.1
17-
github.com/stretchr/testify v1.9.0
18-
k8s.io/api v0.30.1
19-
k8s.io/apimachinery v0.30.1
20-
k8s.io/client-go v0.30.1
21-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
22-
sigs.k8s.io/controller-runtime v0.18.2
8+
github.com/aws/aws-sdk-go-v2 v1.33.0
9+
github.com/aws/aws-sdk-go-v2/config v1.29.1
10+
github.com/aws/aws-sdk-go-v2/credentials v1.17.54
11+
github.com/aws/aws-sdk-go-v2/service/acmpca v1.37.13
12+
github.com/aws/aws-sdk-go-v2/service/iam v1.38.7
13+
github.com/aws/aws-sdk-go-v2/service/ram v1.29.13
14+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.9
15+
github.com/cert-manager/cert-manager v1.16.3
16+
github.com/go-logr/logr v1.4.2
17+
github.com/stretchr/testify v1.10.0
18+
k8s.io/api v0.32.1
19+
k8s.io/apimachinery v0.32.1
20+
k8s.io/client-go v0.32.1
21+
k8s.io/utils v0.0.0-20241210054802-24370beab758
22+
sigs.k8s.io/controller-runtime v0.20.1
2323
)
2424

2525
require (
2626
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
27-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3 // indirect
28-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 // indirect
29-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 // indirect
30-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
31-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
32-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 // indirect
33-
github.com/aws/aws-sdk-go-v2/service/sso v1.20.8 // indirect
34-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.2 // indirect
35-
github.com/aws/smithy-go v1.20.2 // indirect
27+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24 // indirect
28+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28 // indirect
29+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 // indirect
30+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
32+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9 // indirect
33+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.11 // indirect
34+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.10 // indirect
35+
github.com/aws/smithy-go v1.22.1 // indirect
3636
github.com/beorn7/perks v1.0.1 // indirect
3737
github.com/blang/semver/v4 v4.0.0 // indirect
3838
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3939
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
40-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
40+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
4141
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
4242
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4343
github.com/fsnotify/fsnotify v1.7.0 // indirect
44+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4445
github.com/go-asn1-ber/asn1-ber v1.5.6 // indirect
4546
github.com/go-ldap/ldap/v3 v3.4.8 // indirect
4647
github.com/go-logr/zapr v1.3.0 // indirect
@@ -50,6 +51,7 @@ require (
5051
github.com/gogo/protobuf v1.3.2 // indirect
5152
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5253
github.com/golang/protobuf v1.5.4 // indirect
54+
github.com/google/btree v1.1.3 // indirect
5355
github.com/google/gnostic-models v0.6.8 // indirect
5456
github.com/google/go-cmp v0.6.0 // indirect
5557
github.com/google/gofuzz v1.2.0 // indirect
@@ -59,41 +61,47 @@ require (
5961
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
6062
github.com/josharian/intern v1.0.0 // indirect
6163
github.com/json-iterator/go v1.1.12 // indirect
64+
github.com/klauspost/compress v1.17.9 // indirect
6265
github.com/mailru/easyjson v0.7.7 // indirect
6366
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
6467
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6568
github.com/modern-go/reflect2 v1.0.2 // indirect
6669
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6770
github.com/pkg/errors v0.9.1 // indirect
6871
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
69-
github.com/prometheus/client_golang v1.18.0 // indirect
72+
github.com/prometheus/client_golang v1.20.4 // indirect
7073
github.com/prometheus/client_model v0.6.1 // indirect
71-
github.com/prometheus/common v0.46.0 // indirect
72-
github.com/prometheus/procfs v0.15.0 // indirect
73-
github.com/spf13/cobra v1.8.0 // indirect
74+
github.com/prometheus/common v0.55.0 // indirect
75+
github.com/prometheus/procfs v0.15.1 // indirect
76+
github.com/spf13/cobra v1.8.1 // indirect
7477
github.com/spf13/pflag v1.0.5 // indirect
78+
github.com/x448/float16 v0.8.4 // indirect
79+
go.opentelemetry.io/otel v1.29.0 // indirect
80+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
7581
go.uber.org/multierr v1.11.0 // indirect
7682
go.uber.org/zap v1.27.0 // indirect
77-
golang.org/x/crypto v0.24.0 // indirect
78-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
79-
golang.org/x/net v0.26.0 // indirect
80-
golang.org/x/oauth2 v0.20.0 // indirect
81-
golang.org/x/sys v0.21.0 // indirect
82-
golang.org/x/term v0.21.0 // indirect
83-
golang.org/x/text v0.16.0 // indirect
84-
golang.org/x/time v0.5.0 // indirect
83+
golang.org/x/crypto v0.31.0 // indirect
84+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
85+
golang.org/x/net v0.33.0 // indirect
86+
golang.org/x/oauth2 v0.23.0 // indirect
87+
golang.org/x/sync v0.10.0 // indirect
88+
golang.org/x/sys v0.28.0 // indirect
89+
golang.org/x/term v0.27.0 // indirect
90+
golang.org/x/text v0.21.0 // indirect
91+
golang.org/x/time v0.7.0 // indirect
8592
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8693
google.golang.org/appengine v1.6.8 // indirect
87-
google.golang.org/protobuf v1.34.1 // indirect
94+
google.golang.org/protobuf v1.35.1 // indirect
95+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8896
gopkg.in/inf.v0 v0.9.1 // indirect
8997
gopkg.in/yaml.v2 v2.4.0 // indirect
9098
gopkg.in/yaml.v3 v3.0.1 // indirect
91-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
92-
k8s.io/component-base v0.30.1 // indirect
93-
k8s.io/klog/v2 v2.120.1 // indirect
94-
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
99+
k8s.io/apiextensions-apiserver v0.32.0 // indirect
100+
k8s.io/component-base v0.32.0 // indirect
101+
k8s.io/klog/v2 v2.130.1 // indirect
102+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
95103
sigs.k8s.io/gateway-api v1.1.0 // indirect
96-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
97-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
104+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
105+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
98106
sigs.k8s.io/yaml v1.4.0 // indirect
99107
)

0 commit comments

Comments
 (0)