Skip to content

Commit 05e73ec

Browse files
irbyspbsolubledependabot[bot]HoogWater
authored
release: 2.1.3: Dependency Updates (#116)
* chore(deps): bump github.com/stretchr/testify from 1.10.0 to 1.11.1 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.10.0 to 1.11.1. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.10.0...v1.11.1) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-version: 1.11.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump sigs.k8s.io/controller-runtime from 0.22.1 to 0.22.3 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.22.1 to 0.22.3. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.22.1...v0.22.3) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.22.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump github.com/onsi/ginkgo/v2 from 2.22.0 to 2.27.1 Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.22.0 to 2.27.1. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.22.0...v2.27.1) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-version: 2.27.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Change builder image to major.minor(1.24) instead of major.minor.patch(1.24.6) When rebuilding the image now old critical vulnerabilities will not be in the resulting image anymore. * chore(tests): add documentation for configuring security roles and update test names Signed-off-by: Matthew H. Irby <matt.irby@keyfactor.com> * chore(docs): update contributing guideline link in PR template Signed-off-by: Matthew H. Irby <matt.irby@keyfactor.com> * chore(docs): update changelog Signed-off-by: Matthew H. Irby <matt.irby@keyfactor.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Matthew H. Irby <matt.irby@keyfactor.com> Co-authored-by: Sean <1661003+spbsoluble@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mark de Jong <HoogWater@users.noreply.github.com>
1 parent 6d58ce9 commit 05e73ec

8 files changed

Lines changed: 100 additions & 57 deletions

File tree

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
- [ ] I have kept the patch limited to only change the parts related to the patch
1515
- [ ] This change requires a documentation update
1616

17-
See also [Contributing Guidelines](../CONTRIBUTING.md).
17+
See also [Contributing Guidelines](https://github.com/Keyfactor/ejbca-cert-manager-issuer/blob/main/CONTRIBUTING.md).

.github/workflows/helm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
# Checkout code
4848
- name: Checkout code at tag
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@v5
5050
with:
5151
ref: ${{ steps.tag_ref.outputs.checkout_ref }}
5252
fetch-depth: 0 # Fetch full history for better context

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
# v2.1.3
2+
## Chores:
3+
- Build Docker image from Go 1.24 instead of 1.24.6
4+
- Update GitHub Actions workflow versions
5+
- Update Go dependencies
6+
17
# v2.1.1
28
# Fixes:
39
- Fix issue with Helm chart not publishing correct tag (https://github.com/Keyfactor/ejbca-cert-manager-issuer/issues/89)
410

5-
# Chores:
11+
## Chores:
612
- Fix small typo in link description
713
- Aligned with EJBCA & SignServer template repo
814
- Bump versions of GitHub Actions steps

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-
ARG GOIMAGE=golang:1.24.6
2+
ARG GOIMAGE=golang:1.24
33
ARG BASEIMAGE=gcr.io/distroless/static:nonroot
44
ARG TARGETOS
55
ARG TARGETARCH

go.mod

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@ go 1.24.0
55
require (
66
github.com/Keyfactor/ejbca-go-client-sdk v1.0.2
77
github.com/cert-manager/cert-manager v1.18.2
8-
github.com/go-logr/logr v1.4.2
9-
github.com/onsi/ginkgo/v2 v2.22.0
10-
github.com/onsi/gomega v1.36.1
11-
github.com/stretchr/testify v1.10.0
8+
github.com/go-logr/logr v1.4.3
9+
github.com/onsi/ginkgo/v2 v2.27.1
10+
github.com/onsi/gomega v1.38.2
11+
github.com/stretchr/testify v1.11.1
1212
k8s.io/api v0.34.1
1313
k8s.io/apimachinery v0.34.1
1414
k8s.io/client-go v0.34.1
1515
k8s.io/klog/v2 v2.130.1
1616
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
17-
sigs.k8s.io/controller-runtime v0.22.1
17+
sigs.k8s.io/controller-runtime v0.22.3
1818
)
1919

2020
require (
2121
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
22+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2223
github.com/beorn7/perks v1.0.1 // indirect
2324
github.com/blang/semver/v4 v4.0.0 // indirect
2425
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -38,7 +39,7 @@ require (
3839
github.com/google/btree v1.1.3 // indirect
3940
github.com/google/gnostic-models v0.7.0 // indirect
4041
github.com/google/go-cmp v0.7.0 // indirect
41-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
42+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4243
github.com/google/uuid v1.6.0 // indirect
4344
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4445
github.com/josharian/intern v1.0.0 // indirect
@@ -58,26 +59,28 @@ require (
5859
github.com/x448/float16 v0.8.4 // indirect
5960
go.opentelemetry.io/otel v1.35.0 // indirect
6061
go.opentelemetry.io/otel/trace v1.35.0 // indirect
62+
go.uber.org/automaxprocs v1.6.0 // indirect
6163
go.uber.org/multierr v1.11.0 // indirect
6264
go.uber.org/zap v1.27.0 // indirect
6365
go.yaml.in/yaml/v2 v2.4.2 // indirect
6466
go.yaml.in/yaml/v3 v3.0.4 // indirect
65-
golang.org/x/crypto v0.38.0 // indirect
66-
golang.org/x/net v0.38.0 // indirect
67+
golang.org/x/crypto v0.41.0 // indirect
68+
golang.org/x/mod v0.27.0 // indirect
69+
golang.org/x/net v0.43.0 // indirect
6770
golang.org/x/oauth2 v0.28.0 // indirect
68-
golang.org/x/sync v0.14.0 // indirect
69-
golang.org/x/sys v0.33.0 // indirect
70-
golang.org/x/term v0.32.0 // indirect
71-
golang.org/x/text v0.25.0 // indirect
71+
golang.org/x/sync v0.16.0 // indirect
72+
golang.org/x/sys v0.35.0 // indirect
73+
golang.org/x/term v0.34.0 // indirect
74+
golang.org/x/text v0.28.0 // indirect
7275
golang.org/x/time v0.10.0 // indirect
73-
golang.org/x/tools v0.30.0 // indirect
76+
golang.org/x/tools v0.36.0 // indirect
7477
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
75-
google.golang.org/protobuf v1.36.5 // indirect
78+
google.golang.org/protobuf v1.36.7 // indirect
7679
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7780
gopkg.in/inf.v0 v0.9.1 // indirect
7881
gopkg.in/yaml.v3 v3.0.1 // indirect
79-
k8s.io/apiextensions-apiserver v0.34.0 // indirect
80-
k8s.io/component-base v0.34.0 // indirect
82+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
83+
k8s.io/component-base v0.34.1 // indirect
8184
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
8285
sigs.k8s.io/gateway-api v1.2.1 // indirect
8386
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

go.sum

Lines changed: 62 additions & 32 deletions
Large diffs are not rendered by default.

test/e2e/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ cp .env.example .env
3333

3434
Modify the fields as needed.
3535

36+
## Configuring EJBCA Security Role
37+
The EJBCA issuer needs to be able to interact with the EJBCA instance to sign the CertificateRequest. The OAuth subject defined in the `OAUTH_CLIENT_ID` environment variable needs to be configured with a security role with the permissions defined in the [Configure EJBCA Roles and Access Rules](../../README.md#configuring-ejbca) section of the root README.
38+
3639
## Running the script
3740

3841
```bash

test/e2e/run_tests.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ SIGNER_CA_SECRET_NAME="ca-secret"
7272
CERTIFICATE_CRD_FQTN="certificates.cert-manager.io"
7373
CERTIFICATEREQUEST_CRD_FQTN="certificaterequests.cert-manager.io"
7474

75-
CR_C_NAME="cert"
76-
CR_CR_NAME="cert-1"
75+
CR_C_NAME="ejbca-cert"
76+
CR_CR_NAME="ejbca-cert-1"
7777
CR_C_SECRET_NAME="$CR_C_NAME-tls"
7878

7979
set -e # Exit on any error
@@ -529,12 +529,13 @@ wait_for_certificate_request() {
529529
local end_time=$(($(date +%s) + timeout))
530530

531531
while [ $(date +%s) -lt $end_time ]; do
532-
local cr_count=$(kubectl -n issuer-playground get certificaterequests -o json | \
532+
local cr_count=$(kubectl -n $ISSUER_NAMESPACE get certificaterequests -o json | \
533533
jq -r '.items[] | .metadata.name' | wc -l)
534534

535535
cr_count=$(echo "$cr_count" | tr -d ' ')
536536

537537
if [ "$cr_count" -gt 0 ]; then
538+
sleep 2 # add a buffer to avoid "resource not found" error
538539
echo "✅ CertificateRequest created"
539540
return 0
540541
fi
@@ -720,14 +721,14 @@ check_for_certificate_secret
720721
echo "🧪✅ Test 1 completed successfully."
721722
echo ""
722723

723-
echo "🧪💬 Test 2: A generated certificate request should be successfully issued by ClusterIssuer."
724+
echo "🧪💬 Test 1a: A generated certificate request should be successfully issued by ClusterIssuer."
724725
regenerate_cluster_issuer
725726
regenerate_certificate ClusterIssuer
726727
wait_for_certificate_request
727728
approve_certificate_request
728729
check_certificate_request_status
729730
check_for_certificate_secret
730-
echo "🧪✅ Test 2 completed successfully."
731+
echo "🧪✅ Test 1a completed successfully."
731732
echo ""
732733

733734

0 commit comments

Comments
 (0)