AutoX and ArgoCD (#36)

* AutoX and ArgoCD Signed-off-by: Alan Cha <[email protected]> * Rename chartGroup to releaseGroupSpec Signed-off-by: Alan Cha <[email protected]> * Rename files Signed-off-by: Alan Cha <[email protected]> * Change name Signed-off-by: Alan Cha <[email protected]> * Change name of config file Signed-off-by: Alan Cha <[email protected]> Signed-off-by: Alan Cha <[email protected]>
kalantar · Dec 5, 2022 · 79459fc · 79459fc
1 parent 053076b
commit 79459fc
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 37 deletions.
diff --git a/charts/autox/Chart.yaml b/charts/autox/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: iter8-autox
-version: 0.1.2
+version: 0.1.3
 description: Iter8 autoX controller
 type: application
 keywords:

diff --git a/charts/autox/templates/configmap.yaml b/charts/autox/templates/configmap.yaml
@@ -1,36 +1,35 @@
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
   name: {{ .Release.Name }}
   {{ template "iter8-autox.labels" . }}
-data:
-  resource-config.yaml: | 
-    resources: 
-    {{- range $r := .Values.resources }}
-    {{- if eq $r "deployments" }}
-    - group: apps
-      version: v1
-      resource: deployments
-    {{- end }}
-    {{- if eq $r "services" }}
-    - version: v1
-      resource: services
-    {{- end }}
-    {{- if eq $r "ksvcs" }}
-    - group: serving.knative.dev
-      version: v1
-      resource: services
-    {{- end }}
-    {{- end }}
-    namespaces:
-{{ toYaml .Values.namespaces | indent 4 }}
-  chart-group-config.yaml: |
-    {{- range $name, $chartGroups := .Values.chartGroups }}
-    - name: {{ $name }}
-      charts:
-      {{- range $cg := $chartGroups }}
-        - repo: {{ $cg.repo }}
-          name: {{ $cg.chartName }}
-          valuesFileURL: {{ $cg.valuesFileURL }}
-      {{- end }}
+stringData:
+  config.yaml: |
+    specs:
+    {{- range $releaseGroupSpecName, $releaseGroupSpec := .Values.releaseGroupSpecs }}
+      {{ $releaseGroupSpecName }}:
+        trigger:
+          group: {{ $releaseGroupSpec.trigger.group }}
+          version: {{ $releaseGroupSpec.trigger.version }}
+          resource: {{ $releaseGroupSpec.trigger.resource }}
+          name: {{ $releaseGroupSpec.trigger.name }}
+          namespace: {{ $releaseGroupSpec.trigger.namespace }}
+        releaseSpecs:
+        {{- range $releaseSpecName, $releaseSpec := $releaseGroupSpec.releaseSpecs }}
+          {{ $releaseSpecName }}:
+            repoURL: {{ $releaseSpec.repoURL }}
+            name: {{ $releaseSpec.name }}
+            values: {{ $releaseSpec.values }}
+            version: {{ $releaseSpec.version }}
+        {{- end }}
     {{- end }}
+{{- range $releaseGroupSpecName, $releaseGroupSpec := .Values.releaseGroupSpecs }}
+{{ $hash := print $releaseGroupSpec | sha256sum | trunc 5 }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: autox-{{ $releaseGroupSpecName }}-{{ $hash }}
+  labels:
+    iter8.tools/autox-group: {{ $releaseGroupSpecName }}
+{{- end }}
diff --git a/charts/autox/templates/deployment.yaml b/charts/autox/templates/deployment.yaml
@@ -23,15 +23,13 @@ spec:
         command: ["/bin/iter8"]
         args: ["autox", "-l", "{{ .Values.logLevel }}"]
         env:
-        - name: RESOURCE_CONFIG
-          value: /config/resource-config.yaml
-        - name: CHART_GROUP_CONFIG
-          value: /config/group-config.yaml
+        - name: CONFIG
+          value: /config/config.yaml
         volumeMounts:
         - name: autox-config
           mountPath: "/config"
           readOnly: true
       volumes:
       - name: autox-config
-        configMap:
+        secret:
           name: {{ .Release.Name }}