Skip to content

Commit b258945

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #91 from erikgb/manual-self-upgrade
Manual "self upgrade"
2 parents b1581ae + 9151d95 commit b258945

File tree

14 files changed

+89
-85
lines changed

14 files changed

+89
-85
lines changed

‎.github/workflows/govulncheck.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.repository_owner == 'cert-manager'
2121

2222
steps:
23-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2424
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
2525
# the tags so `git describe` returns a valid version.
2626
# see https://github.com/actions/checkout/issues/701 for extra info about this option

‎.github/workflows/make-self-upgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
echo "This workflow should not be run on a non-branch-head."
3333
exit 1
3434
35-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3636
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
3737
# the tags so `git describe` returns a valid version.
3838
# see https://github.com/actions/checkout/issues/701 for extra info about this option

‎driver/driver.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package driver
1818

1919
import (
20+
"context"
2021
"net"
2122

2223
"github.com/go-logr/logr"
@@ -64,9 +65,9 @@ type Options struct {
6465
ContinueOnNotReady bool
6566
}
6667

67-
func New(endpoint string, log logr.Logger, opts Options) (*Driver, error) {
68+
func New(ctx context.Context, endpoint string, log logr.Logger, opts Options) (*Driver, error) {
6869
ids, cs, ns := buildServers(opts, log)
69-
server, err := NewGRPCServer(endpoint, log, ids, cs, ns)
70+
server, err := NewGRPCServer(ctx, endpoint, log, ids, cs, ns)
7071
if err != nil {
7172
return nil, err
7273
}

‎driver/server.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type GRPCServer struct {
3434
lis net.Listener
3535
}
3636

37-
func NewGRPCServer(endpoint string, log logr.Logger, ids csi.IdentityServer, cs csi.ControllerServer, ns csi.NodeServer) (*GRPCServer, error) {
37+
func NewGRPCServer(ctx context.Context, endpoint string, log logr.Logger, ids csi.IdentityServer, cs csi.ControllerServer, ns csi.NodeServer) (*GRPCServer, error) {
3838
proto, addr, err := parseEndpoint(endpoint)
3939
if err != nil {
4040
return nil, err
@@ -47,7 +47,8 @@ func NewGRPCServer(endpoint string, log logr.Logger, ids csi.IdentityServer, cs
4747
}
4848
}
4949

50-
listener, err := net.Listen(proto, addr)
50+
lc := net.ListenConfig{}
51+
listener, err := lc.Listen(ctx, proto, addr)
5152
if err != nil {
5253
return nil, err
5354
}

‎examples/simple/main.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package main
1818

1919
import (
20+
"context"
2021
"crypto"
2122
"crypto/rand"
2223
"crypto/rsa"
@@ -103,7 +104,7 @@ func main() {
103104

104105
store.FSGroupVolumeAttributeKey = FsGroupKey
105106

106-
d, err := driver.New(*endpoint, log, driver.Options{
107+
d, err := driver.New(context.Background(), *endpoint, log, driver.Options{
107108
DriverName: "csi.cert-manager.io",
108109
DriverVersion: "v0.0.1",
109110
NodeID: *nodeID,

‎internal/api/util/hash.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package util
1919
import (
2020
"fmt"
2121
"hash/fnv"
22+
2223
"k8s.io/apimachinery/pkg/util/rand"
2324
)
2425

‎klone.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,55 +9,55 @@ targets:
99
- folder_name: boilerplate
1010
repo_url: https://github.com/cert-manager/makefile-modules.git
1111
repo_ref: main
12-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
12+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
1313
repo_path: modules/boilerplate
1414
- folder_name: cert-manager
1515
repo_url: https://github.com/cert-manager/makefile-modules.git
1616
repo_ref: main
17-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
17+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
1818
repo_path: modules/cert-manager
1919
- folder_name: controller-gen
2020
repo_url: https://github.com/cert-manager/makefile-modules.git
2121
repo_ref: main
22-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
22+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
2323
repo_path: modules/controller-gen
2424
- folder_name: generate-verify
2525
repo_url: https://github.com/cert-manager/makefile-modules.git
2626
repo_ref: main
27-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
27+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
2828
repo_path: modules/generate-verify
2929
- folder_name: go
3030
repo_url: https://github.com/cert-manager/makefile-modules.git
3131
repo_ref: main
32-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
32+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
3333
repo_path: modules/go
3434
- folder_name: help
3535
repo_url: https://github.com/cert-manager/makefile-modules.git
3636
repo_ref: main
37-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
37+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
3838
repo_path: modules/help
3939
- folder_name: kind
4040
repo_url: https://github.com/cert-manager/makefile-modules.git
4141
repo_ref: main
42-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
42+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
4343
repo_path: modules/kind
4444
- folder_name: klone
4545
repo_url: https://github.com/cert-manager/makefile-modules.git
4646
repo_ref: main
47-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
47+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
4848
repo_path: modules/klone
4949
- folder_name: oci-build
5050
repo_url: https://github.com/cert-manager/makefile-modules.git
5151
repo_ref: main
52-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
52+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
5353
repo_path: modules/oci-build
5454
- folder_name: repository-base
5555
repo_url: https://github.com/cert-manager/makefile-modules.git
5656
repo_ref: main
57-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
57+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
5858
repo_path: modules/repository-base
5959
- folder_name: tools
6060
repo_url: https://github.com/cert-manager/makefile-modules.git
6161
repo_ref: main
62-
repo_hash: 563ddf86f3e68085fbf926eb2cc7a4ec0c6d58cd
62+
repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
6363
repo_path: modules/tools

‎make/_shared/cert-manager/00_mod.mk‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
images_amd64 ?=
1616
images_arm64 ?=
1717

18-
cert_manager_version := v1.17.0
18+
cert_manager_version := v1.18.2
1919

20-
images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:7722bca28c95b4c568f3d4cd2debc9286e0c4b092f0426840ed4d8ed314c09db
21-
images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:d99797c5d6e702416e69defb4c28a978d515a37a8a03b4405c4991b818cc791c
22-
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:e43e270c7c50a3c1872e115df93458a78c230118cc3d12e9f6c848956e94c151
23-
images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:ce2f25777ad4a159b736e47dbaabfd62bf2c339c6f49fb6a6de79fb6b4a8ebed
20+
images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:058a3ee5b133f964acefbd5926a08ace1fb7c0775b92d3bc11e4c7a33de71e25
21+
images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:fd289495aed22983861cd8359fc535878ba388842faa9a01a33ebc5c9fe820d2
22+
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:88f79993c4ad584324262419338d4a92919ea1495d984f44e34181c33d33e290
23+
images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:f37f4e84f892ec7d44432971336cd4f591a5eaf4f086b5f14d3d7d065721341b
2424

25-
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:d63cd0d15a3ed99736dd5623b798a3dd78fc36495623528d1bf58df37bc4a6cd
26-
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:aaae16a38c8f4176b9645ff3069797ca2ec6e3262142794729440b342d759b89
27-
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:45e8765b48d913ef26188782ec8dbee32f132c142249456a4e06c5c5c41e3927
28-
images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:c29e6270e6fc78181bb3a956c0714df24ea56840b9d3916122a36ee25ec6eac6
25+
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:980ecb589b54e91fa5c1cd97a0f1689e39ba62eb2904bcf43f63893671065780
26+
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:5d3ae4ae5ba2135ebdc302e943e385544f975179aca9d6039a37e480e431e97c
27+
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:ec280149b4ab0a2c4270deb0c9d5a7eb27ce8ae0cd2790140ca865fc6be5c0a1
28+
images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:3fa025c179daeb3672c100ff6c8398f4e428e31e1470b3acaa86ca958bdab7af

‎make/_shared/go/base/.github/workflows/govulncheck.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.repository_owner == 'ORGNAMEHERE'
2121

2222
steps:
23-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2424
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
2525
# the tags so `git describe` returns a valid version.
2626
# see https://github.com/actions/checkout/issues/701 for extra info about this option

‎make/_shared/oci-build/00_mod.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ oci_platforms ?= linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
1616

1717
# Use distroless as minimal base image to package the manager binary
1818
# To get latest SHA run "crane digest quay.io/jetstack/base-static:latest"
19-
base_image_static := quay.io/jetstack/base-static@sha256:01d887b98d90226dbaeb32b9cab0dbede410a652fa16829c6fd2f94df55d7757
19+
base_image_static := quay.io/jetstack/base-static@sha256:3644c30edf618b9e84ed98af7f529b1e9e3d67a54fcd557083f91fc991a0031c
2020

2121
# Use custom apko-built image as minimal base image to package the manager binary
2222
# To get latest SHA run "crane digest quay.io/jetstack/base-static-csi:latest"
23-
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:35531ca8c25f441a15b9ae211aaa2a9978334c45dd2a9c130525aa73c8bdf5af
23+
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:83a410deceabbe31f31e84ec9541877611f4ce9b3013ce90f25ab931a23ef0d5
2424

2525
# Utility functions
2626
fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))

0 commit comments

Comments
 (0)