Merge branch 'main' into test/packager-source

src/pkg/cluster/secrets.go

@@ -75,6 +75,7 @@ func (c *Cluster) GenerateGitPullCreds(namespace, name string, gitServerInfo typ
 }
 
 // UpdateZarfManagedImageSecrets updates all Zarf-managed image secrets in all namespaces based on state
+// TODO: Refactor to return errors properly.
 func (c *Cluster) UpdateZarfManagedImageSecrets(ctx context.Context, state *types.ZarfState) {
 	spinner := message.NewProgressSpinner("Updating existing Zarf-managed image secrets")
 	defer spinner.Stop()
@@ -109,6 +110,7 @@ func (c *Cluster) UpdateZarfManagedImageSecrets(ctx context.Context, state *type
 }
 
 // UpdateZarfManagedGitSecrets updates all Zarf-managed git secrets in all namespaces based on state
+// TODO: Refactor to return errors properly.
 func (c *Cluster) UpdateZarfManagedGitSecrets(ctx context.Context, state *types.ZarfState) {
 	spinner := message.NewProgressSpinner("Updating existing Zarf-managed git secrets")
 	defer spinner.Stop()

src/pkg/cluster/secrets_test.go

@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2021-Present The Zarf Authors
+
+package cluster
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/defenseunicorns/zarf/src/pkg/k8s"
+	"github.com/defenseunicorns/zarf/src/types"
+)
+
+func TestGenerateRegistryPullCreds(t *testing.T) {
+	c := &Cluster{}
+	ri := types.RegistryInfo{
+		PushUsername: "push-user",
+		PushPassword: "push-password",
+		PullUsername: "pull-user",
+		PullPassword: "pull-password",
+		Address:      "example.com",
+	}
+	secret := c.GenerateRegistryPullCreds("foo", "bar", ri)
+	expectedSecret := corev1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "Secret",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "bar",
+			Namespace: "foo",
+			Labels: map[string]string{
+				k8s.ZarfManagedByLabel: "zarf",
+			},
+		},
+		Type: corev1.SecretTypeDockerConfigJson,
+		Data: map[string][]byte{
+			".dockerconfigjson": []byte(`{"auths":{"example.com":{"auth":"cHVsbC11c2VyOnB1bGwtcGFzc3dvcmQ="}}}`),
+		},
+	}
+	require.Equal(t, expectedSecret, *secret)
+}
+
+func TestGenerateGitPullCreds(t *testing.T) {
+	c := &Cluster{}
+	gi := types.GitServerInfo{
+		PushUsername: "push-user",
+		PushPassword: "push-password",
+		PullUsername: "pull-user",
+		PullPassword: "pull-password",
+	}
+	secret := c.GenerateGitPullCreds("foo", "bar", gi)
+	expectedSecret := corev1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "Secret",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "bar",
+			Namespace: "foo",
+			Labels: map[string]string{
+				k8s.ZarfManagedByLabel: "zarf",
+			},
+		},
+		Type: corev1.SecretTypeOpaque,
+		Data: map[string][]byte{},
+		StringData: map[string]string{
+			"username": "pull-user",
+			"password": "pull-password",
+		},
+	}
+	require.Equal(t, expectedSecret, *secret)
+}

src/pkg/cluster/zarf.go

