Adds support for Helm 1st-class. Closes argoproj#1145

alexec · Jul 2, 2019 · fce444f · fce444f
1 parent b387a3a
commit fce444f
Show file tree

Hide file tree

Showing 27 changed files with 910 additions and 1,207 deletions.
diff --git a/assets/swagger.json b/assets/swagger.json
@@ -3137,13 +3137,32 @@
       "type": "object",
       "title": "Repository is a Git repository holding application configurations",
       "properties": {
+        "caData": {
+          "type": "string",
+          "format": "byte",
+          "title": "only for Helm repos"
+        },
+        "certData": {
+          "type": "string",
+          "format": "byte",
+          "title": "only for Helm repos"
+        },
         "connectionState": {
           "$ref": "#/definitions/v1alpha1ConnectionState"
         },
         "insecureIgnoreHostKey": {
           "type": "boolean",
           "format": "boolean"
         },
+        "keyData": {
+          "type": "string",
+          "format": "byte",
+          "title": "only for Helm repos"
+        },
+        "name": {
+          "type": "string",
+          "title": "only for Helm repos"
+        },
         "password": {
           "type": "string"
         },

diff --git a/cmd/argocd-util/main.go b/cmd/argocd-util/main.go
@@ -435,13 +435,6 @@ func getReferencedSecrets(un unstructured.Unstructured) map[string]bool {
 			if cred.UsernameSecret != nil {
 				referencedSecrets[cred.UsernameSecret.Name] = true
 			}
-		}
-	}
-	if helmReposRAW, ok := cm.Data["helm.repositories"]; ok {
-		helmRepoCreds := make([]settings.HelmRepoCredentials, 0)
-		err := yaml.Unmarshal([]byte(helmReposRAW), &helmRepoCreds)
-		errors.CheckError(err)
-		for _, cred := range helmRepoCreds {
 			if cred.CASecret != nil {
 				referencedSecrets[cred.CASecret.Name] = true
 			}
@@ -451,12 +444,6 @@ func getReferencedSecrets(un unstructured.Unstructured) map[string]bool {
 			if cred.KeySecret != nil {
 				referencedSecrets[cred.KeySecret.Name] = true
 			}
-			if cred.UsernameSecret != nil {
-				referencedSecrets[cred.UsernameSecret.Name] = true
-			}
-			if cred.PasswordSecret != nil {
-				referencedSecrets[cred.PasswordSecret.Name] = true
-			}
 		}
 	}
 	return referencedSecrets

diff --git a/controller/state.go b/controller/state.go
@@ -87,7 +87,7 @@ type appStateManager struct {
 }
 
 func (m *appStateManager) getRepoObjs(app *v1alpha1.Application, source v1alpha1.ApplicationSource, appLabelKey, revision string, noCache bool) ([]*unstructured.Unstructured, []*unstructured.Unstructured, *repository.ManifestResponse, error) {
-	helmRepos, err := m.db.ListHelmRepos(context.Background())
+	repos, err := m.db.ListRepositories(context.Background())
 	if err != nil {
 		return nil, nil, nil, err
 	}
@@ -117,7 +117,7 @@ func (m *appStateManager) getRepoObjs(app *v1alpha1.Application, source v1alpha1
 
 	manifestInfo, err := repoClient.GenerateManifest(context.Background(), &repository.ManifestRequest{
 		Repo:              repo,
-		HelmRepos:         helmRepos,
+		Repos:             repos,
 		Revision:          revision,
 		NoCache:           noCache,
 		AppLabelKey:       appLabelKey,