feat(atlantis): adjust global config

tyriis · Feb 16, 2025 · ee7572d · ee7572d
1 parent 3917d19
commit ee7572d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 39 deletions.
diff --git a/kubernetes/talos-flux/apps/atlantis/atlantis/flux-sync.yaml b/kubernetes/talos-flux/apps/atlantis/atlantis/flux-sync.yaml
@@ -2,27 +2,6 @@
 # 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: &appname atlantis-global-config
-  namespace: flux-system
-spec:
-  targetNamespace: atlantis
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *appname
-  path: ./kubernetes/talos-flux/apps/atlantis/global-config
-  sourceRef:
-    kind: GitRepository
-    name: home-ops
-  wait: true
-  prune: true
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
----
-# 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: apps-atlantis
   namespace: flux-system
@@ -69,7 +48,6 @@ spec:
 #     - name: apps-cert-manager
 #     - name: apps-rook-ceph-cluster
 #     - name: apps-traefik-forward-auth
-#     - name: atlantis-global-config
 #   postBuild:
 #     substitute:
 #       APP: *appname
diff --git a/kubernetes/talos-flux/apps/atlantis/global-config/kustomization.yaml b/kubernetes/talos-flux/apps/atlantis/global-config/kustomization.yaml
diff --git a/kubernetes/talos-flux/apps/atlantis/kustomization.yaml b/kubernetes/talos-flux/apps/atlantis/kustomization.yaml
@@ -3,6 +3,17 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./namespace.yaml
+  - namespace.yaml
   - ./atlantis/flux-sync.yaml
   - ./tyriis/flux-sync.yaml
+configMapGenerator:
+  - name: atlantis-default-config
+    files:
+      - repos.yaml=../../../base/apps/atlantis/config/repos.yaml
+  - name: atlantis-default-scripts
+    files:
+      - allow_list.sh=../../../base/apps/atlantis/scripts/allow_list.sh
+generatorOptions:
+  disableNameSuffixHash: true
+  annotations:
+    kustomize.toolkit.fluxcd.io/substitute: disabled
diff --git a/kubernetes/talos-flux/apps/atlantis/tyriis/flux-sync.yaml b/kubernetes/talos-flux/apps/atlantis/tyriis/flux-sync.yaml
@@ -25,7 +25,6 @@ spec:
     - name: apps-cert-manager
     - name: apps-rook-ceph-cluster
     - name: apps-traefik-forward-auth
-    - name: atlantis-global-config
   postBuild:
     substitute:
       APP: *appname