add hive deploy args to rpconfig

pkg/deploy/config.go

@@ -100,6 +100,10 @@ type Configuration struct {
 	SubscriptionResourceGroupLocation  *string       `json:"subscriptionResourceGroupLocation,omitempty" value:"required"`
 	VMSize                             *string       `json:"vmSize,omitempty" value:"required"`
 	VMSSCleanupEnabled                 *bool         `json:"vmssCleanupEnabled,omitempty"`
+
+	// TODO: Replace with Live Service Configuration in KeyVault
+	InstallViaHive           *bool   `json:"clustersInstallViaHive,omitempty"`
+	DefaultInstallerPullspec *string `json:"clusterDefaultInstallerPullspec,omitempty"`
 }
 
 // GetConfig return RP configuration from the file

pkg/deploy/devconfig.go

@@ -195,6 +195,10 @@ func DevConfig(_env env.Core) (*Config, error) {
 			SubscriptionResourceGroupName:     to.StringPtr(os.Getenv("USER") + "-subscription"),
 			VMSSCleanupEnabled:                to.BoolPtr(true),
 			VMSize:                            to.StringPtr("Standard_D2s_v3"),
+
+			// TODO: Replace with Live Service Configuration in KeyVault
+			InstallViaHive:           to.BoolPtr(os.Getenv("ARO_INSTALL_VIA_HIVE") != ""),
+			DefaultInstallerPullspec: to.StringPtr(os.Getenv("ARO_HIVE_DEFAULT_INSTALLER_PULLSPEC")),
 		},
 	}, nil
 }

pkg/deploy/generator/resources_rp.go

@@ -472,6 +472,10 @@ func (g *generator) rpVMSS() *arm.Resource {
 		"rpMdsdConfigVersion",
 		"rpMdsdNamespace",
 		"rpParentDomainName",
+
+		// TODO: Replace with Live Service Configuration in KeyVault
+		"clustersInstallViaHive",
+		"clusterDefaultInstallerPullspec",
 	} {
 		parts = append(parts,
 			fmt.Sprintf("'%s=$(base64 -d <<<'''", strings.ToUpper(variable)),
@@ -734,6 +738,8 @@ MDM_NAMESPACE=RP
 MDSD_ENVIRONMENT='$MDSDENVIRONMENT'
 RP_FEATURES='$RPFEATURES'
 RPIMAGE='$RPIMAGE'
+ARO_INSTALL_VIA_HIVE='$CLUSTERSINSTALLVIAHIVE'
+ARO_HIVE_DEFAULT_INSTALLER_PULLSPEC='$CLUSTERDEFAULTINSTALLERPULLSPEC'
 EOF
 
 cat >/etc/systemd/system/aro-rp.service <<'EOF'
@@ -767,6 +773,8 @@ ExecStart=/usr/bin/docker run \
   -e MDM_NAMESPACE \
   -e MDSD_ENVIRONMENT \
   -e RP_FEATURES \
+  -e ARO_INSTALL_VIA_HIVE \
+  -e ARO_HIVE_DEFAULT_INSTALLER_PULLSPEC \
   -m 2g \
   -p 443:8443 \
   -v /etc/aro-rp:/etc/aro-rp \

pkg/deploy/generator/templates_rp.go

@@ -76,6 +76,10 @@ func (g *generator) rpTemplate() *arm.Template {
 			"vmSize",
 			"vmssCleanupEnabled",
 			"vmssName",
+
+			// TODO: Replace with Live Service Configuration in KeyVault
+			"clustersInstallViaHive",
+			"clusterDefaultInstallerPullspec",
 		)
 	}