Smarter Zarf Registry HPA behavior

packages/zarf-registry/chart/templates/hpa.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "docker-registry.fullname" . }}
@@ -15,5 +15,28 @@ spec:
     name: {{ template "docker-registry.fullname" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  targetCPUUtilizationPercentage: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  behavior:
+    scaleDown:
+      # Use 60 second stabilization window becuase zarf will freeze scale down during deploys
+      stabilizationWindowSeconds: 60
+      # Scale down one pod per minute
+      policies:
+        - type: Pods
+          value: 1
+          periodSeconds: 60      
+    scaleUp:
+      # Delay initial checks by 30 seconds
+      stabilizationWindowSeconds: 30
+      # Scale up one pod per minute
+      policies:
+        - type: Pods
+          value: 1
+          periodSeconds: 60
 {{- end }}

packages/zarf-registry/registry-values.yaml

@@ -30,3 +30,9 @@ fullnameOverride: "zarf-docker-registry"
 
 podLabels:
   zarf.dev/agent: "ignore"
+
+autoscaling:
+  enabled: ###ZARF_VAR_REGISTRY_HPA_ENABLE###
+  minReplicas: "###ZARF_VAR_REGISTRY_HPA_MIN###"
+  maxReplicas: "###ZARF_VAR_REGISTRY_HPA_MAX###"
+  targetCPUUtilizationPercentage: 80

packages/zarf-registry/zarf.yaml

@@ -27,6 +27,18 @@ variables:
     description: "The memory limit for the registry"
     default: "2Gi"
 
+  - name: REGISTRY_HPA_MIN
+    description: "The minimum number of registry replicas"
+    default: "1"
+
+  - name: REGISTRY_HPA_MAX
+    description: "The maximum number of registry replicas"
+    default: "5"
+
+  - name: REGISTRY_HPA_ENABLE
+    description: "Enable the Horizontal Pod Autoscaler for the registry"
+    default: "true"
+
 components:
   - name: zarf-seed-registry
     description: |

src/internal/cluster/injector.go

@@ -26,8 +26,8 @@ import (
 // The chunk size for the tarball chunks.
 var payloadChunkSize = 1024 * 768
 
-// RunInjectionMadness initializes a Zarf injection into the cluster.
-func (c *Cluster) RunInjectionMadness(tempPath types.TempPaths) {
+// StartInjectionMadness initializes a Zarf injection into the cluster.
+func (c *Cluster) StartInjectionMadness(tempPath types.TempPaths) {
 	message.Debugf("packager.runInjectionMadness(%#v)", tempPath)
 
 	spinner := message.NewProgressSpinner("Attempting to bootstrap the seed image into the cluster")
@@ -104,6 +104,23 @@ func (c *Cluster) RunInjectionMadness(tempPath types.TempPaths) {
 	spinner.Fatalf(nil, "Unable to perform the injection")
 }
 
+// StopInjectionMadness handles cleanup once the seed registry is up.
+func (c *Cluster) StopInjectionMadness() error {
+	// Try to kill the injector pod now
+	if err := c.Kube.DeletePod(ZarfNamespace, "injector"); err != nil {
+		return err
+	}
+
+	// Remove the configmaps
+	labelMatch := map[string]string{"zarf-injector": "payload"}
+	if err := c.Kube.DeleteConfigMapsByLabel(ZarfNamespace, labelMatch); err != nil {
+		return err
+	}
+
+	// Remove the injector service
+	return c.Kube.DeleteService(ZarfNamespace, "zarf-injector")
+}
+
 func (c *Cluster) createPayloadConfigmaps(tempPath types.TempPaths, spinner *message.Spinner) ([]string, string, error) {
 	message.Debugf("packager.tryInjectorPayloadDeploy(%#v)", tempPath)
 	var configMaps []string

src/internal/cluster/state.go

@@ -202,3 +202,77 @@ func (c *Cluster) SaveZarfState(state types.ZarfState) error {
 
 	return nil
 }
+
+func (c *Cluster) fillInEmptyContainerRegistryValues(containerRegistry types.RegistryInfo) types.RegistryInfo {
+	// Set default NodePort if none was provided
+	if containerRegistry.NodePort == 0 {
+		containerRegistry.NodePort = config.ZarfInClusterContainerRegistryNodePort
+	}
+
+	// Set default url if an external registry was not provided
+	if containerRegistry.Address == "" {
+		containerRegistry.InternalRegistry = true
+		containerRegistry.Address = fmt.Sprintf("%s:%d", config.IPV4Localhost, containerRegistry.NodePort)
+	}
+
+	// Generate a push-user password if not provided by init flag
+	if containerRegistry.PushPassword == "" {
+		containerRegistry.PushPassword = utils.RandomString(config.ZarfGeneratedPasswordLen)
+	}
+
+	// Set pull-username if not provided by init flag
+	if containerRegistry.PullUsername == "" {
+		if containerRegistry.InternalRegistry {
+			containerRegistry.PullUsername = config.ZarfRegistryPullUser
+		} else {
+			// If this is an external registry and a pull-user wasn't provided, use the same credentials as the push user
+			containerRegistry.PullUsername = containerRegistry.PushUsername
+		}
+	}
+	if containerRegistry.PullPassword == "" {
+		if containerRegistry.InternalRegistry {
+			containerRegistry.PullPassword = utils.RandomString(config.ZarfGeneratedPasswordLen)
+		} else {
+			// If this is an external registry and a pull-user wasn't provided, use the same credentials as the push user
+			containerRegistry.PullPassword = containerRegistry.PushPassword
+		}
+	}
+
+	if containerRegistry.Secret == "" {
+		containerRegistry.Secret = utils.RandomString(config.ZarfGeneratedSecretLen)
+	}
+
+	return containerRegistry
+}
+
+// Fill in empty GitServerInfo values with the defaults.
+func (c *Cluster) fillInEmptyGitServerValues(gitServer types.GitServerInfo) types.GitServerInfo {
+	// Set default svc url if an external repository was not provided
+	if gitServer.Address == "" {
+		gitServer.Address = config.ZarfInClusterGitServiceURL
+		gitServer.InternalServer = true
+	}
+
+	// Generate a push-user password if not provided by init flag
+	if gitServer.PushPassword == "" {
+		gitServer.PushPassword = utils.RandomString(config.ZarfGeneratedPasswordLen)
+	}
+
+	// Set read-user information if using an internal repository, otherwise copy from the push-user
+	if gitServer.PullUsername == "" {
+		if gitServer.InternalServer {
+			gitServer.PullUsername = config.ZarfGitReadUser
+		} else {
+			gitServer.PullUsername = gitServer.PushUsername
+		}
+	}
+	if gitServer.PullPassword == "" {
+		if gitServer.InternalServer {
+			gitServer.PullPassword = utils.RandomString(config.ZarfGeneratedPasswordLen)
+		} else {
+			gitServer.PullPassword = gitServer.PushPassword
+		}
+	}
+
+	return gitServer
+}

src/internal/cluster/zarf.go

@@ -11,6 +11,7 @@ import (
 	"github.com/defenseunicorns/zarf/src/config"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 	"github.com/defenseunicorns/zarf/src/types"
+	"k8s.io/api/autoscaling/v2beta2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -98,3 +99,30 @@ func (c *Cluster) RecordPackageDeployment(pkg types.ZarfPackage, components []ty
 
 	c.Kube.CreateOrUpdateSecret(deployedPackageSecret)
 }
+
+// EnableRegistryHPAScaleDown enables or disables the HPA scale down for the Zarf Registry.
+func (c *Cluster) EnableRegistryHPAScaleDown(enable bool) error {
+	hpa, err := c.Kube.GetHPA(ZarfNamespace, "zarf-docker-registry")
+	if err != nil {
+		return err
+	}
+
+	var policy v2beta2.ScalingPolicySelect
+
+	if enable {
+		// Enable HPA scale down.
+		policy = v2beta2.MinPolicySelect
+	} else {
+		// Disable HPA scale down.
+		policy = v2beta2.DisabledPolicySelect
+	}
+
+	hpa.Spec.Behavior.ScaleDown.SelectPolicy = &policy
+
+	// Save the HPA changes.
+	if _, err = c.Kube.UpdateHPA(hpa); err != nil {
+		return err
+	}
+
+	return nil
+}

src/pkg/k8s/hpa.go

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2021-Present The Zarf Authors
+
+// Package k8s provides a client for interacting with a Kubernetes cluster.
+package k8s
+
+import (
+	"context"
+
+	"k8s.io/api/autoscaling/v2beta2"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// GetAllHPAs returns a list of horizontal pod autoscalers for all namespaces.
+func (k *K8s) GetAllHPAs() (*v2beta2.HorizontalPodAutoscalerList, error) {
+	return k.GetHPAs(corev1.NamespaceAll)
+}
+
+// GetHPAs returns a list of horizontal pod autoscalers in a given namespace.
+func (k *K8s) GetHPAs(namespace string) (*v2beta2.HorizontalPodAutoscalerList, error) {
+	metaOptions := metav1.ListOptions{}
+	return k.Clientset.AutoscalingV2beta2().HorizontalPodAutoscalers(namespace).List(context.TODO(), metaOptions)
+}
+
+// GetHPA returns a single horizontal pod autoscaler by namespace and name.
+func (k *K8s) GetHPA(namespace, name string) (*v2beta2.HorizontalPodAutoscaler, error) {
+	metaOptions := metav1.GetOptions{}
+	return k.Clientset.AutoscalingV2beta2().HorizontalPodAutoscalers(namespace).Get(context.TODO(), name, metaOptions)
+}
+
+// UpdateHPA updates the given horizontal pod autoscaler in the cluster.
+func (k *K8s) UpdateHPA(hpa *v2beta2.HorizontalPodAutoscaler) (*v2beta2.HorizontalPodAutoscaler, error) {
+	metaOptions := metav1.UpdateOptions{}
+	return k.Clientset.AutoscalingV2beta2().HorizontalPodAutoscalers(hpa.Namespace).Update(context.TODO(), hpa, metaOptions)
+}