wip

Author: roi-codefresh

installer/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.5
+version: 0.1.6
 appVersion: v0.0.4
 
 dependencies:

installer/helm/install-values.yaml

@@ -69,6 +69,16 @@ spec:
                 secretKeyRef:
                   name: csdp-installer
                   key: runtime.ingressURL
+            - name: CSDP_INGRESS_CLASS_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: csdp-installer
+                  key: runtime.ingressClass
+            - name: CSDP_INGRESS_CONTROLLER
+              valueFrom:
+                secretKeyRef:
+                  name: csdp-installer
+                  key: runtime.ingressController
             - name: CSDP_GIT_INTEGRATION_PROVIDER
               valueFrom:
                 secretKeyRef:

installer/helm/templates/job.yaml

@@ -10,5 +10,7 @@ stringData:
   runtime.repo: {{ .Values.csdpInstaller.runtime.repo }}
   runtime.gitToken: {{ .Values.csdpInstaller.runtime.gitToken }}
   runtime.ingressURL: {{ .Values.csdpInstaller.runtime.ingressURL }}
+  runtime.ingressClass: {{ .Values.csdpInstaller.runtime.ingressClass }}
+  runtime.ingressController: {{ .Values.csdpInstaller.runtime.ingressController }}
   runtime.cluster: {{ .Values.csdpInstaller.runtime.cluster }}
 {{- end }}

installer/helm/templates/secret.yaml

@@ -2,7 +2,7 @@ global:
   # Controlls argo-cd image
   image:
     repository: quay.io/codefresh/argocd
-    tag: v2.1.14-cap-CR-10462
+    tag: v2.3.3-cap-CR-kustomize-components
 
 argo-cd:
   fullnameOverride: "argocd"
@@ -22,14 +22,14 @@ argo-cd:
     enable: true
     image:
       # -- Repository to use for the application set controller
-      repository: quay.io/argoproj/argocd-applicationset
+      repository: quay.io/codefresh/applicationset
       # -- Image pull policy for the application set controller
-      pullPolicy: IfNotPresent
+      pullPolicy: Always
       # -- Tag to use for the application set controller
-      tag: "v0.4.1"
+      tag: "v0.4.2"
 
 csdpInstaller:
-  enabled: false
+  enabled: true
 
   # CSDP platform details:
   platform:
@@ -47,6 +47,10 @@ csdpInstaller:
     gitToken: <GIT_TOKEN>
     # Ingress URL that will be used to reach to services inside of the cluster
     ingressURL: <INGRESS_URL>
+    # Ingress class is the name of the ingress class
+    ingressClass: ""
+    # Ingress Controller is the type of ingress controller you are using
+    ingressController: ""
     # Kubernetes cluster address or name that will be used to identify this cluster
     cluster: https://kubernetes.docker.internal:6443
 

installer/helm/values.yaml

@@ -17,9 +17,9 @@ CODEFRESH_SECRET_NAME="codefresh-token"
 REPO_CREDS_SECRET_NAME="autopilot-secret"
 ARGOCD_TOKEN_SECRET_NAME="argocd-token"
 ARGOCD_INITIAL_TOKEN_SECRET_NAME="argocd-initial-admin-secret"
-BOOTSTRAP_APP_NAME="autopilot-bootstrap"
+BOOTSTRAP_APP_NAME="csdp-bootstrap"
 ADDITIONAL_COMPONENTS="\nevents-reporter\nrollout-reporter\nworkflow-reporter"
-RUNTIME_DEF_URL="https://github.com/codefresh-io/cli-v2/releases/VERSION/download/runtime.yaml"
+RUNTIME_DEF_URL="https://github.com/codefresh-io/csdp-official-poc/releases/VERSION/download/runtime.yaml"
 
 # Params:
 check_required_param "namespace" "${NAMESPACE}"
@@ -36,7 +36,7 @@ CSDP_RUNTIME_VERSION="${CSDP_RUNTIME_VERSION:-latest}"
 CSDP_GIT_INTEGRATION_PROVIDER="${CSDP_GIT_INTEGRATION_PROVIDER:-GITHUB}"
 CSDP_GIT_INTEGRATION_API_URL="${CSDP_GIT_INTEGRATION_API_URL:-https://api.github.com}"
 CSDP_GIT_INTEGRATION_TOKEN="${CSDP_GIT_INTEGRATION_TOKEN:-${CSDP_RUNTIME_GIT_TOKEN}}"
