Skip to content

Commit 646da2e

Browse files
cert-manager-botcert-manager-bot
committed
BOT: run 'make upgrade-klone' and 'make generate'
Signed-off-by: cert-manager-bot <[email protected]>
1 parent c1dbae3 commit 646da2e

File tree

6 files changed

+98
-76
lines changed

6 files changed

+98
-76
lines changed

‎klone.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,65 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
13+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
1414
repo_path: modules/boilerplate
1515
- folder_name: cert-manager
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
18+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
1919
repo_path: modules/cert-manager
2020
- folder_name: controller-gen
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
23+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
2424
repo_path: modules/controller-gen
2525
- folder_name: generate-verify
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
28+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
2929
repo_path: modules/generate-verify
3030
- folder_name: go
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
33+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
3434
repo_path: modules/go
3535
- folder_name: helm
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
38+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
3939
repo_path: modules/helm
4040
- folder_name: help
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
43+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
4444
repo_path: modules/help
4545
- folder_name: kind
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
48+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
4949
repo_path: modules/kind
5050
- folder_name: klone
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
53+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
5454
repo_path: modules/klone
5555
- folder_name: oci-build
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
58+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
5959
repo_path: modules/oci-build
6060
- folder_name: oci-publish
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
63+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
6464
repo_path: modules/oci-publish
6565
- folder_name: repository-base
6666
repo_url: https://github.com/cert-manager/makefile-modules.git
6767
repo_ref: main
68-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
68+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
6969
repo_path: modules/repository-base
7070
- folder_name: tools
7171
repo_url: https://github.com/cert-manager/makefile-modules.git
7272
repo_ref: main
73-
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
73+
repo_hash: 96530a5ed1a52c40cdf6b2469ad49fa5a13ab7c0
7474
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.14.5
18+
cert_manager_version := v1.15.0
1919

20-
images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:f37f460aaa7598ba251ff1cbe7438012fd56c4acc94be64245e8a836203c5542
21-
images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:6d9ebced61371cc903f7934690923034382456f3ce6e0fe2b692c40dbd67d523
22-
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:ac34b1905a2ff20789fde27115d3e1aa7b3d09f57efba4e91ae2ba1744de4ad2
23-
images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:5c74e4e37586dc5c35442515f43ecf222e961b65e954798428ac9239408bc0f3
20+
images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:9b5d5e9c0fd4944221d059921cc05f388c9a5fc0b02a60b47f0eccfcd8243331
21+
images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:edb1c1e0083ee4cd8e2ccb296ee0f436d2e465ecf90159f9d03141fc19bd3c23
22+
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:85df7b64a3d66de3cd7995ae0f2151b54fd18db424cb7cf84d3bd6d4a39d975f
23+
images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:6365e940a5a913a3aeca0ea519102236d9bec5f0e8f0011fa3498c26d18348e5
2424

25-
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:96668890d162a743407c0ef14d7769e970aa16655959b5f5cab0c595167148fa
26-
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:719aec5d99e86377829261451985592bc4129c5ca8dcb7f20b32170742f2b29b
27-
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:874da5701a98e352fa28d88470671eb792a472737a3cf2b7ce9966817e962de8
28-
images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:35d35b325b980cc702324e52b443cc7eb1df7211ce4e8e91d96da4eff4b6c894
25+
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:716c154f0eecb381d5f63ba78ee1dd0cce4b57dbe15cbbc121f7e8b1071e6268
26+
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:59cbf06f489a7bb2c859296fa32ac7fcfd315c3f2e802be7805b598303b6cef5
27+
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:039c83b5b081d519e9152c19aedd1c7c17daa09187d1ad21df6689da342bb5b7
28+
images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:b2d5b00de8b1de6051c02a3f82cfa4ee617210ef1db5c295440e9a2d2069e547

‎make/_shared/kind/00_mod.mk

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

18-
kind_k8s_version := v1.29.2
18+
kind_k8s_version := v1.29.4
1919

2020
# Goto https://github.com/kubernetes-sigs/kind/releases/tag/<KIND-VERSION> and find the
2121
# multi-arch digest for the image you want to use. Then use crane to get the platform
@@ -24,5 +24,5 @@ kind_k8s_version := v1.29.2
2424
# crane digest --platform=linux/amd64 docker.io/kindest/node@$digest
2525
# crane digest --platform=linux/arm64 docker.io/kindest/node@$digest
2626

27-
images_amd64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:acc9e82a5a5bd3dfccfd03117e9ef5f96b46108b55cd647fb5e7d0d1a35c9c6f
28-
images_arm64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:068aaa834c09ab60d925a8569c6b5f5b9cf46eccf670499176f3267f2ac3189c
27+
images_amd64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:ea40a6bd365a17f71fd3883a1d34a0791d7d6b0eb75832c6d85b6f2326827f1e
28+
images_arm64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:e63a7f74e80b746328fbaa70be406639d0c31c8c8cf0a3d57efdd23c64fe4bba

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

Lines changed: 3 additions & 3 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:ba3cff0a4cacc5ae564e04c1f645000e8c9234c0f4b09534be1dee7874a42141
19+
base_image_static := quay.io/jetstack/base-static@sha256:23631cd1be9a63515cb5975e783284b209f7f9a449c02bb117f2a15413e13bfa
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:54bacd13cccc385ef66730dbc7eb13bdb6a9ff8853e7f551d025ccb0e8c6bf83
23+
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:95b33b948da3790ac09f112486a1e9f10e3e705cfacc159cb7b12429b874c78f
2424

