add nodeport override, remove distro and arch override

zarf-dev · Mar 29, 2022 · 73cfe6f · 73cfe6f
1 parent a60ee89
commit 73cfe6f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 27 deletions.
diff --git a/cli/cmd/initialize.go b/cli/cmd/initialize.go
@@ -39,19 +39,14 @@ func init() {
 }
 
 // Add flags to override values that will be added to ZarfState during an init
-// An options is included to make the overwrite flags hidden
 func addZarfStateOverrideFlags(commad *cobra.Command, makeHidden bool) {
-	commad.Flags().StringVar(&config.DeployOptions.Distro, "distro", "", "Kubernetes distro Zarf is deploying to")
 	commad.Flags().StringVar(&config.DeployOptions.StorageClass, "storage-class", "", "Describe the StorageClass to be used")
 	commad.Flags().StringVar(&config.DeployOptions.Secret, "secret", "", "Root secret value that is used to 'seed' other secrets")
-	commad.Flags().StringVar(&config.DeployOptions.NodePort, "nodeport", "", "Nodeport to access the Zarf container registry")
-	commad.Flags().StringVar(&config.DeployOptions.Architecture, "architecture", "", "Architecture for OCI images")
+	commad.Flags().StringVar(&config.DeployOptions.NodePort, "nodeport", "", "Nodeport to access the Zarf container registry. Between [30000-32767]")
 
 	if makeHidden {
-		packageDeployCmd.Flags().MarkHidden("distro")
 		packageDeployCmd.Flags().MarkHidden("storage-class")
 		packageDeployCmd.Flags().MarkHidden("secret")
 		packageDeployCmd.Flags().MarkHidden("nodeport")
-		packageDeployCmd.Flags().MarkHidden("architecture")
 	}
 }
diff --git a/cli/config/config.go b/cli/config/config.go
@@ -58,11 +58,6 @@ func IsZarfInitConfig() bool {
 }
 
 func GetArch() string {
-	// If user-overridden then reflect that
-	if DeployOptions.Architecture != "" {
-		return DeployOptions.Architecture
-	}
-
 	// If CLI-orverriden then reflect that
 	if CliArch != "" {
 		return CliArch
@@ -151,7 +146,7 @@ func GetState() types.ZarfState {
 }
 
 func GetRegistry() string {
-	return fmt.Sprintf("%s:%s", IPV4Localhost, state.Registry.NodePort)
+	return fmt.Sprintf("%s:%s", IPV4Localhost, state.NodePort)
 }
 
 func LoadConfig(path string) error {

diff --git a/cli/internal/k8s/distro.go b/cli/internal/k8s/distro.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 	"regexp"
 
-	"github.com/defenseunicorns/zarf/cli/config"
 	"github.com/defenseunicorns/zarf/cli/internal/message"
 )
 
@@ -27,10 +26,6 @@ const (
 func DetectDistro() (string, error) {
 	message.Debugf("k8s.DetectDistro()")
 
-	if config.DeployOptions.Distro != "" {
-		return config.DeployOptions.Distro, nil
-	}
-
 	kindNodeRegex := regexp.MustCompile(`^kind://`)
 	k3dNodeRegex := regexp.MustCompile(`^k3s://k3d-`)
 	eksNodeRegex := regexp.MustCompile(`^aws:///`)

diff --git a/cli/internal/packager/seed.go b/cli/internal/packager/seed.go
@@ -57,7 +57,7 @@ func preSeedRegistry(tempPath tempPaths) {
 		}
 
 		// Defaults
-		state.Registry.NodePort = "31999"
+		state.NodePort = "31999"
 		state.Secret = utils.RandomString(120)
 		state.Distro = distro
 		state.Architecture = config.GetArch()
@@ -79,6 +79,9 @@ func preSeedRegistry(tempPath tempPaths) {
 	}
 
 	// CLI provided overrides that haven't been processed already
+	if config.DeployOptions.NodePort != "" {
+		state.NodePort = config.DeployOptions.NodePort
+	}
 	if config.DeployOptions.Secret != "" {
 		state.Secret = config.DeployOptions.Secret
 	}

diff --git a/cli/internal/template/template.go b/cli/internal/template/template.go
@@ -76,7 +76,7 @@ func (values Values) Apply(path string) {
 		"STORAGE_CLASS":      values.state.StorageClass,
 		"SEED_REGISTRY":      values.seedRegistry,
 		"REGISTRY":           values.registry,
-		"REGISTRY_NODEPORT":  values.state.Registry.NodePort,
+		"NODEPORT":           values.state.NodePort,
 		"REGISTRY_SECRET":    values.secret.registrySecret,
 		"REGISTRY_AUTH_PUSH": values.secret.registryPush,
 		"REGISTRY_AUTH_PULL": values.secret.registryPull,

diff --git a/cli/types/types.go b/cli/types/types.go
@@ -124,10 +124,7 @@ type ZarfState struct {
 	Architecture  string `json:"architecture"`
 	StorageClass  string `json:"storageClass"`
 	Secret        string `json:"secret"`
-	Registry      struct {
-		SeedType string `json:"seedType"`
-		NodePort string `json:"nodePort"`
-	} `json:"registry"`
+	NodePort      string `json:"nodePort"`
 }
 
 // TLSConfig tracks the user-defined options for TLS cert generation
@@ -146,12 +143,10 @@ type ZarfDeployOptions struct {
 	// Zarf init is installing the k3s component
 	ApplianceMode bool
 
-	// Zarf init options
-	Distro       string
+	// Zarf init override options
 	StorageClass string
 	Secret       string
 	NodePort     string
-	Architecture string
 }
 
 // ZarfImport structure for including imported zarf components

diff --git a/packages/zarf-registry/registry-values.yaml b/packages/zarf-registry/registry-values.yaml
@@ -11,7 +11,7 @@ secrets:
 # tlsSecretName: tls-pem
 service:
   type: NodePort
-  nodePort: "###ZARF_REGISTRY_NODEPORT###"
+  nodePort: "###ZARF_NODEPORT###"
 resources:
   requests:
     cpu: "500m"