From 980dae02e7eed7ae4bcf01d6b62ac516e5347b9f Mon Sep 17 00:00:00 2001 From: Amarpreet Minhas Date: Mon, 10 Jul 2023 17:59:46 +0000 Subject: [PATCH] Fix path --- argo/apps/templates/helm-apps.yaml | 6 ++-- argo/bootstrap.sh | 2 +- argo/pihole/values.yaml | 53 ++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 argo/pihole/values.yaml diff --git a/argo/apps/templates/helm-apps.yaml b/argo/apps/templates/helm-apps.yaml index 00e9d0c..3bacfb7 100644 --- a/argo/apps/templates/helm-apps.yaml +++ b/argo/apps/templates/helm-apps.yaml @@ -12,7 +12,7 @@ spec: namespace: {{ .namespace }} sources: - repoURL: 'https://git.minhas.io/Asara/k8s.git' - targetRevision: master + targetRevision: main path: argo/secrets helm: valueFiles: @@ -24,10 +24,10 @@ spec: valueFiles: - $values/argo/{{ .app }}/values.yaml - repoURL: 'https://git.minhas.io/Asara/k8s.git' - targetRevision: master + targetRevision: main ref: values - repoURL: 'https://git.minhas.io/Asara/k8s.git' - targetRevision: master + targetRevision: main path: argo/istio-ingress helm: valueFiles: diff --git a/argo/bootstrap.sh b/argo/bootstrap.sh index 4539779..88e81fc 100755 --- a/argo/bootstrap.sh +++ b/argo/bootstrap.sh @@ -3,7 +3,7 @@ argocd app create apps \ --dest-namespace argocd \ --dest-server https://kubernetes.default.svc \ --repo https://git.minhas.io/asara/k8s \ - --revision master \ + --revision main \ --self-heal \ --sync-policy auto \ --sync-option CreateNamespace=true \ diff --git a/argo/pihole/values.yaml b/argo/pihole/values.yaml new file mode 100644 index 0000000..f94540a --- /dev/null +++ b/argo/pihole/values.yaml @@ -0,0 +1,53 @@ +--- +# internal +name: pihole +namespace: external-dns +externalSecrets: + secretStoreRef: miniflux + secrets: + - secretKey: miniflux_admin_pw + key: miniflux + property: miniflux_admin_pw + - secretKey: miniflux_db_url + key: miniflux + property: miniflux_db_url +istio: + commonName: rss.minhas.io + ingressSelector: ingressgateway + issuer: letsencrypt-prod + port: 80 + backendHost: miniflux + sans: + - miniflux.minhas.io + +# app config +env: + - name: BASE_URL + value: https://rss.minhas.io + - name: LISTEN_ADDR + value: 0.0.0.0:80 + - name: RUN_MIGRATIONS + value: 1 + - name: CREATE_ADMIN + value: 1 + - name: ADMIN_USERNAME + value: admin + - name: DATABASE_URL + valueFrom: + secretKeyRef: + name: miniflux + key: miniflux_db_url + - name: ADMIN_PASSWORD + valueFrom: + secretKeyRef: + name: miniflux + key: miniflux_admin_pw + +service: + main: + ports: + http: + port: 80 + +postgresql: + enabled: false