Skip to content

Commit

Permalink
Update cert manager bundle in the EKS-A bundle with new image
Browse files Browse the repository at this point in the history
  • Loading branch information
sp1999 committed Sep 24, 2024
1 parent c7c5e48 commit 0dee81c
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 61 deletions.
2 changes: 2 additions & 0 deletions internal/test/testdata/bundles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion release/api/v1alpha1/artifacts.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
14 changes: 7 additions & 7 deletions release/api/v1alpha1/bundle_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion release/api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions release/cli/pkg/bundles/certmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
50 changes: 5 additions & 45 deletions release/cli/pkg/operations/testdata/main-bundle-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 0dee81c

Please sign in to comment.