Skip to content

Commit

Permalink
BOT: run 'make upgrade-klone' and 'make generate'
Browse files Browse the repository at this point in the history 
Signed-off-by: cert-manager-bot <cert-manager-bot@users.noreply.github.com>
  • Loading branch information
@cert-manager-bot
cert-manager-bot committed May 22, 2024
1 parent c1dbae3 commit 0c289fa
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 49 deletions.
26 changes: 13 additions & 13 deletions klone.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,65 +10,65 @@ targets:
- folder_name: boilerplate
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/boilerplate
- folder_name: cert-manager
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/cert-manager
- folder_name: controller-gen
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/controller-gen
- folder_name: generate-verify
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/generate-verify
- folder_name: go
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/go
- folder_name: helm
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/helm
- folder_name: help
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/help
- folder_name: kind
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/kind
- folder_name: klone
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/klone
- folder_name: oci-build
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/oci-build
- folder_name: oci-publish
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/oci-publish
- folder_name: repository-base
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/repository-base
- folder_name: tools
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: b6dc86973e937be38a138f38cf83134760487f26
repo_hash: 8fbdf9eb949b8712e3017fb8242a7f406633c312
repo_path: modules/tools
6 changes: 3 additions & 3 deletions make/_shared/kind/00_mod.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
images_amd64 ?=
images_arm64 ?=

kind_k8s_version := v1.29.2
kind_k8s_version := v1.29.4

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

images_amd64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:acc9e82a5a5bd3dfccfd03117e9ef5f96b46108b55cd647fb5e7d0d1a35c9c6f
images_arm64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:068aaa834c09ab60d925a8569c6b5f5b9cf46eccf670499176f3267f2ac3189c
images_amd64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:ea40a6bd365a17f71fd3883a1d34a0791d7d6b0eb75832c6d85b6f2326827f1e
images_arm64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:e63a7f74e80b746328fbaa70be406639d0c31c8c8cf0a3d57efdd23c64fe4bba
69 changes: 45 additions & 24 deletions make/_shared/oci-build/image_tool/append_layers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,49 @@ var CommandAppendLayers = cobra.Command{
index, err := path.ImageIndex()
must("could not load oci image index", err)

indexMediaType, err := index.MediaType()
must("could not get image index media type", err)

layerType := types.DockerLayer
if indexMediaType == types.OCIImageIndex {
layerType = types.OCILayer
}

layers := []v1.Layer{}
layers := []untypedLayer{}
for _, path := range extra {
layers = append(layers, loadLayerFromDirOrTarball(path, layerType))
layers = append(layers, newUntypedLayerFromPath(path))
}

index = appendLayersToImageIndex(index, layers)
index = mutateImage(index, func(img v1.Image) v1.Image {
imgMediaType, err := img.MediaType()
must("could not get image media type", err)

layerType := types.DockerLayer
if imgMediaType == types.OCIManifestSchema1 {
layerType = types.OCILayer
}

for _, untypedLayer := range layers {
layer, err := untypedLayer.ToLayer(layerType)
must("could not load image layer", err)

img, err = mutate.AppendLayers(img, layer)
must("could not append layer", err)
}

return img
})

_, err = layout.Write(oci, index)
must("could not write image", err)
},
}

