From 15e65b16a639e203f76a945bff3d3a5cea2de2e4 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 29 Oct 2023 23:29:16 +0100 Subject: [PATCH] Fix app-of-apps structure --- .../test/configserver.yaml} | 0 .../test/kafka.yaml} | 0 .../test/templates/applications.yaml | 7 ++-- argocd/app-of-apps/test/values.yaml | 10 +++--- .../test/wahlrecht.yaml} | 0 .../test/zookeeper.yaml} | 0 argocd/configserver/test/Chart.lock | 6 ---- argocd/configserver/test/Chart.yaml | 9 ----- argocd/kafka/test/Chart.lock | 6 ---- argocd/kafka/test/Chart.yaml | 9 ----- argocd/vault-secrets-operator/test/Chart.lock | 6 ---- argocd/vault-secrets-operator/test/Chart.yaml | 9 ----- argocd/wahlrecht/test/Chart.lock | 6 ---- argocd/wahlrecht/test/Chart.yaml | 9 ----- argocd/wahlrecht/test/values.yaml | 36 ------------------- argocd/zookeeper/test/Chart.lock | 6 ---- argocd/zookeeper/test/Chart.yaml | 9 ----- 17 files changed, 9 insertions(+), 119 deletions(-) rename argocd/{configserver/test/override_values.yaml => app-of-apps/test/configserver.yaml} (100%) rename argocd/{kafka/test/override_values.yaml => app-of-apps/test/kafka.yaml} (100%) rename argocd/{wahlrecht/test/override_values.yaml => app-of-apps/test/wahlrecht.yaml} (100%) rename argocd/{zookeeper/test/override_values.yaml => app-of-apps/test/zookeeper.yaml} (100%) delete mode 100644 argocd/configserver/test/Chart.lock delete mode 100644 argocd/configserver/test/Chart.yaml delete mode 100644 argocd/kafka/test/Chart.lock delete mode 100644 argocd/kafka/test/Chart.yaml delete mode 100644 argocd/vault-secrets-operator/test/Chart.lock delete mode 100644 argocd/vault-secrets-operator/test/Chart.yaml delete mode 100644 argocd/wahlrecht/test/Chart.lock delete mode 100644 argocd/wahlrecht/test/Chart.yaml delete mode 100644 argocd/wahlrecht/test/values.yaml delete mode 100644 argocd/zookeeper/test/Chart.lock delete mode 100644 argocd/zookeeper/test/Chart.yaml diff --git a/argocd/configserver/test/override_values.yaml b/argocd/app-of-apps/test/configserver.yaml similarity index 100% rename from argocd/configserver/test/override_values.yaml rename to argocd/app-of-apps/test/configserver.yaml diff --git a/argocd/kafka/test/override_values.yaml b/argocd/app-of-apps/test/kafka.yaml similarity index 100% rename from argocd/kafka/test/override_values.yaml rename to argocd/app-of-apps/test/kafka.yaml diff --git a/argocd/app-of-apps/test/templates/applications.yaml b/argocd/app-of-apps/test/templates/applications.yaml index 2f12074..a618f05 100644 --- a/argocd/app-of-apps/test/templates/applications.yaml +++ b/argocd/app-of-apps/test/templates/applications.yaml @@ -16,10 +16,11 @@ spec: server: {{ $.Values.overall.destinationServer }} project: {{ .project }} source: - path: argocd/{{ .name }}/{{ $.Values.overall.environment }} - repoURL: https://git.2martens.de/2martens/cloud-configuration/ + repoURL: https://repo.2martens.de/charts targetRevision: {{ .targetRevision }} + chart: {{ .name }} helm: + ignoreMissingValueFiles: true valueFiles: - - override_values.yaml + - {{ .name }}.yaml {{- end }} diff --git a/argocd/app-of-apps/test/values.yaml b/argocd/app-of-apps/test/values.yaml index d85a2db..bf7156c 100644 --- a/argocd/app-of-apps/test/values.yaml +++ b/argocd/app-of-apps/test/values.yaml @@ -1,27 +1,27 @@ applications: - name: configserver project: default - targetRevision: main + targetRevision: x namespace: spring-support createNamespace: true - name: kafka project: default - targetRevision: main + targetRevision: x namespace: kafka createNamespace: true - name: zookeeper project: default - targetRevision: main + targetRevision: x namespace: kafka createNamespace: false - name: wahlrecht project: default - targetRevision: main + targetRevision: x namespace: wahlrecht createNamespace: true - name: vault-secrets-operator project: default - targetRevision: main + targetRevision: x namespace: vault-secrets-operator-system createNamespace: true diff --git a/argocd/wahlrecht/test/override_values.yaml b/argocd/app-of-apps/test/wahlrecht.yaml similarity index 100% rename from argocd/wahlrecht/test/override_values.yaml rename to argocd/app-of-apps/test/wahlrecht.yaml diff --git a/argocd/zookeeper/test/override_values.yaml b/argocd/app-of-apps/test/zookeeper.yaml similarity index 100% rename from argocd/zookeeper/test/override_values.yaml rename to argocd/app-of-apps/test/zookeeper.yaml diff --git a/argocd/configserver/test/Chart.lock b/argocd/configserver/test/Chart.lock deleted file mode 100644 index d9d0c6b..0000000 --- a/argocd/configserver/test/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: configserver - repository: https://repo.2martens.de/charts - version: 0.1.7 -digest: sha256:3dba1d0466b9d4fe5b46e0d8fabe16f6cde178c6768b1980e31fabedd8d66bdb -generated: "2023-10-29T20:54:06.964275+01:00" diff --git a/argocd/configserver/test/Chart.yaml b/argocd/configserver/test/Chart.yaml deleted file mode 100644 index 18eb0e8..0000000 --- a/argocd/configserver/test/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v2 -name: configserver -description: Configuration chart for ArgoCD to monitor -type: application -version: 0.1.7 -dependencies: - - name: configserver - version: 0.1.7 - repository: https://repo.2martens.de/charts diff --git a/argocd/kafka/test/Chart.lock b/argocd/kafka/test/Chart.lock deleted file mode 100644 index 32c4719..0000000 --- a/argocd/kafka/test/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: kafka - repository: https://repo.2martens.de/charts - version: 0.1.4 -digest: sha256:d1ae6b3e5b1a556aacbc79af9e91d6b453da22c8b59ea74d2503dd98c965609d -generated: "2023-10-29T21:02:09.531613+01:00" diff --git a/argocd/kafka/test/Chart.yaml b/argocd/kafka/test/Chart.yaml deleted file mode 100644 index 1ed7423..0000000 --- a/argocd/kafka/test/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v2 -name: kafka -description: Configuration chart for ArgoCD to monitor -type: application -version: 0.1.4 -dependencies: - - name: kafka - version: 0.1.4 - repository: https://repo.2martens.de/charts diff --git a/argocd/vault-secrets-operator/test/Chart.lock b/argocd/vault-secrets-operator/test/Chart.lock deleted file mode 100644 index 6ecdcf4..0000000 --- a/argocd/vault-secrets-operator/test/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: vault-secrets-operator - repository: https://helm.releases.hashicorp.com - version: 0.3.4 -digest: sha256:31a1abfdb72e2bbda888425b359389c93ae44e9f614e28e227181e69a0af08a7 -generated: "2023-10-29T21:13:45.344073+01:00" diff --git a/argocd/vault-secrets-operator/test/Chart.yaml b/argocd/vault-secrets-operator/test/Chart.yaml deleted file mode 100644 index f941698..0000000 --- a/argocd/vault-secrets-operator/test/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v2 -name: vault-secrets-operator -description: Configuration chart for ArgoCD to monitor -type: application -version: 0.1.0 -dependencies: - - name: vault-secrets-operator - version: 0.3.4 - repository: https://helm.releases.hashicorp.com diff --git a/argocd/wahlrecht/test/Chart.lock b/argocd/wahlrecht/test/Chart.lock deleted file mode 100644 index 0e54d55..0000000 --- a/argocd/wahlrecht/test/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: wahlrecht - repository: https://repo.2martens.de/charts - version: 0.1.8 -digest: sha256:b39f9c646c50aca0624889fcf6e1c419fc0bed5c62243a3ecb88bea2930a77e6 -generated: "2023-10-29T20:37:10.080382+01:00" diff --git a/argocd/wahlrecht/test/Chart.yaml b/argocd/wahlrecht/test/Chart.yaml deleted file mode 100644 index dad74dc..0000000 --- a/argocd/wahlrecht/test/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v2 -name: wahlrecht -description: Configuration chart for ArgoCD to monitor -type: application -version: 0.1.8 -dependencies: - - name: wahlrecht - version: 0.1.8 - repository: https://repo.2martens.de/charts diff --git a/argocd/wahlrecht/test/values.yaml b/argocd/wahlrecht/test/values.yaml deleted file mode 100644 index f0b4f9c..0000000 --- a/argocd/wahlrecht/test/values.yaml +++ /dev/null @@ -1,36 +0,0 @@ -image: - tag: 0.2.10 - -ingress: - enabled: true - className: public - hosts: - - host: api.2martens.de - paths: - - path: /wahlrecht/ - pathType: Prefix - tls: - - secretName: wahlrecht-tls - hosts: - - api.2martens.de - -resources: - requests: - cpu: 100m - memory: 128Mi - -application: - configserver: - scheme: http - host: configserver.spring-support - port: 8888 - prefix: /config - kafka: - host: kafka.kafka - port: 9092 - -secrets: - # Needs to be overwritten and in base64 encoding - MONGODB_CONNECTION_STRING: "" - # Needs to be overwritten and in base64 encoding - CLIENT_SECRET: "" diff --git a/argocd/zookeeper/test/Chart.lock b/argocd/zookeeper/test/Chart.lock deleted file mode 100644 index 431684c..0000000 --- a/argocd/zookeeper/test/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: zookeeper - repository: https://repo.2martens.de/charts - version: 0.1.3 -digest: sha256:deb188ee907d0b65139c7ae0125ae661693b9d27132026a64f3a7dfac33ffdab -generated: "2023-10-29T21:06:20.654449+01:00" diff --git a/argocd/zookeeper/test/Chart.yaml b/argocd/zookeeper/test/Chart.yaml deleted file mode 100644 index aea01df..0000000 --- a/argocd/zookeeper/test/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v2 -name: zookeeper -description: Configuration chart for ArgoCD to monitor -type: application -version: 0.1.3 -dependencies: - - name: zookeeper - version: 0.1.3 - repository: https://repo.2martens.de/charts