Merge pull request #119 from cert-manager/self-upgrade-main

[CI] Merge self-upgrade-main into main
cert-manager · May 20, 2024 · 60bcf2f · 60bcf2f
2 parents 3a13da4 + 07cbca3
commit 60bcf2f
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 66 deletions.
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -11,3 +11,4 @@ aliases:
  - irbekrm
  - sgtcodfish
  - inteon
+ - thatsmrtalbot
diff --git a/examples/simple/deploy/crds/testing.cert-manager.io_simpleclusterissuers.yaml b/examples/simple/deploy/crds/testing.cert-manager.io_simpleclusterissuers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.15.0
  name: simpleclusterissuers.testing.cert-manager.io
 spec:
  group: testing.cert-manager.io

diff --git a/examples/simple/deploy/crds/testing.cert-manager.io_simpleissuers.yaml b/examples/simple/deploy/crds/testing.cert-manager.io_simpleissuers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.15.0
  name: simpleissuers.testing.cert-manager.io
 spec:
  group: testing.cert-manager.io

diff --git a/internal/testapi/crds/testing.cert-manager.io_testclusterissuers.yaml b/internal/testapi/crds/testing.cert-manager.io_testclusterissuers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.15.0
  name: testclusterissuers.testing.cert-manager.io
 spec:
  group: testing.cert-manager.io

diff --git a/internal/testapi/crds/testing.cert-manager.io_testissuers.yaml b/internal/testapi/crds/testing.cert-manager.io_testissuers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.15.0
  name: testissuers.testing.cert-manager.io
 spec:
  group: testing.cert-manager.io

diff --git a/klone.yaml b/klone.yaml
@@ -9,60 +9,60 @@ targets:
  - folder_name: api-docs
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/api-docs
  - folder_name: boilerplate
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/boilerplate
  - folder_name: cert-manager
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/cert-manager
  - folder_name: controller-gen
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/controller-gen
  - folder_name: generate-verify
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/generate-verify
  - folder_name: go
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/go
  - folder_name: help
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/help
  - folder_name: kind
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/kind
  - folder_name: klone
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/klone
  - folder_name: oci-build
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/oci-build
  - folder_name: repository-base
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/repository-base
  - folder_name: tools
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
+ repo_hash: d9d816ad61c9ca979f815cc993304f21aae5b394
  repo_path: modules/tools
diff --git a/make/_shared/cert-manager/00_mod.mk b/make/_shared/cert-manager/00_mod.mk
@@ -15,14 +15,14 @@
 images_amd64 ?=
 images_arm64 ?=
 
-cert_manager_version := v1.14.4
+cert_manager_version := v1.14.5
 
-images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:f84edf06327f84ed2ca056776659aa144cf3cc982c5403650c24553c5a44b03d
-images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:8267563833c31cc428b9ae460b890d079a1da09a4d8d00ec299a47dd613fbd24
-images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:ba5469d1a77b1cb04a703199b0e69bc25644a00498adc3694a0369c87375b4ca
-images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:2a1545099cf6386ab08e979a58a6280fe123d091c69f8222bfb22c597003a3f0
+images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:f37f460aaa7598ba251ff1cbe7438012fd56c4acc94be64245e8a836203c5542
+images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:6d9ebced61371cc903f7934690923034382456f3ce6e0fe2b692c40dbd67d523
+images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:ac34b1905a2ff20789fde27115d3e1aa7b3d09f57efba4e91ae2ba1744de4ad2
+images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:5c74e4e37586dc5c35442515f43ecf222e961b65e954798428ac9239408bc0f3
 
-images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:39a6e9e699b3dacb8b92538efbaff85c16d4b30343ebeaaf2f35772ff3cebf53
-images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:956aac21371499fdcc8811b4b5fc8e2e0d6e552b15723c783fe56270347fc9e0
-images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:8ea8462c1daa7604f4f2e71e0cdeef3dd5d7e0f04341982a05dc296299766126
-images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:f4cd54540f8813e63a2f53b5b210454ae2a5fe0949b9f55d8f1270162ebad9a8
+images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:96668890d162a743407c0ef14d7769e970aa16655959b5f5cab0c595167148fa
+images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:719aec5d99e86377829261451985592bc4129c5ca8dcb7f20b32170742f2b29b
+images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:874da5701a98e352fa28d88470671eb792a472737a3cf2b7ce9966817e962de8
+images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:35d35b325b980cc702324e52b443cc7eb1df7211ce4e8e91d96da4eff4b6c894
diff --git a/make/_shared/kind/00_mod.mk b/make/_shared/kind/00_mod.mk
@@ -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
@@ -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
diff --git a/make/_shared/oci-build/image_tool/append_layers.go b/make/_shared/oci-build/image_tool/append_layers.go
@@ -30,6 +30,7 @@ import (
  "github.com/google/go-containerregistry/pkg/v1/match"
  "github.com/google/go-containerregistry/pkg/v1/mutate"
  "github.com/google/go-containerregistry/pkg/v1/tarball"
+ "github.com/google/go-containerregistry/pkg/v1/types"
  "github.com/spf13/cobra"
 )
 
@@ -45,16 +46,33 @@ var CommandAppendLayers = cobra.Command{
  return
  }
 
+ path, err := layout.FromPath(oci)
+ must("could not load oci directory", err)
+
+ 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{}
  for _, path := range extra {
- layers = append(layers, loadLayerFromDirOrTarball(path))
+ layers = append(layers, loadLayerFromDirOrTarball(path, layerType))
  }
 
- appendLayersToAllImages(oci, layers...)
+ index = appendLayersToImageIndex(index, layers)
+
+ _, err = layout.Write(oci, index)
+ must("could not write image", err)
  },
 }
 
-func loadLayerFromDirOrTarball(path string) v1.Layer {
+func loadLayerFromDirOrTarball(path string, mediaType types.MediaType) v1.Layer {
  stat, err := os.Stat(path)
  must("could not open directory or tarball", err)
 
@@ -102,31 +120,24 @@ func loadLayerFromDirOrTarball(path string) v1.Layer {
 
  byts := buf.Bytes()
 
- layer, err = tarball.LayerFromOpener(func() (io.ReadCloser, error) {
- return io.NopCloser(bytes.NewReader(byts)), nil
- })
+ layer, err = tarball.LayerFromOpener(
+ func() (io.ReadCloser, error) {
+ return io.NopCloser(bytes.NewReader(byts)), nil
+ },
+ tarball.WithMediaType(mediaType),
+ )
 
  } else {
- layer, err = tarball.LayerFromFile(path)
+ layer, err = tarball.LayerFromFile(
+ path,
+ tarball.WithMediaType(mediaType),
+ )
  }
 
  must("could not open directory or tarball", err)
  return layer
 }
 
-func appendLayersToAllImages(oci string, layers ...v1.Layer) {
- path, err := layout.FromPath(oci)
- must("could not load oci directory", err)
-
- index, err := path.ImageIndex()
- must("could not load oci image index", err)
-
- index = appendLayersToImageIndex(index, layers)
-
- _, err = layout.Write(oci, index)
- must("could not write image", err)
-}
-
 func appendLayersToImageIndex(index v1.ImageIndex, layers []v1.Layer) v1.ImageIndex {
  manifest, err := index.IndexManifest()
  must("could not load oci image manifest", err)
@@ -145,11 +156,15 @@ func appendLayersToImageIndex(index v1.ImageIndex, layers []v1.Layer) v1.ImageIn
  digest, err := img.Digest()
  must("could not get image digest", err)
 
+ size, err := img.Size()
+ must("could not get image size", err)
+
  slog.Info("appended layers to image", "old_digest", descriptor.Digest, "digest", digest, "platform", descriptor.Platform)
 
  index = mutate.RemoveManifests(index, match.Digests(descriptor.Digest))
 
  descriptor.Digest = digest
+ descriptor.Size = size
  index = mutate.AppendManifests(index, mutate.IndexAddendum{
  Add: img,
  Descriptor: descriptor,
@@ -159,16 +174,20 @@ func appendLayersToImageIndex(index v1.ImageIndex, layers []v1.Layer) v1.ImageIn
  slog.Info("found image index", "digest", descriptor.Digest)
 
  child, err := index.ImageIndex(descriptor.Digest)
- must("could not load oci image manifest", err)
+ must("could not load oci index manifest", err)
 
  child = appendLayersToImageIndex(child, layers)
 
  digest, err := child.Digest()
- must("could not get image digest", err)
+ must("could not get index digest", err)
+
+ size, err := child.Size()
+ must("could not get index size", err)
 
  index = mutate.RemoveManifests(index, match.Digests(descriptor.Digest))
 
  descriptor.Digest = digest
+ descriptor.Size = size
  index = mutate.AppendManifests(index, mutate.IndexAddendum{
  Add: child,
  Descriptor: descriptor,

diff --git a/make/_shared/repository-base/base/OWNERS_ALIASES b/make/_shared/repository-base/base/OWNERS_ALIASES
@@ -11,3 +11,4 @@ aliases:
  - irbekrm
  - sgtcodfish
  - inteon
+ - thatsmrtalbot