fix(argocd): added possiblity to add known_hosts to argocd

Signed-off-by: Stefan Benz <[email protected]>
caos · Apr 1, 2020 · 2589dcb · 2589dcb
1 parent a72c406
commit 2589dcb
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/api/v1beta1/argocd.go b/api/v1beta1/argocd.go
@@ -7,6 +7,7 @@ type Argocd struct {
 	Auth         *ArgocdAuth         `json:"auth,omitempty" yaml:"auth,omitempty"`
 	Rbac         *Rbac               `json:"rbacConfig,omitempty" yaml:"rbacConfig,omitempty"`
 	Repositories []*ArgocdRepository `json:"repositories,omitempty" yaml:"repositories,omitempty"`
+	KnownHosts   []string            `json:"knownHosts,omitempty" yaml:"knownHosts,omitempty"`
 }
 
 type Rbac struct {

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/toolsets.boom.caos.ch_toolsets.yaml b/config/crd/bases/toolsets.boom.caos.ch_toolsets.yaml
@@ -227,6 +227,10 @@ spec:
                   type: object
                 deploy:
                   type: boolean
+                knownHosts:
+                  items:
+                    type: string
+                  type: array
                 network:
                   properties:
                     acmeAuthority:
@@ -236,14 +240,18 @@ spec:
                     email:
                       type: string
                   required:
-                  - domain
+                    - domain
                   type: object
                 rbacConfig:
                   properties:
                     policy.csv:
                       type: string
                     policy.default:
                       type: string
+                    scopes:
+                      items:
+                        type: string
+                      type: array
                   type: object
                 repositories:
                   items:
@@ -563,6 +571,7 @@ spec:
           description: ToolsetStatus defines the observed state of Toolset
           type: object
       type: object
+  version: v1beta1
   versions:
   - name: v1beta1
     served: true

diff --git a/internal/bundle/application/applications/argocd/helm.go b/internal/bundle/application/applications/argocd/helm.go
@@ -113,6 +113,16 @@ func (a *Argocd) SpecToHelmValues(monitor mntr.Monitor, toolsetCRDSpec *toolsets
 		}
 	}
 
+	if spec.KnownHosts != nil && len(spec.KnownHosts) > 0 {
+		knownHostsStr := values.Configs.KnownHosts.Data["ssh_known_hosts"]
+
+		for _, v := range spec.KnownHosts {
+			knownHostsStr = strings.Join([]string{knownHostsStr, v}, "\n")
+		}
+
+		values.Configs.KnownHosts.Data["ssh_known_hosts"] = knownHostsStr
+	}
+
 	return values
 }
 

diff --git a/internal/bundle/application/applications/argocd/helm/default.go b/internal/bundle/application/applications/argocd/helm/default.go
@@ -55,7 +55,6 @@ func DefaultValues(imageTags map[string]string) *Values {
 			knownHostsStr = strings.Join([]string{knownHostsStr, v}, "\n")
 		}
 	}
-	knownHostsStr = strings.Join([]string{knownHostsStr, "\n"}, "")
 
 	values := &Values{
 		FullnameOverride: "argocd",