some fixes to chart

Author: roi-codefresh

.gitignore

@@ -0,0 +1 @@
+charts

helm/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: csdp-installer
 description: A Helm chart used for installing a CSDP runtime
 type: application
-version: 0.1.4
+version: 0.1.5
 appVersion: v0.0.4
 
 dependencies:

helm/install-values.yaml

@@ -1,4 +1,4 @@
-csdp-installer:
+csdpInstaller:
   enabled: true
 
   # CSDP platform details:

helm/templates/job.yaml

@@ -1,24 +1,24 @@
-{{- if .Values.csdp-installer.enabled }}
+{{- if .Values.csdpInstaller.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: csdp-installer
   labels:
     {{- include "csdp-installer.labels" . | nindent 4 }}
 spec:
-  ttlSecondsAfterFinished: {{ .Values.csdp-installer.installer.ttlSecondsAfterFinished }}
-  backoffLimit: {{ .Values.csdp-installer.installer.backoffLimit }}
+  ttlSecondsAfterFinished: {{ .Values.csdpInstaller.installer.ttlSecondsAfterFinished }}
+  backoffLimit: {{ .Values.csdpInstaller.installer.backoffLimit }}
   template:
     metadata:
       labels:
         {{- include "csdp-installer.selectorLabels" . | nindent 8 }}
     spec:
-      serviceAccount: {{ .Values.csdp-installer.installer.serviceAccount }}
+      serviceAccount: {{ .Values.csdpInstaller.installer.serviceAccount }}
       restartPolicy: Never
       containers:
         - name: csdp-installer
-          image: "{{ .Values.csdp-installer.installer.image.repository }}:{{ .Values.csdp-installer.installer.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.csdp-installer.installer.imagePullPolicy }}
+          image: "{{ .Values.csdpInstaller.installer.image.repository }}:{{ .Values.csdpInstaller.installer.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.csdpInstaller.installer.imagePullPolicy }}
           command:
             - bash
           args:
@@ -88,5 +88,5 @@ spec:
                   key: gitIntegration.token
                   optional: true
           resources:
-            {{- toYaml .Values.csdp-installer.installer.resources | nindent 12 }}
+            {{- toYaml .Values.csdpInstaller.installer.resources | nindent 12 }}
 {{ end }}

helm/templates/secret.yaml

@@ -1,14 +1,14 @@
-{{- if .Values.csdp-installer.enabled }}
+{{- if .Values.csdpInstaller.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: csdp-installer
 stringData:
-  csdp.url: {{ .Values.csdp-installer.platform.url }}
-  csdp.token: {{ .Values.csdp-installer.platform.token }}
-  runtime.name: {{ .Values.csdp-installer.runtime.name }}
-  runtime.repo: {{ .Values.csdp-installer.runtime.repo }}
-  runtime.gitToken: {{ .Values.csdp-installer.runtime.gitToken }}
-  runtime.ingressURL: {{ .Values.csdp-installer.runtime.ingressURL }}
-  runtime.cluster: {{ .Values.csdp-installer.runtime.cluster }}
-{{ end }}
+  csdp.url: {{ .Values.csdpInstaller.platform.url }}
+  csdp.token: {{ .Values.csdpInstaller.platform.token }}
+  runtime.name: {{ .Values.csdpInstaller.runtime.name }}
+  runtime.repo: {{ .Values.csdpInstaller.runtime.repo }}
+  runtime.gitToken: {{ .Values.csdpInstaller.runtime.gitToken }}
+  runtime.ingressURL: {{ .Values.csdpInstaller.runtime.ingressURL }}
+  runtime.cluster: {{ .Values.csdpInstaller.runtime.cluster }}
+{{- end }}

helm/values.yaml

@@ -27,3 +27,43 @@ argo-cd:
       pullPolicy: IfNotPresent
       # -- Tag to use for the application set controller
       tag: "v0.4.1"
+
+csdpInstaller:
+  enabled: false
+
+  # CSDP platform details:
+  platform:
+    # The Codefresh platform URL
+    url: <PLATFORM_URL> # if not https://g.codefresh.io, otherwise, leave empty
+    # Codefresh API Key
+    token: <PLATFORM_API_KEY>
+
+  runtime:
+    # CSDP runtime name
+    name: <RUNTIME_NAME>
+    # CSDP runtime installation repo url
+    repo: <INSTALLATION_REPO>
+    # Git authentication token
+    gitToken: <GIT_TOKEN>
+    # Ingress URL that will be used to reach to services inside of the cluster
+    ingressURL: <INGRESS_URL>
+    # Kubernetes cluster address or name that will be used to identify this cluster
+    cluster: https://kubernetes.docker.internal:6443
+
+  # Controlls the spec of the csdp installer job
+  installer:
+    image:
+      repository: quay.io/codefresh/csdp-installer
+      pullPolicy: IfNotPresent
+      # Default tag is the chart appVersion
+      tag: ""
+    serviceAccount: argocd-server
+    ttlSecondsAfterFinished: 600
+    backoffLimit: 20
+    resources:
+      limits:
+        memory: 256Mi
+        cpu: "1"
+      requests:
+        memory: 128Mi
+        cpu: "0.2"

kustomize/kustomization.yaml

@@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - https://github.com/codefresh-io/cli-v2.git/manifests/argo-cd?ref=v0.0.301
-  - ./runtime-installer.secret.yaml
-  - ./runtime-installer.job.yaml
+  - ./csdp-installer.secret.yaml
+  - ./csdp-installer.job.yaml