From 44584a7adace8e20e204cb9850987908e584878d Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@zohomail.com>
Date: Sun, 26 Feb 2023 17:38:07 +0000
Subject: [PATCH] Update settings dor ArgoCD (#20)

Reviewed-on: https://git.badhouseplants.net/badhouseplants/k8s-cluster-config/pulls/20
---
 badhouseplants/values/values.argocd.yaml |  4 +++
 badhouseplants/values/values.gitea.yaml  | 39 ++++++++++++++++++++++++
 common/values.ns.yaml                    |  8 +++++
 environments.yaml                        |  2 +-
 releases.yaml                            | 34 ++++++++++++++++++---
 repositories.yaml                        |  3 +-
 6 files changed, 84 insertions(+), 6 deletions(-)
 create mode 100644 common/values.ns.yaml

diff --git a/badhouseplants/values/values.argocd.yaml b/badhouseplants/values/values.argocd.yaml
index 3634111..8f6e277 100644
--- a/badhouseplants/values/values.argocd.yaml
+++ b/badhouseplants/values/values.argocd.yaml
@@ -49,10 +49,14 @@ server:
     policy.csv: |
       g, allanger@zohomail.com, role:admin
       g, rodion.n.rodionov@gmail.com, role:admin
+      p, drone, applications, get, */*,allow
+      p, drone, applications, sync, */*,allow
   config:
     exec.enabled: "true"
     url: https://argo.badhouseplants.net
     kustomize.buildOptions: "--enable-alpha-plugins"
+    accounts.drone: apiKey, login
+    accounts.drone.enabled: "true"
 
   extraArgs:
     - --insecure
diff --git a/badhouseplants/values/values.gitea.yaml b/badhouseplants/values/values.gitea.yaml
index 5687bab..8f8d15a 100644
--- a/badhouseplants/values/values.gitea.yaml
+++ b/badhouseplants/values/values.gitea.yaml
@@ -1,5 +1,39 @@
+ns:
+  enabled: true
+  name: gitea-service
+istio:
+  enabled: true
+  istio: 
+    - name: gitea-http
+      gateway: badhouseplants-net
+      hostname: git.badhouseplants.net
+      service: gitea-http
+      port: 3000
+  templates:
+    - |
+        {{ range .Values.istio }}
+        apiVersion: networking.istio.io/v1beta1
+        kind: VirtualService
+        metadata:
+          name: {{ .name }}
+        spec:
+          gateways:
+          - "istio-system/{{ .gateway }}"
+          hosts:
+          -  {{ .hostname }}
+          http:
+          - match:
+            - uri:
+                prefix: /
+            route:
+            - destination:
+                host: {{ .service }}
+                port:
+                  number: {{ .port }}
+        {{ end }}
 replicaCount: 1
 clusterDomain: cluster.local
+
 resources:
   limits:
     cpu: 300m
@@ -7,6 +41,7 @@ resources:
   requests:
     cpu: 100m
     memory: 128Mi
+
 persistence:
   enabled: true
   size: 10Gi
@@ -14,10 +49,12 @@ persistence:
     - ReadWriteOnce
   labels: {}
   annotations: {}
+
 memcached:
   enabled: true
   service:
     port: 11211
+
 postgresql:
   auth: 
     postgresPassword: check
@@ -27,8 +64,10 @@ postgresql:
       servicePort: 5432
   persistence:
     size: 10Gi
+
 ingress:
   enabled: false
+
 gitea:
   config:
     APP_NAME: Bad Houseplants Gitea
diff --git a/common/values.ns.yaml b/common/values.ns.yaml
new file mode 100644
index 0000000..02caabf
--- /dev/null
+++ b/common/values.ns.yaml
@@ -0,0 +1,8 @@
+ns:
+  templates:
+    - |
+        apiVersion: v1
+        kind: Namespace
+        metadata:
+          name: {{ .Values.name }}
+
diff --git a/environments.yaml b/environments.yaml
index bbecb66..40b9a9b 100644
--- a/environments.yaml
+++ b/environments.yaml
@@ -1,5 +1,5 @@
 environments:
   badhouseplants:
-    kubeContext: allanger@badhouseplants-microk8s
+    #    kubeContext: allanger@badhouseplants-microk8s
   etersoft:
     kubeContext: allanger@etersoft
diff --git a/releases.yaml b/releases.yaml
index b543ec7..3819476 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -1,5 +1,8 @@
 ---
 templates:
+  # ---------------------------
+  # -- Hooks
+  # ---------------------------
   crd-management-hook:
     hooks: 
       - events: ["preapply"]
@@ -20,6 +23,12 @@ templates:
         args: 
           - -c 
           - "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl delete -f -"
+  # ----------------------------
+  # -- Configs
+  # ----------------------------
+  default-common-values: 
+    values: 
+      - "{{ requiredEnv \"PWD\" }}/commmon/values.{{ .Release.Name }}.yaml"
   default-env-values: 
     values: 
       - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
@@ -27,6 +36,21 @@ templates:
     secrets: 
       - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml"
   # ----------------------------
+  # -- Extensions
+  # ----------------------------
+  istio-resource:
+    dependencies:
+      - chart: bedag/raw
+        version: 2.0.0
+        alias: istio
+  namespace:
+    dependencies: 
+      - chart: bedag/raw
+        version: 2.0.0
+        alias: ns
+    values:
+      - "{{ requiredEnv \"PWD\" }}/common/values.ns.yaml"
+  # ----------------------------
   # -- Releases
   # ----------------------------
   # -- System
@@ -62,7 +86,9 @@ templates:
   # ----------------------------
   # -- Istio
   # ----------------------------
-  istio-version:
+  istio-common:
+    labels: 
+      bundle: istio
     version: 1.16.1
   
   istio-base: &istio-base
@@ -70,20 +96,20 @@ templates:
     chart: istio/base
     inherit: 
       - template: crd-management-hook
-      - template: istio-version
+      - template: istio-common
 
   istio-gateway: &istio-gateway
     name: istio-ingressgateway
     chart: istio/gateway
     inherit:
-      - template: istio-version
+      - template: istio-common
       - template: default-env-values
 
   istiod: &istiod
     name: istiod
     chart: istio/istiod
     inherit:
-      - template: istio-version
+      - template: istio-common
       - template: default-env-values
   
   # ----------------------------
diff --git a/repositories.yaml b/repositories.yaml
index 1588688..f41d930 100644
--- a/repositories.yaml
+++ b/repositories.yaml
@@ -24,4 +24,5 @@ repositories:
     url: https://ananace.gitlab.io/charts
   - name: argo
     url: https://argoproj.github.io/argo-helm
-
+  - name: bedag
+    url: https://bedag.github.io/helm-charts/