@@ -222,39 +222,31 @@ func (c *Cluster) RecordPackageDeployment(ctx context.Context, pkg types.ZarfPac
 
 // EnableRegHPAScaleDown enables the HPA scale down for the Zarf Registry.
 func (c *Cluster) EnableRegHPAScaleDown(ctx context.Context) error {
-	hpa, err := c.GetHPA(ctx, ZarfNamespaceName, "zarf-docker-registry")
+	hpa, err := c.Clientset.AutoscalingV2().HorizontalPodAutoscalers(ZarfNamespaceName).Get(ctx, "zarf-docker-registry", metav1.GetOptions{})
 	if err != nil {
 		return err
 	}
-
-	// Enable HPA scale down.
 	policy := autoscalingV2.MinChangePolicySelect
 	hpa.Spec.Behavior.ScaleDown.SelectPolicy = &policy
-
-	// Save the HPA changes.
-	if _, err = c.UpdateHPA(ctx, hpa); err != nil {
+	_, err = c.Clientset.AutoscalingV2().HorizontalPodAutoscalers(hpa.Namespace).Update(ctx, hpa, metav1.UpdateOptions{})
+	if err != nil {
 		return err
 	}
-
 	return nil
 }
 
 // DisableRegHPAScaleDown disables the HPA scale down for the Zarf Registry.
 func (c *Cluster) DisableRegHPAScaleDown(ctx context.Context) error {
-	hpa, err := c.GetHPA(ctx, ZarfNamespaceName, "zarf-docker-registry")
+	hpa, err := c.Clientset.AutoscalingV2().HorizontalPodAutoscalers(ZarfNamespaceName).Get(ctx, "zarf-docker-registry", metav1.GetOptions{})
 	if err != nil {
 		return err
 	}
-
-	// Disable HPA scale down.
 	policy := autoscalingV2.DisabledPolicySelect
 	hpa.Spec.Behavior.ScaleDown.SelectPolicy = &policy
-
-	// Save the HPA changes.
-	if _, err = c.UpdateHPA(ctx, hpa); err != nil {
+	_, err = c.Clientset.AutoscalingV2().HorizontalPodAutoscalers(hpa.Namespace).Update(ctx, hpa, metav1.UpdateOptions{})
+	if err != nil {
 		return err
 	}
-
 	return nil
 }
 

src/pkg/cluster/zarf_test.go

@@ -10,13 +10,15 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/defenseunicorns/zarf/src/config"
-	"github.com/defenseunicorns/zarf/src/pkg/k8s"
-	"github.com/defenseunicorns/zarf/src/types"
 	"github.com/stretchr/testify/require"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
+
+	"github.com/defenseunicorns/zarf/src/config"
+	"github.com/defenseunicorns/zarf/src/pkg/k8s"
+	"github.com/defenseunicorns/zarf/src/types"
 )
 
 // TestPackageSecretNeedsWait verifies that Zarf waits for webhooks to complete correctly.
@@ -246,3 +248,38 @@ func TestGetDeployedPackage(t *testing.T) {
 	require.NoError(t, err)
 	require.ElementsMatch(t, packages, actualList)
 }
+
+func TestRegistryHPA(t *testing.T) {
+	ctx := context.Background()
+	cs := fake.NewSimpleClientset()
+	hpa := autoscalingv2.HorizontalPodAutoscaler{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "zarf-docker-registry",
+			Namespace: ZarfNamespaceName,
+		},
+		Spec: autoscalingv2.HorizontalPodAutoscalerSpec{
+			Behavior: &autoscalingv2.HorizontalPodAutoscalerBehavior{
+				ScaleDown: &autoscalingv2.HPAScalingRules{},
+			},
+		},
+	}
+	_, err := cs.AutoscalingV2().HorizontalPodAutoscalers(hpa.Namespace).Create(ctx, &hpa, metav1.CreateOptions{})
+	require.NoError(t, err)
+	c := &Cluster{
+		&k8s.K8s{
+			Clientset: cs,
+		},
+	}
+
+	err = c.EnableRegHPAScaleDown(ctx)
+	require.NoError(t, err)
+	enableHpa, err := cs.AutoscalingV2().HorizontalPodAutoscalers(hpa.Namespace).Get(ctx, hpa.Name, metav1.GetOptions{})
+	require.NoError(t, err)
+	require.Equal(t, autoscalingv2.MinChangePolicySelect, *enableHpa.Spec.Behavior.ScaleDown.SelectPolicy)
+
+	err = c.DisableRegHPAScaleDown(ctx)
+	require.NoError(t, err)
+	disableHpa, err := cs.AutoscalingV2().HorizontalPodAutoscalers(hpa.Namespace).Get(ctx, hpa.Name, metav1.GetOptions{})
+	require.NoError(t, err)
+	require.Equal(t, autoscalingv2.DisabledPolicySelect, *disableHpa.Spec.Behavior.ScaleDown.SelectPolicy)
+}