Simon Kaiser 3 лет назад
Родитель
Сommit
795b6892f4

+ 1
- 1
cloud-kaisers-info/templates/namespaces.yaml Просмотреть файл

1
 apiVersion: v1
1
 apiVersion: v1
2
 kind: Namespace
2
 kind: Namespace
3
 metadata:
3
 metadata:
4
-  name: nextcloud
4
+  name: "nextcloud"
5
   annotations:
5
   annotations:
6
     argocd.argoproj.io/sync-wave: "-1"
6
     argocd.argoproj.io/sync-wave: "-1"

+ 28
- 28
cloud-kaisers-info/templates/nextcloud.yaml Просмотреть файл

1
 apiVersion: argoproj.io/v1alpha1
1
 apiVersion: argoproj.io/v1alpha1
2
 kind: Application
2
 kind: Application
3
 metadata:
3
 metadata:
4
-  name: nextcloud
4
+  name: "nextcloud"
5
   namespace: {{ .Values.spec.namespace }}
5
   namespace: {{ .Values.spec.namespace }}
6
   finalizers:
6
   finalizers:
7
   - resources-finalizer.argocd.argoproj.io
7
   - resources-finalizer.argocd.argoproj.io
8
 spec:
8
 spec:
9
   destination:
9
   destination:
10
-    namespace: nextcloud
10
+    namespace: "nextcloud"
11
     name: {{ .Values.spec.destination.name }}
11
     name: {{ .Values.spec.destination.name }}
12
   project: {{ .Values.spec.project }}
12
   project: {{ .Values.spec.project }}
13
   syncPolicy:
13
   syncPolicy:
15
       prune: true
15
       prune: true
16
       selfHeal: true
16
       selfHeal: true
17
   source:
17
   source:
18
-    chart: nextcloud
19
-    repoURL: https://nextcloud.github.io/helm/
20
-    targetRevision: 2.12.1
18
+    chart: "nextcloud"
19
+    repoURL: "https://nextcloud.github.io/helm/"
20
+    targetRevision: "2.12.1"
21
     helm:
21
     helm:
22
-      releaseName: nextcloud
22
+      releaseName: "nextcloud"
23
       values: |
23
       values: |
24
         ingress:
24
         ingress:
25
-          enabled: true
25
+          enabled: "true"
26
           annotations: 
26
           annotations: 
27
             cert-manager.io/cluster-issuer: "letsencrypt-prod"
27
             cert-manager.io/cluster-issuer: "letsencrypt-prod"
28
           tls:
28
           tls:
29
             - secretName: "newcloud-kaisers-info-tls"
29
             - secretName: "newcloud-kaisers-info-tls"
30
               hosts:
30
               hosts:
31
                 - "newcloud.kaisers.info"
31
                 - "newcloud.kaisers.info"
32
-          path: /
33
-          pathType: Prefix
32
+          path: "/""
33
+          pathType: "Prefix"
34
 
34
 
35
         nextcloud:
35
         nextcloud:
36
-          host: newcloud.kaisers.info
37
-          username: admin
38
-          password: changeme
36
+          host: "newcloud.kaisers.info"
37
+          username: "admin"
38
+          password: "changeme"
39
           mail:
39
           mail:
40
-            enabled: true
40
+            enabled: "true"
41
             fromAddress: "nextcloud <cloud@kaisers.info>"
41
             fromAddress: "nextcloud <cloud@kaisers.info>"
42
-            domain: newcloud.kaisers.info
42
+            domain: "newcloud.kaisers.info"
43
             smtp:
43
             smtp:
44
               host: "mail.your-server.de"
44
               host: "mail.your-server.de"
45
-              secure: ssl
46
-              port: 587
47
-              authtype: LOGIN
45
+              secure: "ssl"
46
+              port: "587"
47
+              authtype: "LOGIN"
48
               name: "cloud@kaisers.info"
48
               name: "cloud@kaisers.info"
49
               password: "v4w4e8dpg349Vd"
49
               password: "v4w4e8dpg349Vd"
50
 
50
 
51
         internalDatabase:
51
         internalDatabase:
