Skip to content

Commit 7344f4e

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 7344f4e

File tree

5 files changed

+83
-61
lines changed

5 files changed

+83
-61
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
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: 544698c4752af491a6f377e6b299253f73d3f5a9
7474
repo_path: modules/tools

‎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)

‎make/_shared/tools/00_mod.mk

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ tools += helm=v3.14.4
5050
# https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
5151
tools += kubectl=v1.30.0
5252
# https://github.com/kubernetes-sigs/kind/releases
53-
tools += kind=v0.22.0
53+
tools += kind=v0.23.0
5454
# https://www.vaultproject.io/downloads
5555
tools += vault=1.16.2
5656
# https://github.com/Azure/azure-workload-identity/releases
@@ -72,7 +72,7 @@ tools += rclone=v1.66.0
7272

7373
### go packages
7474
# https://pkg.go.dev/sigs.k8s.io/controller-tools/cmd/controller-gen?tab=versions
75-
tools += controller-gen=v0.14.0
75+
tools += controller-gen=v0.15.0
7676
# https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions
7777
tools += goimports=v0.20.0
7878
# https://pkg.go.dev/github.com/google/go-licenses/licenses?tab=versions
@@ -132,18 +132,19 @@ tools += gci=v0.13.4
132132
tools += yamlfmt=v0.12.1
133133

134134
# https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
135-
K8S_CODEGEN_VERSION := v0.29.3
135+
K8S_CODEGEN_VERSION := v0.30.1
136136
tools += client-gen=$(K8S_CODEGEN_VERSION)
137137
tools += deepcopy-gen=$(K8S_CODEGEN_VERSION)
138138
tools += informer-gen=$(K8S_CODEGEN_VERSION)
139139
tools += lister-gen=$(K8S_CODEGEN_VERSION)
140140
tools += applyconfiguration-gen=$(K8S_CODEGEN_VERSION)
141-
tools += openapi-gen=$(K8S_CODEGEN_VERSION)
142141
tools += defaulter-gen=$(K8S_CODEGEN_VERSION)
143142
tools += conversion-gen=$(K8S_CODEGEN_VERSION)
143+
# https://github.com/kubernetes/kube-openapi
144+
tools += openapi-gen=f0e62f92d13f418e2732b21c952fd17cab771c75
144145

145-
# https://github.com/kubernetes-sigs/kubebuilder/blob/tools-releases/build/cloudbuild_tools.yaml
146-
KUBEBUILDER_ASSETS_VERSION := 1.30.0
146+
# https://raw.githubusercontent.com/kubernetes-sigs/controller-tools/master/envtest-releases.yaml
147+
KUBEBUILDER_ASSETS_VERSION := v1.30.0
147148
tools += etcd=$(KUBEBUILDER_ASSETS_VERSION)
148149
tools += kube-apiserver=$(KUBEBUILDER_ASSETS_VERSION)
149150

@@ -317,9 +318,9 @@ go_dependencies += deepcopy-gen=k8s.io/code-generator/cmd/deepcopy-gen
317318
go_dependencies += informer-gen=k8s.io/code-generator/cmd/informer-gen
318319
go_dependencies += lister-gen=k8s.io/code-generator/cmd/lister-gen
319320
go_dependencies += applyconfiguration-gen=k8s.io/code-generator/cmd/applyconfiguration-gen
320-
go_dependencies += openapi-gen=k8s.io/code-generator/cmd/openapi-gen
321321
go_dependencies += defaulter-gen=k8s.io/code-generator/cmd/defaulter-gen
322322
go_dependencies += conversion-gen=k8s.io/code-generator/cmd/conversion-gen
323+
go_dependencies += openapi-gen=k8s.io/kube-openapi/cmd/openapi-gen
323324
go_dependencies += helm-tool=github.com/cert-manager/helm-tool
324325
go_dependencies += cmctl=github.com/cert-manager/cmctl/v2
325326
go_dependencies += cmrel=github.com/cert-manager/release/cmd/cmrel
@@ -399,10 +400,10 @@ $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DO
399400
$(checkhash_script) $(outfile) $(kubectl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
400401
chmod +x $(outfile)
401402

402-
kind_linux_amd64_SHA256SUM=e4264d7ee07ca642fe52818d7c0ed188b193c214889dd055c929dbcb968d1f62
403-
kind_linux_arm64_SHA256SUM=4431805115da3b54290e3e976fe2db9a7e703f116177aace6735dfa1d8a4f3fe
404-
kind_darwin_amd64_SHA256SUM=28a9f7ad7fd77922c639e21c034d0f989b33402693f4f842099cd9185b144d20
405-
kind_darwin_arm64_SHA256SUM=c8dd3b287965150ae4db668294edc48229116e95d94620c306d8fae932ee633f
403+
kind_linux_amd64_SHA256SUM=1d86e3069ffbe3da9f1a918618aecbc778e00c75f838882d0dfa2d363bc4a68c
404+
kind_linux_arm64_SHA256SUM=a416d6c311882337f0e56910e4a2e1f8c106ec70c22cbf0ac1dd8f33c1e284fe
405+
kind_darwin_amd64_SHA256SUM=81c77f104b4b668812f7930659dc01ad88fa4d1cfc56900863eacdfb2731c457
406+
kind_darwin_arm64_SHA256SUM=68ec87c1e1ea2a708df883f4b94091150d19552d7b344e80ca59f449b301c2a0
406407

407408
.PRECIOUS: $(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH)
408409
$(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -438,24 +439,24 @@ $(DOWNLOAD_DIR)/tools/azwi@$(AZWI_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD
438439
tar xfO $(outfile).tar.gz azwi > $(outfile) && chmod 775 $(outfile); \
439440
rm -f $(outfile).tar.gz
440441

441-
kubebuilder_tools_linux_amd64_SHA256SUM=d51dae845397b7548444157903f2d573493afb6f90ce9417c0f5c61d4b1f908d
442-
kubebuilder_tools_linux_arm64_SHA256SUM=83123010f603390ee0f417ad1cf2a715f5bff335c5841dcd4221764e52732336
443-
kubebuilder_tools_darwin_amd64_SHA256SUM=46f5a680f28b6db9fdaaab4659dee68a1f2e04a0d9a39f9b0176562a9e95167b
444-
kubebuilder_tools_darwin_arm64_SHA256SUM=ce37b6fcd7678d78a610da1ae5e8e68777025b2bf046558820f967fe7a8f0dfd
442+
kubebuilder_tools_linux_amd64_SHA256SUM=2a9792cb5f1403f524543ce94c3115e3c4a4229f0e86af55fd26c078da448164
443+
kubebuilder_tools_linux_arm64_SHA256SUM=39cc7274a3075a650a20fcd24b9e2067375732bebaf5356088a8efb35155f068
444+
kubebuilder_tools_darwin_amd64_SHA256SUM=85890b864330baec88f53aabfc1d5d94a8ca8c17483f34f4823dec0fae7c6e3a
445+
kubebuilder_tools_darwin_arm64_SHA256SUM=849362d26105b64193b4142982c710306d90248272731a81fb83efac27c5a750
445446

446447
.PRECIOUS: $(DOWNLOAD_DIR)/tools/kubebuilder_tools_$(KUBEBUILDER_ASSETS_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
447448
$(DOWNLOAD_DIR)/tools/kubebuilder_tools_$(KUBEBUILDER_ASSETS_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools
448449
@source $(lock_script) $@; \
449-
$(CURL) https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools-$(KUBEBUILDER_ASSETS_VERSION)-$(HOST_OS)-$(HOST_ARCH).tar.gz -o $(outfile); \
450+
$(CURL) https://github.com/kubernetes-sigs/controller-tools/releases/download/envtest-$(KUBEBUILDER_ASSETS_VERSION)/envtest-$(KUBEBUILDER_ASSETS_VERSION)-$(HOST_OS)-$(HOST_ARCH).tar.gz -o $(outfile); \
450451
$(checkhash_script) $(outfile) $(kubebuilder_tools_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM)
451452

452453
$(DOWNLOAD_DIR)/tools/etcd@$(KUBEBUILDER_ASSETS_VERSION)_$(HOST_OS)_$(HOST_ARCH): $(DOWNLOAD_DIR)/tools/kubebuilder_tools_$(KUBEBUILDER_ASSETS_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz | $(DOWNLOAD_DIR)/tools
453454
@source $(lock_script) $@; \
454-
tar xfO $< kubebuilder/bin/etcd > $(outfile) && chmod 775 $(outfile)
455+
tar xfO $< controller-tools/envtest/etcd > $(outfile) && chmod 775 $(outfile)
455456

456457
$(DOWNLOAD_DIR)/tools/kube-apiserver@$(KUBEBUILDER_ASSETS_VERSION)_$(HOST_OS)_$(HOST_ARCH): $(DOWNLOAD_DIR)/tools/kubebuilder_tools_$(KUBEBUILDER_ASSETS_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz | $(DOWNLOAD_DIR)/tools
457458
@source $(lock_script) $@; \
458-
tar xfO $< kubebuilder/bin/kube-apiserver > $(outfile) && chmod 775 $(outfile)
459+
tar xfO $< controller-tools/envtest/kube-apiserver > $(outfile) && chmod 775 $(outfile)
459460

460461
kyverno_linux_amd64_SHA256SUM=a5f6e9070c17acc47168c8ce4db78e45258376551b8bf68ad2d5ed27454cf666
461462
kyverno_linux_arm64_SHA256SUM=007e828d622e73614365f5f7e8e107e36ae686e97e8982b1eeb53511fb2363c3

0 commit comments

Comments
 (0)