update management commponents annotation version; change eksa cli field

manager name
aws · Jan 17, 2024 · 65ad481 · 65ad481
1 parent 1400a46
commit 65ad481
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 17 deletions.
diff --git a/internal/test/cluster.go b/internal/test/cluster.go
@@ -47,12 +47,8 @@ func NewClusterSpec(opts ...ClusterSpecOpt) *cluster.Spec {
 	}
 	s.VersionsBundles = map[v1alpha1.KubernetesVersion]*cluster.VersionsBundle{
 		v1alpha1.Kube119: {
-			VersionsBundle: &releasev1alpha1.VersionsBundle{
-				Eksa: releasev1alpha1.EksaBundle{
-					Version: "v0.0.0-dev+build.0000+000000",
-				},
-			},
-			KubeDistro: &cluster.KubeDistro{},
+			VersionsBundle: &releasev1alpha1.VersionsBundle{},
+			KubeDistro:     &cluster.KubeDistro{},
 		},
 	}
 	s.Bundles = &releasev1alpha1.Bundles{}

diff --git a/pkg/api/v1alpha1/cluster_types.go b/pkg/api/v1alpha1/cluster_types.go
@@ -44,7 +44,7 @@ const (
 	// managementComponentsVersionAnnotation is an annotation applied to an EKS-A management cluster pointing to the current version of the management components.
 	// The value for this annotation is expected to correspond to an EKSARelease object version, following semantic version convention: e.g. v0.18.3
 	// This is an internal EKS-A managed annotation, not meant to be updated manually.
-	managementComponentsVersionAnnotation = "anywhere.eks.amazonaws.com/eksa-management-components-version"
+	managementComponentsVersionAnnotation = "anywhere.eks.amazonaws.com/management-components-version"
 
 	// defaultEksaNamespace is the default namespace for EKS-A resources when not specified.
 	defaultEksaNamespace = "default"

diff --git a/pkg/api/v1alpha1/cluster_types_test.go b/pkg/api/v1alpha1/cluster_types_test.go
@@ -3243,7 +3243,7 @@ func TestCluster_SetManagmentComponentsVersion(t *testing.T) {
 			name:                        "self-managed cluster",
 			cluster:                     baseCluster(),
 			managementComponentsVersion: "v0.0.0-dev+build.0000",
-			wantAnnotations:             map[string]string{"anywhere.eks.amazonaws.com/eksa-management-components-version": "v0.0.0-dev+build.0000"},
+			wantAnnotations:             map[string]string{"anywhere.eks.amazonaws.com/management-components-version": "v0.0.0-dev+build.0000"},
 		},
 		{
 			name: "managed cluster",

diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -100,5 +100,5 @@ const (
 	Delete  Operation = 2
 )
 
-// EKSAFieldManager is the owner name for fields applied by the EKS-A CLI.
-const EKSAFieldManager = "eks-a-cli"
+// EKSACLIFieldManager is the owner name for fields applied by the EKS-A CLI.
+const EKSACLIFieldManager = "eks-a-cli"
diff --git a/pkg/workflows/create.go b/pkg/workflows/create.go
@@ -386,7 +386,7 @@ func (s *InstallEksaComponentsTask) Run(ctx context.Context, commandContext *tas
 
 	commandContext.ClusterSpec.Cluster.SetManagementComponentsVersion(commandContext.ClusterSpec.EKSARelease.Spec.Version)
 	if err := client.ApplyServerSide(ctx,
-		constants.EKSAFieldManager,
+		constants.EKSACLIFieldManager,
 		commandContext.ClusterSpec.Cluster,
 		kubernetes.ApplyServerSideOptions{ForceOwnership: true},
 	); err != nil {

diff --git a/pkg/workflows/create_test.go b/pkg/workflows/create_test.go
@@ -215,7 +215,7 @@ func (c *createTestSetup) expectInstallEksaComponents() {
 
 		c.client.EXPECT().ApplyServerSide(
 			c.ctx,
-			constants.EKSAFieldManager,
+			constants.EKSACLIFieldManager,
 			c.clusterSpec.Cluster,
 			kubernetes.ApplyServerSideOptions{ForceOwnership: true},
 		),
@@ -246,7 +246,7 @@ func (c *createTestSetup) skipInstallEksaComponents() {
 
 		c.client.EXPECT().ApplyServerSide(
 			c.ctx,
-			constants.EKSAFieldManager,
+			constants.EKSACLIFieldManager,
 			c.clusterSpec.Cluster,
 			kubernetes.ApplyServerSideOptions{ForceOwnership: true},
 		),
@@ -389,7 +389,7 @@ func TestCreateRunInstallEksaComponentsApplyServerSideFailure(t *testing.T) {
 
 		test.client.EXPECT().ApplyServerSide(
 			test.ctx,
-			constants.EKSAFieldManager,
+			constants.EKSACLIFieldManager,
 			test.clusterSpec.Cluster,
 			kubernetes.ApplyServerSideOptions{ForceOwnership: true},
 		).Return(wantError),

diff --git a/pkg/workflows/management/core_components.go b/pkg/workflows/management/core_components.go
@@ -94,7 +94,7 @@ func runUpgradeCoreComponents(ctx context.Context, commandContext *task.CommandC
 	}
 	commandContext.ClusterSpec.Cluster.SetManagementComponentsVersion(commandContext.ClusterSpec.EKSARelease.Spec.Version)
 	if err := client.ApplyServerSide(ctx,
-		constants.EKSAFieldManager,
+		constants.EKSACLIFieldManager,
 		commandContext.ClusterSpec.Cluster,
 		kubernetes.ApplyServerSideOptions{ForceOwnership: true},
 	); err != nil {

diff --git a/pkg/workflows/management/upgrade_management_components_test.go b/pkg/workflows/management/upgrade_management_components_test.go
@@ -112,7 +112,7 @@ func TestRunnerHappyPath(t *testing.T) {
 		mocks.clientFactory.EXPECT().BuildClientFromKubeconfig(managementCluster.KubeconfigFile).Return(mocks.client, nil),
 		mocks.client.EXPECT().ApplyServerSide(
 			ctx,
-			constants.EKSAFieldManager,
+			constants.EKSACLIFieldManager,
 			newSpec.Cluster,
 			kubernetes.ApplyServerSideOptions{ForceOwnership: true},
 		).Return(nil),

diff --git a/pkg/workflows/management/upgrade_test.go b/pkg/workflows/management/upgrade_test.go
@@ -180,7 +180,7 @@ func (c *upgradeManagementTestSetup) expectBuildClientFromKubeconfig(err error)
 func (c *upgradeManagementTestSetup) expectApplyServerSide(err error) {
 	c.client.EXPECT().ApplyServerSide(
 		c.ctx,
-		constants.EKSAFieldManager,
+		constants.EKSACLIFieldManager,
 		c.newClusterSpec.Cluster,
 		kubernetes.ApplyServerSideOptions{ForceOwnership: true},
 	).Return(err)