Update cert manager bundle in the EKS-A bundle with new image (#8812)

aws · Sep 26, 2024 · 47c2381 · 47c2381
1 parent 3330319
commit 47c2381
Show file tree

Hide file tree

Showing 15 changed files with 236 additions and 97 deletions.
diff --git a/config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml b/config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
   name: bundles.anywhere.eks.amazonaws.com
 spec:
@@ -400,6 +399,7 @@ spec:
                               type: string
                           type: object
                         ctl:
+                          description: This field has been deprecated
                           properties:
                             arch:
                               description: Architectures of the asset
@@ -434,6 +434,35 @@ spec:
                               description: URI points to the manifest yaml file
                               type: string
                           type: object
+                        startupapicheck:
+                          properties:
+                            arch:
+                              description: Architectures of the asset
+                              items:
+                                type: string
+                              type: array
+                            description:
+                              type: string
+                            imageDigest:
+                              description: The SHA256 digest of the image manifest
+                              type: string
+                            name:
+                              description: The asset name
+                              type: string
+                            os:
+                              description: Operating system of the asset
+                              enum:
+                              - linux
+                              - darwin
+                              - windows
+                              type: string
+                            osName:
+                              description: Name of the OS like ubuntu, bottlerocket
+                              type: string
+                            uri:
+                              description: The image repository, name, and tag
+                              type: string
+                          type: object
                         version:
                           type: string
                         webhook:
@@ -469,8 +498,8 @@ spec:
                       - acmesolver
                       - cainjector
                       - controller
-                      - ctl
                       - manifest
+                      - startupapicheck
                       - webhook
                       type: object
                     cilium:

diff --git a/config/crd/bases/anywhere.eks.amazonaws.com_eksareleases.yaml b/config/crd/bases/anywhere.eks.amazonaws.com_eksareleases.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
   name: eksareleases.anywhere.eks.amazonaws.com
 spec:

diff --git a/config/manifest/eksa-components.yaml b/config/manifest/eksa-components.yaml
@@ -172,7 +172,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
   name: bundles.anywhere.eks.amazonaws.com
 spec:
@@ -567,7 +567,13 @@ spec:
                               description: The image repository, name, and tag
                               type: string
                           type: object
-                        ctl:
+                        manifest:
+                          properties:
+                            uri:
+                              description: URI points to the manifest yaml file
+                              type: string
+                          type: object
+                        startupapicheck:
                           properties:
                             arch:
                               description: Architectures of the asset
@@ -596,12 +602,6 @@ spec:
                               description: The image repository, name, and tag
                               type: string
                           type: object
-                        manifest:
-                          properties:
-                            uri:
-                              description: URI points to the manifest yaml file
-                              type: string
-                          type: object
                         version:
                           type: string
                         webhook:
@@ -637,8 +637,8 @@ spec:
                       - acmesolver
                       - cainjector
                       - controller
-                      - ctl
                       - manifest
+                      - startupapicheck
                       - webhook
                       type: object
                     cilium:
@@ -4943,7 +4943,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
   name: eksareleases.anywhere.eks.amazonaws.com
 spec:

diff --git 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/Makefile b/release/Makefile
@@ -35,8 +35,6 @@ WEEKLY_RELEASES_URL_PREFIX=https://dev-release-assets.eks-anywhere.model-rocket.
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
-# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -84,7 +82,7 @@ clean: ## Cleanup resources created by make targets
 ##@ Development
 
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) crd:crdVersions=v1 rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	## Copy only the bundles crd to root config kustomization folder
 	cp -f config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml ../config/crd/bases/
 	cp -f config/crd/bases/anywhere.eks.amazonaws.com_eksareleases.yaml ../config/crd/bases/

diff --git 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/artifacts_test.go b/release/api/v1alpha1/artifacts_test.go
@@ -125,3 +125,80 @@ func TestVersionsBundleSnowImages(t *testing.T) {
 		})
 	}
 }
+
+func TestVersionsBundleSharedImages(t *testing.T) {
+	expectedSharedImages := make([]v1alpha1.Image, 27)
+	expectedSharedImages = append(
+		expectedSharedImages[:5],
+		append(
+			[]v1alpha1.Image{
+				{
+					Name: "acmesolver",
+					URI:  "uri1",
+				},
+				{
+					Name: "cainjector",
+					URI:  "uri2",
+				},
+				{
+					Name: "controller",
+					URI:  "uri3",
+				},
+				{
+					Name: "startupapicheck",
+					URI:  "uri4",
+				},
+				{
+					Name: "webhook",
+					URI:  "uri5",
+				},
+			},
+			expectedSharedImages[5:]...,
+		)...,
+	)
+	tests := []struct {
+		name           string
+		versionsBundle *v1alpha1.VersionsBundle
+		want           []v1alpha1.Image
+	}{
+		{
+			name:           "no images",
+			versionsBundle: &v1alpha1.VersionsBundle{},
+			want:           make([]v1alpha1.Image, 32),
+		},
+		{
+			name: "cert-manager images",
+			versionsBundle: &v1alpha1.VersionsBundle{
+				CertManager: v1alpha1.CertManagerBundle{
+					Acmesolver: v1alpha1.Image{
+						Name: "acmesolver",
+						URI:  "uri1",
+					},
+					Cainjector: v1alpha1.Image{
+						Name: "cainjector",
+						URI:  "uri2",
+					},
+					Controller: v1alpha1.Image{
+						Name: "controller",
+						URI:  "uri3",
+					},
+					Startupapicheck: v1alpha1.Image{
+						Name: "startupapicheck",
+						URI:  "uri4",
+					},
+					Webhook: v1alpha1.Image{
+						Name: "webhook",
+						URI:  "uri5",
+					},
+				},
+			},
+			want: expectedSharedImages,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			g := NewWithT(t)
+			g.Expect(tt.versionsBundle.SharedImages()).To(Equal(tt.want))
+		})
+	}
+}
diff --git a/release/api/v1alpha1/bundle_types.go b/release/api/v1alpha1/bundle_types.go
@@ -151,13 +151,15 @@ 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"`
+	// This field has been deprecated
+	Ctl             *Image   `json:"ctl,omitempty"`
+	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
diff --git a/release/cli/pkg/assets/config/bundle_release.go b/release/cli/pkg/assets/config/bundle_release.go
@@ -81,7 +81,7 @@ var bundleReleaseAssetsConfigMap = []assettypes.AssetConfig{
 				RepoName: "cert-manager-controller",
 			},
 			{
-				RepoName: "cert-manager-ctl",
+				RepoName: "cert-manager-startupapicheck",
 			},
 			{
 				RepoName: "cert-manager-webhook",

diff --git 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