Merge branch 'argo' into 'master'

Added argocd to umbrella

See merge request platform-one/big-bang/umbrella!44

.gitlab-ci.yml

@@ -30,6 +30,8 @@
   - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang fluent-bit
   - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang twistlock
   - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang cluster-auditor
+  # Enable this after we merge in
+  # - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang argocd
   - kubectl wait --for=condition=Ready --timeout 30s kustomizations.kustomize.toolkit.fluxcd.io -n bigbang secrets
 
 .do_some_quick_tests: &do_some_quick_tests
@@ -75,7 +77,7 @@ fresh install:
   script:
     - echo "Install Big Bang From Current Branch"
     # Install Big Bang From Current Branch
-    - helm upgrade -i bigbang chart -n bigbang --create-namespace --set registryCredentials.username='robot$bigbang' --set registryCredentials.password=${REGISTRY1_PASSWORD}
+    - helm upgrade -i bigbang chart -n bigbang --create-namespace --set registryCredentials.username='robot$bigbang' --set registryCredentials.password=${REGISTRY1_PASSWORD} --set addons.argocd.enabled=true
     - kubectl apply -f examples/complete/envs/dev/source-secrets.yaml
     - *wait_for_healthy
     - *do_some_quick_tests

chart/templates/argocd/argocd-helmrelease.yaml

+{{- if .Values.addons.argocd.enabled }}
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: argocd
+  namespace: {{ .Release.Namespace }}
+spec:
+  targetNamespace: argocd
+  chart:
+    spec:
+      chart: chart
+      interval: 5m
+      sourceRef:
+        kind: GitRepository
+        name: argocd
+        namespace: {{ .Release.Namespace }}
+
+  {{- with .Values.flux }}
+  interval: {{ .interval }}
+  test:
+    enable: false
+  install:
+    remediation:
+      retries: {{ .install.retries }}
+  upgrade:
+    remediation:
+      retries: {{ .upgrade.retries }}
+      remediateLastFailure: true
+    cleanupOnFail: true
+  rollback:
+    timeout: {{ .rollback.timeout }}
+    cleanupOnFail: {{ .rollback.cleanupOnFail }}
+  {{- end }}
+
+  valuesFrom:
+    - name: values
+      kind: Secret
+      valuesKey: "argocd.yaml"
+  values:
+    createNamespace: false
+    imagePullSecrets:
+      - name: private-registry
+  {{- if or .Values.monitoring.enabled .Values.istio.enabled }}
+  dependsOn:
+  {{- if .Values.istio.enabled }}
+  - name: istio
+    namespace: {{ .Release.Namespace}}
+  {{- end}}
+  {{- if .Values.monitoring.enabled }}
+  - name: monitoring
+    namespace: {{ .Release.Namespace }}
+  {{- end }}
+  {{- end }}
+{{- end }}
\ No newline at end of file

chart/templates/argocd/gitrepository.yaml

+{{- if .Values.addons.argocd.enabled  }}
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: argocd
+  namespace: {{ .Release.Namespace }}
+spec:
+  ignore: |
+    # exclude file extensions
+    /**/*.md
+    /**/*.txt
+    /**/*.sh
+  interval: {{ .Values.flux.interval }}
+  url: {{ .Values.addons.argocd.git.repo }}
+  ref:
+    {{- include "validRef" .Values.addons.argocd.git | nindent 4 }}
+{{- end }}

chart/templates/argocd/namespace.yaml

+{{- if .Values.addons.argocd.enabled }}
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    app: {{ .Release.Name }}-argocd
+  name: argocd
+
+---
+{{- if and (ne .Values.registryCredentials.username "") (ne .Values.registryCredentials.password "") }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: private-registry
+  namespace: argocd
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{- end }}
+{{- end }}
\ No newline at end of file

chart/templates/values.yaml

@@ -7,6 +7,8 @@ type: generic
 stringData:
   values.yaml: |
 {{ toYaml .Values | indent 4}}
+  argocd.yaml: |
+{{ toYaml .Values.addons.argocd.values | indent 4 }}
   istio.yaml: |
 {{ toYaml .Values.istio.values | indent 4  }}
   gatekeeper.yaml: |

chart/values.yaml

@@ -75,3 +75,11 @@ twistlock:
 #    commit: ""
 #    tag: ""
   values: {}
+
+addons:
+  argocd:
+    enabled: false
+    git:
+      repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/argocd.git
+      branch: chart-release
+    values: {}