52
-          enabled: false
52
+          enabled: "false"
53
 
53
 
54
         ##
54
         ##
55
         ## External database configuration
55
         ## External database configuration
56
         ##
56
         ##
57
         externalDatabase:
57
         externalDatabase:
58
-          enabled: true
58
+          enabled: "true"
59
 
59
 
60
           ## Supported database engines: mysql or postgresql
60
           ## Supported database engines: mysql or postgresql
61
-          type: mysql
61
+          type: "mysql"
62
 
62
 
63
           ## Database host
63
           ## Database host
64
-          host: nextcloud-mariadb
64
+          host: "nextcloud-mariadb"
65
 
65
 
66
           ## Database user
66
           ## Database user
67
-          user: nextcloud
67
+          user: "nextcloud"
68
 
68
 
69
           ## Database password
69
           ## Database password
70
-          password: nextcloud
70
+          password: "nextcloud"
71
 
71
 
72
           ## Database name
72
           ## Database name
73
-          database: nextcloud
73
+          database: "nextcloud"
74
 
74
 
75
         
75
         
76
         ##
76
         ##
78
         ##
78
         ##
79
         mariadb:
79
         mariadb:
80
           ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters
80
           ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters
81
-          enabled: true
81
+          enabled: "true"
82
 
82
 
83
           auth:
83
           auth:
84
-            database: nextcloud
85
-            username: nextcloud
86
-            password: nextcloud
84
+            database: "nextcloud"
85
+            username: "nextcloud"
86
+            password: "nextcloud"

+ 6
- 6
gitops-kaisers-info/templates/argo-cd.yaml Просмотреть файл

1
 apiVersion: argoproj.io/v1alpha1
1
 apiVersion: argoproj.io/v1alpha1
2
 kind: Application
2
 kind: Application
3
 metadata:
3
 metadata:
4
-  name: argo-cd
4
+  name: "argo-cd"
5
   namespace: {{ .Values.spec.namespace }}
5
   namespace: {{ .Values.spec.namespace }}
6
   finalizers:
6
   finalizers:
7
   - resources-finalizer.argocd.argoproj.io
7
   - resources-finalizer.argocd.argoproj.io
15
       prune: true
15
       prune: true
16
       selfHeal: true
16
       selfHeal: true
17
   source:
17
   source:
18
-    chart: argo-cd
19
-    repoURL: https://argoproj.github.io/argo-helm
20
-    targetRevision: 3.33.6
18
+    chart: "argo-cd"
19
+    repoURL: "https://argoproj.github.io/argo-helm"
20
+    targetRevision: "3.33.6"
21
     helm:
21
     helm:
22
-      releaseName: argo-cd
22
+      releaseName: "argo-cd"
23
       values: |
23
       values: |
24
         server:
24
         server:
25
           ingress: 
25
           ingress: 
26
-            enabled: true
26
+            enabled: "true"
27
             hosts: 
27
             hosts: 
28
               - "argo-cd.kaisers.info"
28
               - "argo-cd.kaisers.info"
29
             paths:
29
             paths:

+ 8
- 8
gitops-kaisers-info/templates/cert-manager.yaml Просмотреть файл

7
   - resources-finalizer.argocd.argoproj.io
7
   - resources-finalizer.argocd.argoproj.io
8
 spec:
8
 spec:
9
   destination:
9
   destination:
10
-    namespace: cert-manager
10
+    namespace: "cert-manager"
11
     name: {{ .Values.spec.destination.name }}
11
     name: {{ .Values.spec.destination.name }}
12
   project: {{ .Values.spec.project }}
12
   project: {{ .Values.spec.project }}
13
   syncPolicy:
13
   syncPolicy:
15
       prune: true
15
       prune: true
16
       selfHeal: true
16
       selfHeal: true
17
   source:
17
   source:
18
-    chart: cert-manager
19
-    repoURL: https://charts.jetstack.io
20
-    targetRevision: 1.7.1
18
+    chart: "cert-manager"
19
+    repoURL: "https://charts.jetstack.io"
20
+    targetRevision: "1.7.1"
21
     helm:
