From 0dee81c534717b326d69dbd1e5da1ff9ceddf573 Mon Sep 17 00:00:00 2001 From: Saurabh Parekh Date: Mon, 23 Sep 2024 19:11:25 -0700 Subject: [PATCH] Update cert manager bundle in the EKS-A bundle with new image --- internal/test/testdata/bundles.yaml | 2 + release/api/v1alpha1/artifacts.go | 2 +- release/api/v1alpha1/bundle_types.go | 14 +++--- release/api/v1alpha1/zz_generated.deepcopy.go | 2 +- release/cli/pkg/bundles/certmanager.go | 14 +++--- .../testdata/main-bundle-release.yaml | 50 ++----------------- 6 files changed, 23 insertions(+), 61 deletions(-) diff --git a/internal/test/testdata/bundles.yaml b/internal/test/testdata/bundles.yaml index db5e3804c5f12..157431088eaf7 100644 --- a/internal/test/testdata/bundles.yaml +++ b/internal/test/testdata/bundles.yaml @@ -37,6 +37,8 @@ spec: uri: public.ecr.aws/l0g8r8j6/cert-manager/cert-manager-cainjector:v1.1.0-17655eca4c3db6708da08de4e04ea646d1cfd0c9 controller: uri: public.ecr.aws/l0g8r8j6/cert-manager/cert-manager-controller:v1.1.0-17655eca4c3db6708da08de4e04ea646d1cfd0c9 + startupapicheck: + uri: public.ecr.aws/l0g8r8j6/cert-manager/cert-manager-startupapicheck:v1.1.0-17655eca4c3db6708da08de4e04ea646d1cfd0c9 webhook: uri: public.ecr.aws/l0g8r8j6/cert-manager/cert-manager-webhook:v1.1.0-17655eca4c3db6708da08de4e04ea646d1cfd0c9 cilium: diff --git a/release/api/v1alpha1/artifacts.go b/release/api/v1alpha1/artifacts.go index 4dd5de3ea279a..40c8c58fbc1e4 100644 --- a/release/api/v1alpha1/artifacts.go +++ b/release/api/v1alpha1/artifacts.go @@ -177,7 +177,7 @@ func (vb *VersionsBundle) SharedImages() []Image { vb.CertManager.Acmesolver, vb.CertManager.Cainjector, vb.CertManager.Controller, - vb.CertManager.Ctl, + vb.CertManager.Startupapicheck, vb.CertManager.Webhook, vb.Cilium.Cilium, vb.Cilium.Operator, diff --git a/release/api/v1alpha1/bundle_types.go b/release/api/v1alpha1/bundle_types.go index ecd9205a6f503..7d7547f785034 100644 --- a/release/api/v1alpha1/bundle_types.go +++ b/release/api/v1alpha1/bundle_types.go @@ -151,13 +151,13 @@ type BottlerocketHostContainersBundle struct { } type CertManagerBundle struct { - Version string `json:"version,omitempty"` - Acmesolver Image `json:"acmesolver"` - Cainjector Image `json:"cainjector"` - Controller Image `json:"controller"` - Ctl Image `json:"ctl"` - Webhook Image `json:"webhook"` - Manifest Manifest `json:"manifest"` + Version string `json:"version,omitempty"` + Acmesolver Image `json:"acmesolver"` + Cainjector Image `json:"cainjector"` + Controller Image `json:"controller"` + Startupapicheck Image `json:"startupapicheck"` + Webhook Image `json:"webhook"` + Manifest Manifest `json:"manifest"` } type CoreClusterAPI struct { diff --git a/release/api/v1alpha1/zz_generated.deepcopy.go b/release/api/v1alpha1/zz_generated.deepcopy.go index fc574cbc1dc2b..6261f19e04b4d 100644 --- a/release/api/v1alpha1/zz_generated.deepcopy.go +++ b/release/api/v1alpha1/zz_generated.deepcopy.go @@ -253,7 +253,7 @@ func (in *CertManagerBundle) DeepCopyInto(out *CertManagerBundle) { in.Acmesolver.DeepCopyInto(&out.Acmesolver) in.Cainjector.DeepCopyInto(&out.Cainjector) in.Controller.DeepCopyInto(&out.Controller) - in.Ctl.DeepCopyInto(&out.Ctl) + in.Startupapicheck.DeepCopyInto(&out.Startupapicheck) in.Webhook.DeepCopyInto(&out.Webhook) out.Manifest = in.Manifest } diff --git a/release/cli/pkg/bundles/certmanager.go b/release/cli/pkg/bundles/certmanager.go index 80ab54321357c..47b82e0919d57 100644 --- a/release/cli/pkg/bundles/certmanager.go +++ b/release/cli/pkg/bundles/certmanager.go @@ -88,13 +88,13 @@ func GetCertManagerBundle(r *releasetypes.ReleaseConfig, imageDigests releasetyp } bundle := anywherev1alpha1.CertManagerBundle{ - Version: version, - Acmesolver: bundleImageArtifacts["cert-manager-acmesolver"], - Cainjector: bundleImageArtifacts["cert-manager-cainjector"], - Controller: bundleImageArtifacts["cert-manager-controller"], - Ctl: bundleImageArtifacts["cert-manager-ctl"], - Webhook: bundleImageArtifacts["cert-manager-webhook"], - Manifest: bundleManifestArtifacts["cert-manager.yaml"], + Version: version, + Acmesolver: bundleImageArtifacts["cert-manager-acmesolver"], + Cainjector: bundleImageArtifacts["cert-manager-cainjector"], + Controller: bundleImageArtifacts["cert-manager-controller"], + Startupapicheck: bundleImageArtifacts["cert-manager-startupapicheck"], + Webhook: bundleImageArtifacts["cert-manager-webhook"], + Manifest: bundleManifestArtifacts["cert-manager.yaml"], } return bundle, nil diff --git a/release/cli/pkg/operations/testdata/main-bundle-release.yaml b/release/cli/pkg/operations/testdata/main-bundle-release.yaml index 023e9f62cafcb..fa27eca88e366 100644 --- a/release/cli/pkg/operations/testdata/main-bundle-release.yaml +++ b/release/cli/pkg/operations/testdata/main-bundle-release.yaml @@ -86,17 +86,9 @@ spec: name: cert-manager-controller os: linux uri: public.ecr.aws/release-container-registry/cert-manager/cert-manager-controller:v1.14.7-eks-a-v0.0.0-dev-build.1 - ctl: - arch: - - amd64 - - arm64 - description: Container image for cert-manager-ctl image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: cert-manager-ctl - os: linux - uri: public.ecr.aws/release-container-registry/cert-manager/cert-manager-ctl:v1.14.7-eks-a-v0.0.0-dev-build.1 manifest: uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cert-manager/manifests/v1.14.7/cert-manager.yaml + startupapicheck: {} version: v1.14.7+abcdef1 webhook: arch: @@ -901,17 +893,9 @@ spec: name: cert-manager-controller os: linux uri: public.ecr.aws/release-container-registry/cert-manager/cert-manager-controller:v1.14.7-eks-a-v0.0.0-dev-build.1 - ctl: - arch: - - amd64 - - arm64 - description: Container image for cert-manager-ctl image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: cert-manager-ctl - os: linux - uri: public.ecr.aws/release-container-registry/cert-manager/cert-manager-ctl:v1.14.7-eks-a-v0.0.0-dev-build.1 manifest: uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cert-manager/manifests/v1.14.7/cert-manager.yaml + startupapicheck: {} version: v1.14.7+abcdef1 webhook: arch: @@ -1716,17 +1700,9 @@ spec: name: cert-manager-controller os: linux uri: public.ecr.aws/release-container-registry/cert-manager/cert-manager-controller:v1.14.7-eks-a-v0.0.0-dev-build.1 - ctl: - arch: - - amd64 - - arm64 - description: Container image for cert-manager-ctl image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: cert-manager-ctl - os: linux - uri: public.ecr.aws/release-container-registry/cert-manager/cert-manager-ctl:v1.14.7-eks-a-v0.0.0-dev-build.1 manifest: uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cert-manager/manifests/v1.14.7/cert-manager.yaml + startupapicheck: {} version: v1.14.7+abcdef1 webhook: arch: @@ -2531,17 +2507,9 @@ spec: name: cert-manager-controller os: linux uri: public.ecr.aws/release-container-registry/cert-manager/cert-manager-controller:v1.14.7-eks-a-v0.0.0-dev-build.1 - ctl: - arch: - - amd64 - - arm64 - description: Container image for cert-manager-ctl image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: cert-manager-ctl - os: linux - uri: public.ecr.aws/release-container-registry/cert-manager/cert-manager-ctl:v1.14.7-eks-a-v0.0.0-dev-build.1 manifest: uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cert-manager/manifests/v1.14.7/cert-manager.yaml + startupapicheck: {} version: v1.14.7+abcdef1 webhook: arch: @@ -3346,17 +3314,9 @@ spec: name: cert-manager-controller os: linux uri: public.ecr.aws/release-container-registry/cert-manager/cert-manager-controller:v1.14.7-eks-a-v0.0.0-dev-build.1 - ctl: - arch: - - amd64 - - arm64 - description: Container image for cert-manager-ctl image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: cert-manager-ctl - os: linux - uri: public.ecr.aws/release-container-registry/cert-manager/cert-manager-ctl:v1.14.7-eks-a-v0.0.0-dev-build.1 manifest: uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cert-manager/manifests/v1.14.7/cert-manager.yaml + startupapicheck: {} version: v1.14.7+abcdef1 webhook: arch: