refactor: merge configs

apps/cicd/teamcity/app/helmrelease.yaml

@@ -5,6 +5,7 @@ metadata:
   name: teamcity
 spec:
   interval: 60m
+  timeout: 30m
 
   maxHistory: 2
   driftDetection:
@@ -13,7 +14,7 @@ spec:
   chart:
     spec:
       chart: teamcity
-      version: 0.7.4
+      version: 0.8.0
       sourceRef:
         kind: HelmRepository
         name: sergelogvinov
@@ -32,3 +33,31 @@ spec:
     - kind: Secret
       name: teamcity-helm-values
       optional: true
+
+  values:
+    server:
+      resources:
+        limits:
+          cpu: 2
+          memory: 4Gi
+        requests:
+          cpu: 500m
+          memory: 2Gi
+
+    agent:
+      resources:
+        limits:
+          cpu: 2
+          memory: 1Gi
+        requests:
+          cpu: 500m
+          memory: 512Mi
+
+    dind:
+      resources:
+        limits:
+          cpu: 2
+          memory: 16Gi
+        requests:
+          cpu: 500m
+          memory: 2Gi

apps/cicd/teamcity/app/kustomization.yaml

@@ -6,7 +6,3 @@ generatorOptions:
   disableNameSuffixHash: true
 resources:
   - ./helmrelease.yaml
-configMapGenerator:
-  - name: teamcity-helm-values
-    files:
-      - values.yaml=./helmvalues.yaml

apps/cicd/teamcity/fluxcd.yaml

@@ -6,14 +6,11 @@ metadata:
   namespace: flux-system
 spec:
   targetNamespace: cicd
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
   path: ./apps/cicd/teamcity/app
   prune: true
   sourceRef:
     kind: GitRepository
     name: gitops-clusters
-  wait: true
+  wait: false
   interval: 30m
   retryInterval: 5m

apps/cicd/teamcity/kustomization.yaml

@@ -4,4 +4,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./fluxcd.yaml
-  # - ./namespace.yaml