21
     helm:
22
       releaseName: cert-manager
22
       releaseName: cert-manager
23
 ---
23
 ---
24
 apiVersion: cert-manager.io/v1
24
 apiVersion: cert-manager.io/v1
25
 kind: ClusterIssuer
25
 kind: ClusterIssuer
26
 metadata:
26
 metadata:
27
-  name: letsencrypt-staging
28
-  namespace: cert-manager
27
+  name: "letsencrypt-staging"
28
+  namespace: "cert-manager"
29
 spec:
29
 spec:
30
   acme:
30
   acme:
31
     email: "admin@kaisers.info" # replace this
31
     email: "admin@kaisers.info" # replace this
44
 apiVersion: cert-manager.io/v1
44
 apiVersion: cert-manager.io/v1
45
 kind: ClusterIssuer
45
 kind: ClusterIssuer
46
 metadata:
46
 metadata:
47
-  name: letsencrypt-prod
48
-  namespace: cert-manager
47
+  name: "letsencrypt-prod"
48
+  namespace: "cert-manager"
49
 spec:
49
 spec:
50
   acme:
50
   acme:
51
     email: "admin@kaisers.info" # replace this
51
     email: "admin@kaisers.info" # replace this

+ 1
- 1
gitops-kaisers-info/templates/crossplane.yaml Просмотреть файл

17
   source:
17
   source:
18
     chart: crossplane
18
     chart: crossplane
19
     repoURL: https://charts.crossplane.io/stable
19
     repoURL: https://charts.crossplane.io/stable
20
-    targetRevision: 1.7.0-rc.0.99.g5b52bf9e
20
+    targetRevision: 1.6.4

+ 11
- 11
gitops-kaisers-info/templates/gitea.yaml Просмотреть файл

1
 apiVersion: argoproj.io/v1alpha1
1
 apiVersion: argoproj.io/v1alpha1
2
 kind: Application
2
 kind: Application
3
 metadata:
3
 metadata:
4
-  name: gitea
4
+  name: "gitea"
5
   namespace: {{ .Values.spec.namespace }}
5
   namespace: {{ .Values.spec.namespace }}
6
   finalizers:
6
   finalizers:
7
   - resources-finalizer.argocd.argoproj.io
7
   - resources-finalizer.argocd.argoproj.io
8
 spec:
8
 spec:
9
   destination:
9
   destination:
10
-    namespace: gitea
10
+    namespace: "gitea"
11
     name: {{ .Values.spec.destination.name }}
11
     name: {{ .Values.spec.destination.name }}
12
   project: {{ .Values.spec.project }}
12
   project: {{ .Values.spec.project }}
13
   syncPolicy:
13
   syncPolicy:
17
     syncOptions:
17
     syncOptions:
18
       - CreateNamespace=true
18
       - CreateNamespace=true
19
   source:
19
   source:
20
-    repoURL: 'https://dl.gitea.io/charts'
21
-    targetRevision: 5.0.1
22
-    chart: gitea
20
+    repoURL: "https://dl.gitea.io/charts"
21
+    targetRevision: "5.0.1"
22
+    chart: "gitea"
23
     helm:
23
     helm:
24
-      version: v3
25
-      releaseName: gitea
24
+      version: "v3"
25
+      releaseName: "gitea"
26
       values: |
26
       values: |
27
         ingress:
27
         ingress:
28
-          enabled: true
28
+          enabled: "true"
29
           annotations:
29
           annotations:
30
             cert-manager.io/cluster-issuer: "letsencrypt-prod"
30
             cert-manager.io/cluster-issuer: "letsencrypt-prod"
31
           hosts:
31
           hosts:
32
             - host: "newgit.kaisers.info"
32
             - host: "newgit.kaisers.info"
33
               paths:
33
               paths:
34
-                - path: /
34
+                - path: "/""
35
                   pathType: "Prefix"
35
                   pathType: "Prefix"
36
           tls:
36
           tls:
37
             - secretName: "newgit-kaisers-info-tls"
37
             - secretName: "newgit-kaisers-info-tls"
41
         service:
41
         service:
