i-76238: Remove gitea

argocd/root-app/templates/root-app.yaml

@@ -45,6 +45,8 @@ spec:
         valuesObject:
           argo:
             {{- .Values.argo | toYaml | nindent 12 }}
+          orchestratorDeployment:
+            {{- .Values.orchestratorDeployment | toYaml | nindent 12 }}            
           postCustomTemplateOverwrite:
             {{- .Values.postCustomTemplateOverwrite | toYaml | nindent 12 }}
         {{- end }}

argocd/root-app/values.yaml

@@ -21,3 +21,10 @@ argo:
   autosync: true
 
   enabled: {}
+
+orchestratorDeployment:
+  argoServiceType: ""
+  dockerCache: ""
+  dockerCacheCert: ""
+  enableMailpit: ""
+  targetCluster: ""

go.mod

@@ -70,6 +70,7 @@ require (
 	github.com/go-openapi/swag v0.23.1 // indirect
 	github.com/go-resty/resty/v2 v2.16.5 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
+	github.com/goforj/godump v1.6.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect

go.sum

@@ -79,6 +79,8 @@ github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZ
 github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
 github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/goforj/godump v1.6.0 h1:3Dn8gaw5Xxxefr1ezTGTWrTKSr3ihK+eJ2xzRUoFfHQ=
+github.com/goforj/godump v1.6.0/go.mod h1:/Vy+p50JtOkwsFN5dA1HQ7LS5gtPk3f61DaP4UR2o4s=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v5 v5.2.3 h1:kkGXqQOBSDDWRhWNXTFpqGSCMyh/PLnqUvMGJPDJDs0=

installer/cluster.tpl

@@ -37,7 +37,7 @@ argo:
   clusterDomain: ${CLUSTER_FQDN}
   adminEmail: ${ADMIN_EMAIL}
 
-  deployRepoURL: https://gitea.${CLUSTER_FQDN}/argocd/edge-manageability-framework
+  deployRepoURL: https://github.com/open-edge-platform/edge-manageability-framework
   deployRepoRevision: main
 
   git:

installer/cluster_aws.tpl

@@ -34,7 +34,7 @@ argo:
   clusterDomain: ${CLUSTER_FQDN}
   adminEmail: ${ADMIN_EMAIL}
 
-  deployRepoURL: https://gitea.${CLUSTER_FQDN}/argocd/edge-manageability-framework
+  deployRepoURL: https://github.com/open-edge-platform/edge-manageability-framework
   deployRepoRevision: main
 
   git:

mage/Magefile.go

@@ -55,9 +55,8 @@ var argoNamespaces = []string{
 	"orch-infra",    // used when creating a secret for mailpit
 }
 
-// FIXME: Ideally this could be extracted from the cluster configuration and aligned with auth secrets - out of scope for now
-var giteaRepos = []string{
-	"https://gitea-http.gitea.svc.cluster.local/argocd/edge-manageability-framework",
+var EMFRepos = []string{
+	"https://github.com/open-edge-platform/edge-manageability-framework",
 }
 
 // Public GitHub repositories can be useful for specific development workflows.
@@ -491,7 +490,10 @@ func (d Deploy) KindPreset(clusterPreset string) error {
 
 // Deploy kind cluster and Argo CD.
 func (d Deploy) Kind(targetEnv string) error {
-	return d.kind(targetEnv)
+	if err := d.kind(targetEnv); err != nil {
+		return err
+	}
+	return d.preOrchDeploy(targetEnv)
 }
 
 func (d Deploy) Gitea(targetEnv string) error {

mage/argo.go

@@ -92,7 +92,13 @@ func (Argo) login() error {
 
 func (Argo) repoAdd(gitUser string, gitToken string, repos []string) error {
 	for _, repo := range repos {
-		cmd := fmt.Sprintf("argocd repo add %s --username %s --password '%s' --upsert --insecure-skip-server-verification --insecure", repo, gitUser, gitToken)
+		var cmd string
+		if gitUser != "" && gitToken != "" {
+			cmd = fmt.Sprintf("argocd repo add %s --username %s --password '%s' --upsert --insecure-skip-server-verification --insecure", repo, gitUser, gitToken)
+		} else {
+			cmd = fmt.Sprintf("argocd repo add %s --upsert --insecure-skip-server-verification --insecure", repo)
+		}
+
 		if _, err := script.Exec(cmd).Stdout(); err != nil {
 			return fmt.Errorf("adding repo %s: %w", repo, err)
 		}

mage/config.go

@@ -36,7 +36,7 @@ var (
 		"enableMailpit":       false,
 		"dockerCache":         "",
 		"dockerCacheCert":     "",
-		"deployRepoURL":       "https://gitea-http.gitea.svc.cluster.local/argocd/edge-manageability-framework",
+		"deployRepoURL":       "https://github.com/open-edge-platform/edge-manageability-framework",
 	}
 )
 
@@ -122,6 +122,16 @@ func parseClusterValues(clusterConfigPath string) (map[string]interface{}, error
 		return nil, fmt.Errorf("invalid cluster definition: 'root' key is missing in the configuration")
 	}
 
+	// merge the cluster template into itself
+	var fileValues map[string]interface{}
+	if err := yaml.Unmarshal(data, &fileValues); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal cluster template: %w", err)
+	}
+	if root, ok := fileValues["root"].(map[string]interface{}); ok {
+		delete(root, "clusterValues")
+	}
+	deepMerge(clusterValues, fileValues)
+
 	return clusterValues, nil
 }
 
@@ -239,6 +249,7 @@ func renderClusterTemplate(presetData map[string]interface{}) (string, error) {
 		return "", fmt.Errorf("failed to render cluster template: %w", err)
 	}
 
+	var proxyProfilePath string
 	if proxyProfile, ok := presetData["proxyProfile"].(string); ok && proxyProfile != "" {
 		proxyValuesData, err := os.ReadFile(proxyProfile)
 		if err != nil {
@@ -272,6 +283,40 @@ func renderClusterTemplate(presetData map[string]interface{}) (string, error) {
 		if err := proxyTmpl.Execute(proxyOutputFile, proxyValues); err != nil {
 			return "", fmt.Errorf("failed to render proxy template: %w", err)
 		}
+
+		proxyProfilePath = proxyOutputPath
+	} else {
+		proxyProfilePath = "orch-configs/profiles/proxy-none.yaml"
+	}
+
+	// Merge the generated cluster values file with the proxy profile values file.
+	clusterValuesData, err := os.ReadFile(outputPath)
+	if err != nil {
+		return "", fmt.Errorf("failed to read cluster values file '%s': %w", outputPath, err)
+	}
+	proxyValuesData, err := os.ReadFile(proxyProfilePath)
+	if err != nil {
+		return "", fmt.Errorf("failed to read proxy profile file '%s': %w", proxyProfilePath, err)
+	}
+
+	var clusterValues map[string]interface{}
+	if err := yaml.Unmarshal(clusterValuesData, &clusterValues); err != nil {
+		return "", fmt.Errorf("failed to unmarshal cluster values: %w", err)
+	}
+	var proxyValues map[string]interface{}
+	if err := yaml.Unmarshal(proxyValuesData, &proxyValues); err != nil {
+		return "", fmt.Errorf("failed to unmarshal proxy values: %w", err)
+	}
+
+	deepMerge(clusterValues, proxyValues)
+
+	mergedYaml, err := writeMapAsYAML(clusterValues)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal merged values: %w", err)
+	}
+
+	if err := os.WriteFile(outputPath, []byte(mergedYaml), 0o644); err != nil {
+		return "", fmt.Errorf("failed to write merged values to file: %w", err)
 	}
 
 	return clusterName, nil
@@ -402,6 +447,7 @@ func (Config) getTargetValues(targetEnv string) (map[string]interface{}, error)
 	}
 
 	clusterFilePath := fmt.Sprintf("orch-configs/clusters/%s.yaml", targetEnv)
+	fmt.Printf("Loading cluster values from: %s\n", clusterFilePath)
 	targetValues, err := parseClusterValues(clusterFilePath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse cluster values: %w", err)
@@ -474,6 +520,39 @@ func (c Config) isMailpitEnabled(targetEnv string) (bool, error) {
 	return enableMailpit, nil
 }
 
+func (c Config) isAOEnabled(targetEnv string) (bool, error) {
+	if targetEnv == "" {
+		return false, fmt.Errorf("target environment is not specified")
+	}
+
+	clusterFilePath := fmt.Sprintf("orch-configs/clusters/%s.yaml", targetEnv)
+	fmt.Printf("Loading cluster values from: %s\n", clusterFilePath)
+
+	data, err := os.ReadFile(clusterFilePath)
+	if err != nil {
+		return false, fmt.Errorf("failed to read cluster configuration file: %w", err)
+	}
+
+	var rootConfig map[string]interface{}
+	if err := yaml.Unmarshal(data, &rootConfig); err != nil {
+		return false, fmt.Errorf("failed to unmarshal cluster configuration: %w", err)
+	}
+
+	if root, ok := rootConfig["root"].(map[string]interface{}); ok {
+		if clusterValuesPaths, ok := root["clusterValues"].([]interface{}); ok {
+			for _, path := range clusterValuesPaths {
+				if pathStr, ok := path.(string); ok {
+					if strings.Contains(pathStr, "enable-app-orch.yaml") {
+						return true, nil
+					}
+				}
+			}
+		}
+	}
+
+	return false, nil
+}
+
 func (c Config) getDockerCache(targetEnv string) (string, error) {
 	clusterValues, err := c.getTargetValues(targetEnv)
 	if err != nil {