-CSDP_RUNTIME_REPO_CREDS_PATTERN=`echo ${CSDP_RUNTIME_REPO} | sed "s/\/[a-zA-Z0-9\?\._\-]*$//g"`
+CSDP_RUNTIME_REPO_CREDS_PATTERN=`echo ${CSDP_RUNTIME_REPO} | grep --color=never -E -o '^http[s]?:\/\/([a-zA-Z0-9\.]*)'`
 
 create_codefresh_secret() {
     # Download runtime definition
@@ -65,6 +65,8 @@ create_codefresh_secret() {
         \"runtimeName\":\"${CSDP_RUNTIME_NAME}\",
         \"cluster\":\"${CSDP_RUNTIME_CLUSTER}\",
         \"ingressHost\":\"${CSDP_RUNTIME_INGRESS_URL}\",
+        \"ingressClass\":\"${CSDP_INGRESS_CLASS_NAME}\",
+        \"ingressController\":\"${CSDP_INGRESS_CONTROLLER}\",
         \"componentNames\":${COMPONENTS},
         \"runtimeVersion\":\"${RESOLVED_RUNTIME_VERSION}\"
     }"
@@ -113,14 +115,14 @@ create_bootstrap_application() {
     kind: Application
     metadata:
         labels:
-            app.kubernetes.io/managed-by: argocd-autopilot
             app.kubernetes.io/name: ${BOOTSTRAP_APP_NAME}
             codefresh.io/internal: \"true\"
         name: ${BOOTSTRAP_APP_NAME}
         namespace: ${NAMESPACE}
         finalizers:
           - 'resources-finalizer.argocd.argoproj.io'
     spec:
+        project: default
         destination:
             namespace: ${NAMESPACE}
             server: https://kubernetes.default.svc
@@ -129,10 +131,10 @@ create_bootstrap_application() {
               kind: Application
               jsonPointers:
                 - /status
-        project: default
         source:
-            path: bootstrap
+            path: base/bootstrap
             repoURL: ${CSDP_RUNTIME_REPO}
+            targetRevision: HEAD
         syncPolicy:
             automated:
                 allowEmpty: true
@@ -251,9 +253,11 @@ echo "  runtime repo: ${CSDP_RUNTIME_REPO}"
 echo "  runtime repo creds pattern: ${CSDP_RUNTIME_REPO_CREDS_PATTERN}"
 echo "  runtime git-token: ****"
 echo "  runtime cluster: ${CSDP_RUNTIME_CLUSTER}"
-echo "  runtime ingress: ${CSDP_RUNTIME_INGRESS_URL}"
 echo "  runtime name: ${CSDP_RUNTIME_NAME}"
 echo "  runtime version: ${CSDP_RUNTIME_VERSION}"
+echo "  runtime ingress: ${CSDP_RUNTIME_INGRESS_URL}"
+echo "  ingress class name: ${CSDP_INGRESS_CLASS_NAME}"
+echo "  ingress controller: ${CSDP_INGRESS_CONTROLLER}"
 echo "#######################################"
 echo ""
 

installer/install.sh

@@ -65,6 +65,16 @@ spec:
                 secretKeyRef:
                   name: csdp-installer
                   key: runtime.ingressURL
+            - name: CSDP_INGRESS_CLASS_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: csdp-installer
+                  key: runtime.ingressClass
+            - name: CSDP_INGRESS_CONTROLLER
+              valueFrom:
+                secretKeyRef:
+                  name: csdp-installer
+                  key: runtime.ingressController
             - name: CSDP_GIT_INTEGRATION_PROVIDER
               valueFrom:
                 secretKeyRef:

installer/kustomize/csdp-installer.job.yaml

@@ -8,5 +8,7 @@ stringData:
   runtime.name: <RUNTIME_NAME>
   runtime.repo: <RUNTIME_REPO>
   runtime.gitToken: <RUNTIME_GIT_TOKEN>
-  runtime.ingressURL: <RUNTIME_INGRESS_URL>
   runtime.cluster: <RUNTIME_CLUSTER>
+  runtime.ingressURL: <RUNTIME_INGRESS_URL>
+  runtime.ingressClass: <RUNTIME_INGRESS_CLASS>
+  runtime.ingressController: <RUNTIME_INGRESS_CONTROLLER>

installer/kustomize/csdp-installer.secret.yaml

@@ -16,5 +16,7 @@ secretGenerator:
       - "runtime.name=<RUNTIME_NAME>"
       - "runtime.repo=<RUNTIME_REPO>"
       - "runtime.gitToken=<RUNTIME_GIT_TOKEN>"
-      - "runtime.ingressURL=<RUNTIME_INGRESS_URL>"
       - "runtime.cluster=<RUNTIME_CLUSTER>"
+      - "runtime.ingressURL=<RUNTIME_INGRESS_URL>"
+      - "runtime.ingressClass=<RUNTIME_INGRESS_CLASS>"
+      - "runtime.ingressController=<RUNTIME_INGRESS_CONTROLLER>"