42
           http:
42
           http:
43
             type: "ClusterIP"
43
             type: "ClusterIP"
44
-            port: 3000
44
+            port: "3000"
45
             clusterIP:
45
             clusterIP:
46
           ssh:
46
           ssh:
47
             type: "ClusterIP"
47
             type: "ClusterIP"
48
-            port: 22
48
+            port: "22"
49
             clusterIP:
49
             clusterIP:

+ 3
- 3
gitops-kaisers-info/templates/namespaces.yaml Просмотреть файл

8
 apiVersion: v1
8
 apiVersion: v1
9
 kind: Namespace
9
 kind: Namespace
10
 metadata:
10
 metadata:
11
-  name: gitea
11
+  name: "gitea"
12
   annotations:
12
   annotations:
13
     argocd.argoproj.io/sync-wave: "-1"
13
     argocd.argoproj.io/sync-wave: "-1"
14
 ---
14
 ---
15
 apiVersion: v1
15
 apiVersion: v1
16
 kind: Namespace
16
 kind: Namespace
17
 metadata:
17
 metadata:
18
-  name: crossplane-system
18
+  name: "crossplane-system"
19
   annotations:
19
   annotations:
20
     argocd.argoproj.io/sync-wave: "-1"
20
     argocd.argoproj.io/sync-wave: "-1"
21
 ---
21
 ---
22
 apiVersion: v1
22
 apiVersion: v1
23
 kind: Namespace
23
 kind: Namespace
24
 metadata:
24
 metadata:
25
-  name: cert-manager
25
+  name: "cert-manager"
26
   annotations:
26
   annotations:
27
     argocd.argoproj.io/sync-wave: "-1"
27
     argocd.argoproj.io/sync-wave: "-1"

+ 6
- 6
services-kaisers-info/templates/authentik.yaml Просмотреть файл

1
 apiVersion: argoproj.io/v1alpha1
1
 apiVersion: argoproj.io/v1alpha1
2
 kind: Application
2
 kind: Application
3
 metadata:
3
 metadata:
4
-  name: authentik
4
+  name: "authentik"
5
   namespace: {{ .Values.spec.namespace }}
5
   namespace: {{ .Values.spec.namespace }}
6
   finalizers:
6
   finalizers:
7
   - resources-finalizer.argocd.argoproj.io
7
   - resources-finalizer.argocd.argoproj.io
8
 spec:
8
 spec:
9
   destination:
9
   destination:
10
-    namespace: authentik
10
+    namespace: "authentik"
11
     name: {{ .Values.spec.destination.name }}
11
     name: {{ .Values.spec.destination.name }}
12
   project: {{ .Values.spec.project }}
12
   project: {{ .Values.spec.project }}
13
   syncPolicy:
13
   syncPolicy:
15
       prune: true
15
       prune: true
16
       selfHeal: true
16
       selfHeal: true
17
   source:
17
   source:
18
-    chart: authentik
19
-    repoURL: https://charts.goauthentik.io
20
-    targetRevision: 5.2.1
18
+    chart: "authentik"
19
+    repoURL: "https://charts.goauthentik.io"
20
+    targetRevision: "5.2.1"
21
     helm:
21
     helm:
22
-      releaseName: authentik
22
+      releaseName: "authentik"
23
       values: |
23
       values: |
24
         authentik:
24
         authentik:
25
           secret_key: "qlfgmSJ8GT/EoE3JsphrM81KzyYqoDYif7u59m/sVL4EQ6MO"
25
           secret_key: "qlfgmSJ8GT/EoE3JsphrM81KzyYqoDYif7u59m/sVL4EQ6MO"

+ 1
- 1
services-kaisers-info/templates/namespaces.yaml Просмотреть файл

1
 apiVersion: v1
1
 apiVersion: v1
2
 kind: Namespace
2
 kind: Namespace
3
 metadata:
3
 metadata:
4
-  name: authentik
4
+  name: "authentik"
5
   annotations:
5
   annotations:
6
     argocd.argoproj.io/sync-wave: "-1"
6
     argocd.argoproj.io/sync-wave: "-1"