Using TENANT settings variables

README.md

@@ -4,5 +4,4 @@
 
 * [Get me to my Namespace](https://console-openshift-console.apps.${CLUSTER_NAME}.kvant.cloud/k8s/cluster/projects/${REPO_NAME}-ns)
 * [WIKI](https://git.kvant.cloud/phoenix/tenant-tpl/wiki/Tenant--Wiki)
-* [Monitoring](XXXXX)
 

echo-server/app/helmrelease.yaml

@@ -5,7 +5,7 @@ kind: HelmRelease
 metadata:
   name: &app echo-server
 spec:
-  serviceAccountName: ${REPO_NAME}-sa
+  serviceAccountName: ${TECHNICAL_ACCOUNT}
   interval: 30m
   chart:
     spec:
@@ -14,7 +14,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: bjw-s
-        namespace: ${REPO_NAME}-ns
+        namespace: ${TENANT_NAMESPACE}
   install:
     remediation:
       retries: 3

echo-server/ks.yaml

@@ -4,15 +4,15 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: &app echo-server
-  namespace: ${REPO_NAME}-ns
+  namespace: ${TENANT_NAMESPACE}-ns
 spec:
-  targetNamespace: ${REPO_NAME}-ns
+  targetNamespace: ${TENANT_NAMESPACE}-ns
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
   path: ./echo-server/app
   prune: true
-  serviceAccountName: ${REPO_NAME}-sa
+  serviceAccountName: ${TENANT_NAMESPACE}-sa
   sourceRef:
     kind: GitRepository
     name: tenant-repos

kustomization.yaml

@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - echo-server/ks.yaml
-  - repos/
+  - repos/ks.yaml

repos/helm/bjw-s.yaml

@@ -4,7 +4,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: bjw-s
-  namespace: ${REPO_NAME}-ns
+  namespace: ${TENANT_NAMESPACE}-ns
 spec:
   type: oci
   interval: 5m

repos/ks.yaml

@@ -0,0 +1,22 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app repos-sync
+  namespace: ${TENANT_NAMESPACE}-ns
+spec:
+  targetNamespace: ${TENANT_NAMESPACE}-ns
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  path: ./repos/helm
+  prune: true
+  serviceAccountName: ${TENANT_NAMESPACE}-sa
+  sourceRef:
+    kind: GitRepository
+    name: tenant-repos
+  wait: false
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m

repos/kustomization.yaml

@@ -1,7 +1 @@
----
-# yaml-language-server: $schema=https://json.schemastore.org/kustomization
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./helm