diff --git a/argocd/app-of-apps/test/templates/applications.yaml b/argocd/app-of-apps/test/templates/applications.yaml index 2c2cf9e..1b3bf41 100644 --- a/argocd/app-of-apps/test/templates/applications.yaml +++ b/argocd/app-of-apps/test/templates/applications.yaml @@ -18,10 +18,10 @@ spec: source: repoURL: {{ .repoURL }} targetRevision: {{ .targetRevision }} - {{- if .repoURL | contains "git" }} - path: argocd/{{ .name }}/{{ $.Values.overall.environment }} - {{- else }} + {{- if .repoURL | contains "chart" }} chart: {{ .name }} + {{- else }} + path: argocd/{{ .name }}/{{ $.Values.overall.environment }} {{- end }} helm: ignoreMissingValueFiles: true diff --git a/argocd/app-of-apps/test/values.yaml b/argocd/app-of-apps/test/values.yaml index 5deea8e..2cbcd8f 100644 --- a/argocd/app-of-apps/test/values.yaml +++ b/argocd/app-of-apps/test/values.yaml @@ -29,6 +29,13 @@ applications: namespace: vault-secrets-operator-system createNamespace: true repoURL: https://git.2martens.de/2martens/cloud-configuration.git + - name: prometheus + project: default + targetRevision: 4.7.1 + namespace: observability + createNamespace: true + repoURL: https://git.2martens.de/2martens/cloud-configuration.git + overall: destinationServer: https://kubernetes.default.svc diff --git a/argocd/prometheus/test/Chart.lock b/argocd/prometheus/test/Chart.lock new file mode 100644 index 0000000..0a85d19 --- /dev/null +++ b/argocd/prometheus/test/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: prometheus + repository: https://prometheus-community.github.io/helm-charts + version: 25.4.0 +digest: sha256:2a0b0218662b5ab4d2362bdbd5fc74bdd02641586c882412e011bcdb03775982 +generated: "2023-11-01T21:47:32.927215+01:00" diff --git a/argocd/prometheus/test/Chart.yaml b/argocd/prometheus/test/Chart.yaml new file mode 100644 index 0000000..a9f334c --- /dev/null +++ b/argocd/prometheus/test/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: prometheus +version: 0.1.0 +type: application +dependencies: + - name: prometheus + version: 25.4.0 + repository: https://prometheus-community.github.io/helm-charts \ No newline at end of file diff --git a/argocd/prometheus/test/argocd_values.yaml b/argocd/prometheus/test/argocd_values.yaml new file mode 100644 index 0000000..d1261f0 --- /dev/null +++ b/argocd/prometheus/test/argocd_values.yaml @@ -0,0 +1,22 @@ +ingress: + enabled: true + ingressClassName: public + hosts: + - prometheus.k8s.test.2martens.de + annotations: + cert-manager.io/cluster-issuer: lets-encrypt + tls: + - secretName: prometheus-server-tls + hosts: + - prometheus.k8s.test.2martens.de + +alertmanager: + enabled: false + +resources: { } +# requests: +# cpu: 100m +# memory: 128Mi +# limits: +# cpu: 100m +# memory: 128Mi diff --git a/argocd/vault-secrets-operator/test/Chart.yaml b/argocd/vault-secrets-operator/test/Chart.yaml index b5c419c..6102714 100644 --- a/argocd/vault-secrets-operator/test/Chart.yaml +++ b/argocd/vault-secrets-operator/test/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: kafka +name: vault-secrets-operator version: 0.1.0 type: application dependencies: