feat(helmchart): optimize HelmChartConfig

flux/infrastructure/infra-data/post/databases.yaml

@@ -0,0 +1,43 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: cnpg17-cluster-sh-gitea
+  namespace: infra-data
+spec:
+  name: gitea
+  owner: app
+  cluster:
+    name: cnpg17-cluster-sh
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: cnpg17-cluster-sh-grafana
+  namespace: infra-data
+spec:
+  name: grafana
+  owner: app
+  cluster:
+    name: cnpg17-cluster-sh
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: cnpg17-cluster-hk-halo
+  namespace: infra-data
+spec:
+  name: halo
+  owner: app
+  cluster:
+    name: cnpg17-cluster-hk
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: cnpg17-cluster-hk-crowdsec
+  namespace: infra-data
+spec:
+  name: crowdsec
+  owner: app
+  cluster:
+    name: cnpg17-cluster-hk

flux/infrastructure/infra-data/post/kustomization.yaml

@@ -4,6 +4,7 @@ resources:
   - cnpg17-objectstore-hw.yaml
   - cnpg17-cluster-hk.yaml
   - cnpg17-cluster-sh.yaml
+  - databases.yaml
   - loadbalancer-hk.yaml
   - loadbalancer-sh.yaml
   - reflector-secret-annotations.yaml

flux/infrastructure/infra-gitops/kustomization.yaml

@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - helmrelease-gitea.yaml
-  - helmrelease-gitea-actions.yaml
   - configmap-templates.yaml
   - configmap-actions-dind.yaml
   - ingress-static-gitea.yaml

flux/infrastructure/infra-gitops/post/helmchartconfig-flux-web.yaml

@@ -0,0 +1,27 @@
+apiVersion: helm.cattle.io/v1
+kind: HelmChartConfig
+metadata:
+  name: flux-operator
+  namespace: infra-gitops
+spec:
+  valuesContent: |-
+    web:
+      config:
+        baseURL: https://cd.dev.cm
+        authentication:
+          type: OAuth2
+          oauth2:
+            provider: OIDC
+            issuerURL: https://git.dev.cm
+            clientID: "${FLUX_WEB_OIDC_CLIENT_ID}"
+            clientSecret: "${FLUX_WEB_OIDC_CLIENT_SECRET}"
+      networkPolicy:
+        create: false
+      ingress:
+        enabled: true
+        className: nginx
+        hosts:
+          - host: cd.dev.cm
+            paths:
+              - path: /
+                pathType: Prefix

flux/infrastructure/infra-gitops/post/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - helmrelease-gitea-actions.yaml
+  - helmchartconfig-flux-web.yaml

flux/infrastructure/infra-monitor/kustomization.yaml

@@ -3,6 +3,5 @@ kind: Kustomization
 resources:
   - namespace.yaml
   - helmrelease-loki.yaml
-  - helmrelease-promtail.yaml
   - helmrelease-prometheus.yaml
   - ingress-static-grafana.yaml

flux/infrastructure/infra-monitor/post/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - helmrelease-promtail.yaml