2525
# Utility functions
2626
fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))
@@ -122,4 +122,4 @@ ko_config_targets := $(build_names:%=ko-config-%)
122122
$(foreach build_name,$(build_names),$(eval oci_layout_path_$(build_name) := $(bin_dir)/scratch/image/oci-layout-$(build_name).$(oci_$(build_name)_image_tag)))
123123
$(foreach build_name,$(build_names),$(eval oci_digest_path_$(build_name) := $(CURDIR)/$(oci_layout_path_$(build_name)).digests))
124124
$(foreach build_name,$(build_names),$(eval ko_config_path_$(build_name) := $(CURDIR)/$(oci_layout_path_$(build_name)).ko_config.yaml))
125-
$(foreach build_name,$(build_names),$(eval docker_tarball_path_$(build_name) := $(CURDIR)/$(oci_layout_path_$(build_name)).docker.tar))
125+
$(foreach build_name,$(build_names),$(eval docker_tarball_path_$(build_name) := $(CURDIR)/$(oci_layout_path_$(build_name)).docker.tar))

‎make/_shared/oci-build/image_tool/append_layers.go

Lines changed: 45 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,31 +52,49 @@ var CommandAppendLayers = cobra.Command{
5252
index, err := path.ImageIndex()
5353
must("could not load oci image index", err)
5454

55-
indexMediaType, err := index.MediaType()
56-
must("could not get image index media type", err)
57-
58-
layerType := types.DockerLayer
59-
if indexMediaType == types.OCIImageIndex {
60-
layerType = types.OCILayer
61-
}
62-
63-
layers := []v1.Layer{}
55+
layers := []untypedLayer{}
6456
for _, path := range extra {
65-
layers = append(layers, loadLayerFromDirOrTarball(path, layerType))
57+
layers = append(layers, newUntypedLayerFromPath(path))
6658
}
6759

68-
index = appendLayersToImageIndex(index, layers)
60+
index = mutateImage(index, func(img v1.Image) v1.Image {
61+
imgMediaType, err := img.MediaType()
62+
must("could not get image media type", err)
63+
64+
layerType := types.DockerLayer
65+
if imgMediaType == types.OCIManifestSchema1 {
66+
layerType = types.OCILayer
67+
}
68+
69+
for _, untypedLayer := range layers {
70+
layer, err := untypedLayer.ToLayer(layerType)
71+
must("could not load image layer", err)
72+
73+
img, err = mutate.AppendLayers(img, layer)
74+
must("could not append layer", err)
75+
}
76+
77+
return img
78+
})
6979

7080
_, err = layout.Write(oci, index)
7181
must("could not write image", err)
7282
},
7383
}
7484

75-
func loadLayerFromDirOrTarball(path string, mediaType types.MediaType) v1.Layer {
85+
type untypedLayer struct {
86+
tarball tarball.Opener
87+
}
88+
89+
func newUntypedLayer(tarball tarball.Opener) untypedLayer {
90+
return untypedLayer{tarball: tarball}
91+
}
92+
93+
func newUntypedLayerFromPath(path string) untypedLayer {
7694
stat, err := os.Stat(path)
7795
must("could not open directory or tarball", err)
7896

79-
var layer v1.Layer
97+
var layer untypedLayer
8098
if stat.IsDir() {
8199
var buf bytes.Buffer
82100

@@ -120,25 +138,29 @@ func loadLayerFromDirOrTarball(path string, mediaType types.MediaType) v1.Layer
120138

121139
byts := buf.Bytes()
122140

123-
layer, err = tarball.LayerFromOpener(
141+
layer = newUntypedLayer(
124142
func() (io.ReadCloser, error) {
125143
return io.NopCloser(bytes.NewReader(byts)), nil
126144
},
127-
tarball.WithMediaType(mediaType),
128145
)
129-
130146
} else {
131-
layer, err = tarball.LayerFromFile(
132-
path,
133-
tarball.WithMediaType(mediaType),
147+
layer = newUntypedLayer(
148+
func() (io.ReadCloser, error) {
149+
return os.Open(path)
150+
},
134151
)
135152
}
136153

137-
must("could not open directory or tarball", err)
138154
return layer
139155
}
140156

141-
func appendLayersToImageIndex(index v1.ImageIndex, layers []v1.Layer) v1.ImageIndex {
157+
func (ul untypedLayer) ToLayer(mediaType types.MediaType) (v1.Layer, error) {
158+
return tarball.LayerFromOpener(ul.tarball, tarball.WithMediaType(mediaType))
159+
}
160+
161+
type imageMutateFn func(index v1.Image) v1.Image
162+
163+
func mutateImage(index v1.ImageIndex, fn imageMutateFn) v1.ImageIndex {
142164
manifest, err := index.IndexManifest()
143165
must("could not load oci image manifest", err)
144166

@@ -150,8 +172,7 @@ func appendLayersToImageIndex(index v1.ImageIndex, layers []v1.Layer) v1.ImageIn
150172
img, err := index.Image(descriptor.Digest)
151173
must("could not load oci image with digest", err)
152174

153-
img, err = mutate.AppendLayers(img, layers...)
154-
must("could not load append layer to image", err)
175+
img = fn(img)
155176

156177
digest, err := img.Digest()
157178
must("could not get image digest", err)
@@ -176,7 +197,7 @@ func appendLayersToImageIndex(index v1.ImageIndex, layers []v1.Layer) v1.ImageIn
176197
child, err := index.ImageIndex(descriptor.Digest)
177198
must("could not load oci index manifest", err)
178199

179-
child = appendLayersToImageIndex(child, layers)
200+
child = mutateImage(child, fn)
180201

181202
digest, err := child.Digest()
182203
must("could not get index digest", err)

0 commit comments

Comments
 (0)