Skip to content

Commit 8a7039c

Browse files
add apps, change type to applicationset
1 parent 11fed1f commit 8a7039c

17 files changed

+570
-16
lines changed
Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
1-
---
21
apiVersion: argoproj.io/v1alpha1
3-
kind: Application
2+
kind: ApplicationSet
43
metadata:
54
name: "apps"
65
namespace: "argocd"
7-
annotations:
8-
argocd.argoproj.io/sync-wave: "3"
96
spec:
10-
project: "apps"
11-
source:
12-
repoURL: "https://github.com/soerenschneider/k8s-gitops.git"
13-
targetRevision: "HEAD"
14-
path: "clusters/argo-svc.dd.soeren.cloud/apps"
15-
destination:
16-
server: "https://kubernetes.default.svc"
17-
syncPolicy:
18-
automated:
19-
prune: true
20-
selfHeal: true
7+
generators:
8+
- directory:
9+
repoURL: "https://github.com/soerenschneider/k8s-gitops.git"
10+
revision: "HEAD"
11+
path: "clusters/argo-svc.dd.soeren.cloud/apps/*"
12+
template:
13+
metadata:
14+
name: '{{path.basename}}'
15+
namespace: "argocd"
16+
annotations:
17+
argocd.argoproj.io/sync-wave: "3"
18+
spec:
19+
project: "apps"
20+
source:
21+
repoURL: "https://github.com/soerenschneider/k8s-gitops.git"
22+
targetRevision: "HEAD"
23+
path: '{{path}}'
24+
destination:
25+
server: "https://kubernetes.default.svc"
26+
syncPolicy:
27+
automated:
28+
prune: true
29+
selfHeal: true
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
apiVersion: "external-secrets.io/v1beta1"
3+
kind: "ExternalSecret"
4+
metadata:
5+
name: "aether-taskwarrior"
6+
spec:
7+
refreshInterval: "1h"
8+
secretStoreRef:
9+
name: "vault"
10+
kind: "ClusterSecretStore"
11+
target:
12+
name: "aether-taskwarrior"
13+
creationPolicy: "Owner"
14+
data:
15+
- secretKey: "config"
16+
remoteRef:
17+
key: "secret/soeren.cloud/env/prod/taskwarrior"
18+
property: "conf"
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
apiVersion: "external-secrets.io/v1beta1"
3+
kind: "ExternalSecret"
4+
metadata:
5+
name: "aether"
6+
spec:
7+
refreshInterval: "1h"
8+
secretStoreRef:
9+
name: "vault"
10+
kind: "ClusterSecretStore"
11+
target:
12+
name: "aether"
13+
creationPolicy: "Owner"
14+
data:
15+
- secretKey: "caldav_password"
16+
remoteRef:
17+
key: "secret/soeren.cloud/env/prod/aether"
18+
property: "caldav_password"
19+
- secretKey: "caldav_user"
20+
remoteRef:
21+
key: "secret/soeren.cloud/env/prod/aether"
22+
property: "caldav_user"
23+
- secretKey: "carddav_password"
24+
remoteRef:
25+
key: "secret/soeren.cloud/env/prod/aether"
26+
property: "carddav_password"
27+
- secretKey: "carddav_user"
28+
remoteRef:
29+
key: "secret/soeren.cloud/env/prod/aether"
30+
property: "carddav_user"
31+
- secretKey: "email_from"
32+
remoteRef:
33+
key: "secret/soeren.cloud/env/prod/aether"
34+
property: "email_from"
35+
- secretKey: "email_password"
36+
remoteRef:
37+
key: "secret/soeren.cloud/env/prod/aether"
38+
property: "email_password"
39+
- secretKey: "email_to"
40+
remoteRef:
41+
key: "secret/soeren.cloud/env/prod/aether"
42+
property: "email_to"
43+
- secretKey: "email_username"
44+
remoteRef:
45+
key: "secret/soeren.cloud/env/prod/aether"
46+
property: "email_username"
47+
- secretKey: "weather_apikey"
48+
remoteRef:
49+
key: "secret/soeren.cloud/env/prod/aether"
50+
property: "weather_apikey"
51+
- secretKey: "AWS_ACCESS_KEY_ID"
52+
remoteRef:
53+
key: "secret/soeren.cloud/env/prod/aws-s3/credentials/taskwarrior-prod-aether"
54+
property: "AWS_ACCESS_KEY_ID"
55+
- secretKey: "AWS_SECRET_ACCESS_KEY"
56+
remoteRef:
57+
key: "secret/soeren.cloud/env/prod/aws-s3/credentials/taskwarrior-prod-aether"
58+
property: "AWS_SECRET_ACCESS_KEY"
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
namespace: aether
5+
resources:
6+
- ../../common/aether
7+
- namespace.yaml
8+
- external-secret-aether.yaml
9+
- external-secret-aether-taskwarrior.yaml
10+
patches:
11+
- target:
12+
kind: VirtualService
13+
name: aether
14+
patch: |-
15+
- op: replace
16+
path: /spec/hosts
17+
value:
18+
- aether.svc.dd.soeren.cloud
19+
- target:
20+
kind: Deployment
21+
name: aether
22+
patch: |
23+
- op: add
24+
path: /spec/template/spec/containers/1/env
25+
value:
26+
- name: AWS_ACCESS_KEY_ID
27+
valueFrom:
28+
secretKeyRef:
29+
name: aether
30+
key: AWS_ACCESS_KEY_ID
31+
- name: AWS_SECRET_ACCESS_KEY
32+
valueFrom:
33+
secretKeyRef:
34+
name: aether
35+
key: AWS_SECRET_ACCESS_KEY
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
kind: Namespace
3+
apiVersion: v1
4+
metadata:
5+
name: aether
6+
labels:
7+
name: aether
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
apiVersion: external-secrets.io/v1beta1
3+
kind: ExternalSecret
4+
metadata:
5+
name: "dyndns-client-aws-credentials"
6+
spec:
7+
refreshInterval: 1h
8+
secretStoreRef:
9+
name: "vault"
10+
kind: "ClusterSecretStore"
11+
target:
12+
name: "dyndns-client-aws-credentials"
13+
creationPolicy: "Owner"
14+
data:
15+
- secretKey: "AWS_ACCESS_KEY_ID"
16+
remoteRef:
17+
key: "secret/soeren.cloud/k8s/svc.dd.soeren.cloud/dyndns/client/aws-credentials"
18+
property: "AWS_ACCESS_KEY_ID"
19+
- secretKey: "AWS_SECRET_ACCESS_KEY"
20+
remoteRef:
21+
key: "secret/soeren.cloud/k8s/svc.dd.soeren.cloud/dyndns/client/aws-credentials"
22+
property: "AWS_SECRET_ACCESS_KEY"
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
apiVersion: external-secrets.io/v1beta1
3+
kind: ExternalSecret
4+
metadata:
5+
name: "dyndns-client-aws-endpoints"
6+
spec:
7+
refreshInterval: 1h
8+
secretStoreRef:
9+
name: "vault"
10+
kind: "ClusterSecretStore"
11+
target:
12+
name: "dyndns-client-aws-endpoints"
13+
creationPolicy: "Owner"
14+
data:
15+
- secretKey: "DYNDNS_HTTP_DISPATCHER_CONF"
16+
remoteRef:
17+
key: "secret/soeren.cloud/env/prod/dyndns-endpoints"
18+
property: "DYNDNS_HTTP_DISPATCHER_CONF"
19+
- secretKey: "DYNDNS_HTTP_RESOLVER_PREFERRED_URLS"
20+
remoteRef:
21+
key: "secret/soeren.cloud/env/prod/dyndns-endpoints"
22+
property: "DYNDNS_HTTP_RESOLVER_PREFERRED_URLS"
23+
- secretKey: "DYNDNS_SQS_QUEUE"
24+
remoteRef:
25+
key: "secret/soeren.cloud/env/prod/dyndns-endpoints"
26+
property: "DYNDNS_SQS_QUEUE"
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
apiVersion: external-secrets.io/v1beta1
3+
kind: ExternalSecret
4+
metadata:
5+
name: "dyndns-client-keypair"
6+
spec:
7+
refreshInterval: 1h
8+
secretStoreRef:
9+
name: "vault"
10+
kind: "ClusterSecretStore"
11+
target:
12+
name: "dyndns-client-keypair"
13+
creationPolicy: "Owner"
14+
data:
15+
- secretKey: "keypair.json"
16+
remoteRef:
17+
key: "secret/soeren.cloud/k8s/svc.dd.soeren.cloud/dyndns/client/keypair"
18+
property: "keypair.json"
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
5+
- ../../../../apps/dyndns/client
6+
- external-secret-dyndns-client-aws-credentials.yaml
7+
- external-secret-dyndns-client-aws-endpoints.yaml
8+
- external-secret-dyndns-client-keypair.yaml
9+
components:
10+
- ../../../../apps/dyndns/client/components/aws-credentials
11+
- ../../../../apps/dyndns/client/components/aws-endpoints
12+
- ../../../../apps/dyndns/client/components/keypair
13+
patches:
14+
- target:
15+
kind: Deployment
16+
name: dyndns-client
17+
patch: |-
18+
- op: add
19+
path: /spec/template/spec/priorityClassName
20+
value: prod-high-prio
21+
- op: replace
22+
path: /spec/template/spec/volumes
23+
value:
24+
- name: keypair
25+
secret:
26+
secretName: dyndns-client-keypair
27+
configMapGenerator:
28+
- name: dyndns-client-config
29+
behavior: merge
30+
literals:
31+
- "DYNDNS_HOST=dd.dc.soeren.cloud"
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
apiVersion: external-secrets.io/v1beta1
3+
kind: ExternalSecret
4+
metadata:
5+
name: "dyndns-server-aws-endpoints"
6+
spec:
7+
refreshInterval: 1h
8+
secretStoreRef:
9+
name: "vault"
10+
kind: "ClusterSecretStore"
11+
target:
12+
name: "dyndns-server-aws-sqs"
13+
creationPolicy: "Owner"
14+
data:
15+
- secretKey: "DYNDNS_SQS_QUEUE"
16+
remoteRef:
17+
key: "secret/soeren.cloud/env/prod/dyndns-endpoints"
18+
property: "DYNDNS_SQS_QUEUE"

0 commit comments

Comments
 (0)