func loadLayerFromDirOrTarball(path string, mediaType types.MediaType) v1.Layer {
type untypedLayer struct {
tarball tarball.Opener
}

func newUntypedLayer(tarball tarball.Opener) untypedLayer {
return untypedLayer{tarball: tarball}
}

func newUntypedLayerFromPath(path string) untypedLayer {
stat, err := os.Stat(path)
must("could not open directory or tarball", err)

var layer v1.Layer
var layer untypedLayer
if stat.IsDir() {
var buf bytes.Buffer

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

byts := buf.Bytes()

layer, err = tarball.LayerFromOpener(
layer = newUntypedLayer(
func() (io.ReadCloser, error) {
return io.NopCloser(bytes.NewReader(byts)), nil
},
tarball.WithMediaType(mediaType),
)

} else {
layer, err = tarball.LayerFromFile(
path,
tarball.WithMediaType(mediaType),
layer = newUntypedLayer(
func() (io.ReadCloser, error) {
return os.Open(path)
},
)
}

must("could not open directory or tarball", err)
return layer
}

func appendLayersToImageIndex(index v1.ImageIndex, layers []v1.Layer) v1.ImageIndex {
func (ul untypedLayer) ToLayer(mediaType types.MediaType) (v1.Layer, error) {
return tarball.LayerFromOpener(ul.tarball, tarball.WithMediaType(mediaType))
}

type imageMutateFn func(index v1.Image) v1.Image

func mutateImage(index v1.ImageIndex, fn imageMutateFn) v1.ImageIndex {
manifest, err := index.IndexManifest()
must("could not load oci image manifest", err)

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

img, err = mutate.AppendLayers(img, layers...)
must("could not load append layer to image", err)
img = fn(img)

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

child = appendLayersToImageIndex(child, layers)
child = mutateImage(child, fn)

digest, err := child.Digest()
must("could not get index digest", err)
Expand Down
19 changes: 10 additions & 9 deletions make/_shared/tools/00_mod.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ tools += helm=v3.14.4
# https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
tools += kubectl=v1.30.0
# https://github.com/kubernetes-sigs/kind/releases
tools += kind=v0.22.0
tools += kind=v0.23.0
# https://www.vaultproject.io/downloads
tools += vault=1.16.2
# https://github.com/Azure/azure-workload-identity/releases
Expand All @@ -72,7 +72,7 @@ tools += rclone=v1.66.0

### go packages
# https://pkg.go.dev/sigs.k8s.io/controller-tools/cmd/controller-gen?tab=versions
tools += controller-gen=v0.14.0
tools += controller-gen=v0.15.0
# https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions
tools += goimports=v0.20.0
# https://pkg.go.dev/github.com/google/go-licenses/licenses?tab=versions
Expand Down Expand Up @@ -132,15 +132,16 @@ tools += gci=v0.13.4
tools += yamlfmt=v0.12.1

# https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
K8S_CODEGEN_VERSION := v0.29.3
K8S_CODEGEN_VERSION := v0.30.1
tools += client-gen=$(K8S_CODEGEN_VERSION)
tools += deepcopy-gen=$(K8S_CODEGEN_VERSION)
tools += informer-gen=$(K8S_CODEGEN_VERSION)
tools += lister-gen=$(K8S_CODEGEN_VERSION)
tools += applyconfiguration-gen=$(K8S_CODEGEN_VERSION)
tools += openapi-gen=$(K8S_CODEGEN_VERSION)
tools += defaulter-gen=$(K8S_CODEGEN_VERSION)
tools += conversion-gen=$(K8S_CODEGEN_VERSION)
# https://github.com/kubernetes/kube-openapi
tools += openapi-gen=f0e62f92d13f418e2732b21c952fd17cab771c75

# https://github.com/kubernetes-sigs/kubebuilder/blob/tools-releases/build/cloudbuild_tools.yaml
KUBEBUILDER_ASSETS_VERSION := 1.30.0
Expand Down Expand Up @@ -317,9 +318,9 @@ go_dependencies += deepcopy-gen=k8s.io/code-generator/cmd/deepcopy-gen
go_dependencies += informer-gen=k8s.io/code-generator/cmd/informer-gen
go_dependencies += lister-gen=k8s.io/code-generator/cmd/lister-gen
go_dependencies += applyconfiguration-gen=k8s.io/code-generator/cmd/applyconfiguration-gen
go_dependencies += openapi-gen=k8s.io/code-generator/cmd/openapi-gen
go_dependencies += defaulter-gen=k8s.io/code-generator/cmd/defaulter-gen
go_dependencies += conversion-gen=k8s.io/code-generator/cmd/conversion-gen
go_dependencies += openapi-gen=k8s.io/kube-openapi/cmd/openapi-gen
go_dependencies += helm-tool=github.com/cert-manager/helm-tool
go_dependencies += cmctl=github.com/cert-manager/cmctl/v2
go_dependencies += cmrel=github.com/cert-manager/release/cmd/cmrel
Expand Down Expand Up @@ -399,10 +400,10 @@ $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DO
$(checkhash_script) $(outfile) $(kubectl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
chmod +x $(outfile)

kind_linux_amd64_SHA256SUM=e4264d7ee07ca642fe52818d7c0ed188b193c214889dd055c929dbcb968d1f62
kind_linux_arm64_SHA256SUM=4431805115da3b54290e3e976fe2db9a7e703f116177aace6735dfa1d8a4f3fe
kind_darwin_amd64_SHA256SUM=28a9f7ad7fd77922c639e21c034d0f989b33402693f4f842099cd9185b144d20
kind_darwin_arm64_SHA256SUM=c8dd3b287965150ae4db668294edc48229116e95d94620c306d8fae932ee633f
kind_linux_amd64_SHA256SUM=1d86e3069ffbe3da9f1a918618aecbc778e00c75f838882d0dfa2d363bc4a68c
kind_linux_arm64_SHA256SUM=a416d6c311882337f0e56910e4a2e1f8c106ec70c22cbf0ac1dd8f33c1e284fe
kind_darwin_amd64_SHA256SUM=81c77f104b4b668812f7930659dc01ad88fa4d1cfc56900863eacdfb2731c457
kind_darwin_arm64_SHA256SUM=68ec87c1e1ea2a708df883f4b94091150d19552d7b344e80ca59f449b301c2a0

.PRECIOUS: $(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH)
$(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
Expand Down

0 comments on commit 0c289fa

Please sign in to comment.