Issue argoproj#747 - Declaratively add helm repositories

Dockerfile

@@ -122,6 +122,4 @@ COPY --from=argocd-build /go/src/github.com/argoproj/argo-cd/dist/* /usr/local/b
 
 USER argocd
 
-RUN helm init --client-only
-
 WORKDIR /home/argocd

controller/appcontroller_test.go

@@ -45,9 +45,26 @@ func newFakeController(data *fakeData) *ApplicationController {
 	mockRepoClientset := mockreposerver.Clientset{}
 	mockRepoClientset.On("NewRepositoryClient").Return(&fakeCloser{}, &mockRepoClient, nil)
 
+	secret := corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "argocd-secret",
+			Namespace: test.FakeArgoCDNamespace,
+		},
+		Data: map[string][]byte{
+			"admin.password":   []byte("test"),
+			"server.secretkey": []byte("test"),
+		},
+	}
+	cm := corev1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "argocd-cm",
+			Namespace: test.FakeArgoCDNamespace,
+		},
+		Data: nil,
+	}
 	ctrl := NewApplicationController(
 		test.FakeArgoCDNamespace,
-		fake.NewSimpleClientset(&clust),
+		fake.NewSimpleClientset(&clust, &cm, &secret),
 		appclientset.NewSimpleClientset(data.apps...),
 		&mockRepoClientset,
 		time.Minute,

controller/state.go

@@ -66,6 +66,10 @@ type appStateManager struct {
 }
 
 func (m *appStateManager) GetTargetObjs(app *v1alpha1.Application, revision string, overrides []v1alpha1.ComponentParameter) ([]*unstructured.Unstructured, *repository.ManifestResponse, error) {
+	helmRepos, err := m.db.ListHelmRepos(context.Background())
+	if err != nil {
+		return nil, nil, err
+	}
 	repo := m.getRepo(app.Spec.Source.RepoURL)
 	conn, repoClient, err := m.repoClientset.NewRepositoryClient()
 	if err != nil {
@@ -97,6 +101,7 @@ func (m *appStateManager) GetTargetObjs(app *v1alpha1.Application, revision stri
 
 	manifestInfo, err := repoClient.GenerateManifest(context.Background(), &repository.ManifestRequest{
 		Repo:                        repo,
+		HelmRepos:                   helmRepos,
 		Revision:                    revision,
 		ComponentParameterOverrides: mfReqOverrides,
 		AppLabel:                    app.Name,

controller/state_test.go

@@ -67,7 +67,7 @@ func TestCompareAppStateExtra(t *testing.T) {
 	pod := test.NewPod()
 	pod.SetNamespace(test.FakeDestNamespace)
 	app := newFakeApp()
-	key := kube.ResourceKey{"", "Pod", test.FakeDestNamespace, app.Name}
+	key := kube.ResourceKey{Group: "", Kind: "Pod", Namespace: test.FakeDestNamespace, Name: app.Name}
 	data := fakeData{
 		manifestResponse: &repository.ManifestResponse{
 			Manifests: []string{},
@@ -124,7 +124,7 @@ func TestCompareAppStateExtraHook(t *testing.T) {
 	pod.SetAnnotations(map[string]string{common.AnnotationKeyHook: "PreSync"})
 	pod.SetNamespace(test.FakeDestNamespace)
 	app := newFakeApp()
-	key := kube.ResourceKey{"", "Pod", test.FakeDestNamespace, app.Name}
+	key := kube.ResourceKey{Group: "", Kind: "Pod", Namespace: test.FakeDestNamespace, Name: app.Name}
 	data := fakeData{
 		manifestResponse: &repository.ManifestResponse{
 			Manifests: []string{},

pkg/apis/application/v1alpha1/types.go

@@ -542,6 +542,14 @@ type TLSClientConfig struct {
 	CAData []byte `json:"caData,omitempty" protobuf:"bytes,5,opt,name=caData"`
 }
 
+type HelmRepository struct {
+	URL      string `json:"url" protobuf:"bytes,1,opt,name=url"`
+	Name     string `json:"name" protobuf:"bytes,2,opt,name=name"`
+	CAData   []byte `json:"caData,omitempty" protobuf:"bytes,3,opt,name=caData"`
+	CertData []byte `json:"certData,omitempty" protobuf:"bytes,4,opt,name=certData"`
+	KeyData  []byte `json:"keyData,omitempty" protobuf:"bytes,5,opt,name=keyData"`
+}
+
 // Repository is a Git repository holding application configurations
 type Repository struct {
 	Repo            string          `json:"repo" protobuf:"bytes,1,opt,name=repo"`

pkg/apis/application/v1alpha1/zz_generated.deepcopy.go

@@ -594,6 +594,37 @@ func (in *HealthStatus) DeepCopy() *HealthStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *HelmRepository) DeepCopyInto(out *HelmRepository) {
+	*out = *in
+	if in.CAData != nil {
+		in, out := &in.CAData, &out.CAData
+		*out = make([]byte, len(*in))
+		copy(*out, *in)
+	}
+	if in.CertData != nil {
+		in, out := &in.CertData, &out.CertData
+		*out = make([]byte, len(*in))
+		copy(*out, *in)
+	}
+	if in.KeyData != nil {
+		in, out := &in.KeyData, &out.KeyData
+		*out = make([]byte, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HelmRepository.
+func (in *HelmRepository) DeepCopy() *HelmRepository {
+	if in == nil {
+		return nil
+	}
+	out := new(HelmRepository)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *HookStatus) DeepCopyInto(out *HookStatus) {
 	*out = *in

reposerver/repository/repository.go

@@ -205,7 +205,11 @@ func generateManifests(appPath string, q *ManifestRequest) (*ManifestResponse, e
 		env := v1alpha1.KsonnetEnv(q.ApplicationSource)
 		targetObjs, params, dest, err = ksShow(appPath, env, q.ComponentParameterOverrides)
 	case v1alpha1.ApplicationSourceTypeHelm:
-		h := helm.NewHelmApp(appPath)
+		h := helm.NewHelmApp(appPath, q.HelmRepos)
+		err := h.Init()
+		if err != nil {
+			return nil, err
+		}
 		opts := helmOpts(q)
 		targetObjs, err = h.Template(q.AppLabel, opts, q.ComponentParameterOverrides)
 		if err != nil {

reposerver/repository/repository.proto

@@ -16,6 +16,7 @@ message ManifestRequest {
     repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ComponentParameter componentParameterOverrides = 6;
     string namespace = 8;
     github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSource applicationSource = 10;
+    repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.HelmRepository helmRepos = 11;
 }
 
 message ManifestResponse {