Display Cilium upgrade skipped status in upgrade plan command (#8909)

aws · Oct 30, 2024 · 4047261 · 4047261
1 parent 9907eaf
commit 4047261
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/pkg/networking/cilium/upgrade_plan.go b/pkg/networking/cilium/upgrade_plan.go
@@ -259,6 +259,20 @@ func ChangeDiff(currentSpec, newSpec *cluster.Spec) *types.ChangeDiff {
 
 func ciliumChangeDiff(currentSpec, newSpec *cluster.Spec) *types.ChangeDiff {
 	currentVersionsBundle := currentSpec.RootVersionsBundle()
+
+	newCiliumCfg := newSpec.Cluster.Spec.ClusterNetwork.CNIConfig.Cilium
+	if !newCiliumCfg.IsManaged() {
+		return &types.ChangeDiff{
+			ComponentReports: []types.ComponentChangeDiff{
+				{
+					ComponentName: "cilium",
+					OldVersion:    currentVersionsBundle.Cilium.Version,
+					NewVersion:    "Upgrade skipped (skipUpgrade: true)",
+				},
+			},
+		}
+	}
+
 	newVersionsBundle := newSpec.RootVersionsBundle()
 	if currentVersionsBundle.Cilium.Version == newVersionsBundle.Cilium.Version {
 		return nil

diff --git a/pkg/networking/cilium/upgrade_plan_test.go b/pkg/networking/cilium/upgrade_plan_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/aws/eks-anywhere/pkg/cluster"
 	"github.com/aws/eks-anywhere/pkg/networking/cilium"
 	"github.com/aws/eks-anywhere/pkg/types"
+	"github.com/aws/eks-anywhere/pkg/utils/ptr"
 )
 
 func TestBuildUpgradePlan(t *testing.T) {
@@ -563,7 +564,7 @@ func daemonSet(image string, opts ...dsOpt) *appsv1.DaemonSet {
 
 type cmOpt func(*corev1.ConfigMap)
 
-func ciliumConfigMap(enforcementMode string, egressMasqueradeInterface string, opts ...cmOpt) *corev1.ConfigMap {
+func ciliumConfigMap(enforcementMode, egressMasqueradeInterface string, opts ...cmOpt) *corev1.ConfigMap {
 	cm := &corev1.ConfigMap{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "v1",
@@ -918,6 +919,30 @@ func TestChangeDiff(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "cilium upgrade skipped",
+			currentSpec: test.NewClusterSpec(func(s *cluster.Spec) {
+				s.Cluster.Spec.KubernetesVersion = "1.22"
+				s.VersionsBundles["1.22"] = test.VersionBundle()
+				s.VersionsBundles["1.22"].Cilium.Version = "v1.9.10-eksa.1"
+				s.Cluster.Spec.ClusterNetwork.CNIConfig = &v1alpha1.CNIConfig{Cilium: &v1alpha1.CiliumConfig{}}
+			}),
+			newSpec: test.NewClusterSpec(func(s *cluster.Spec) {
+				s.Cluster.Spec.KubernetesVersion = "1.22"
+				s.VersionsBundles["1.22"] = test.VersionBundle()
+				s.VersionsBundles["1.22"].Cilium.Version = "v1.9.10-eksa.1"
+				s.Cluster.Spec.ClusterNetwork.CNIConfig = &v1alpha1.CNIConfig{Cilium: &v1alpha1.CiliumConfig{SkipUpgrade: ptr.Bool(true)}}
+			}),
+			want: &types.ChangeDiff{
+				ComponentReports: []types.ComponentChangeDiff{
+					{
+						ComponentName: "cilium",
+						OldVersion:    "v1.9.10-eksa.1",
+						NewVersion:    "Upgrade skipped (skipUpgrade: true)",
+					},
+				},
+			},
+		},
 	}
 
 	for _, tt := range tests {