separate application controller roles into a separate manifests direc…

…tory (argoproj#16884) Signed-off-by: ishitasequeira <[email protected]>
fengshunli · Jan 22, 2024 · c29f6da · c29f6da
1 parent f7236d7
commit c29f6da
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 9 deletions.
diff --git a/manifests/base/application-controller-deployment/argocd-application-controller-service.yaml b/manifests/base/application-controller-deployment/argocd-application-controller-service.yaml
@@ -14,7 +14,7 @@ spec:
     targetPort: 8082
   - name: metrics
     protocol: TCP
-    port: 8084
-    targetPort: 8084
+    port: 8082
+    targetPort: 8082
   selector:
     app.kubernetes.io/name: argocd-application-controller
diff --git a/...sts/base/application-controller-deployment/argocd-application-controller-statefulset.yaml b/...sts/base/application-controller-deployment/argocd-application-controller-statefulset.yaml
@@ -0,0 +1,15 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: argocd-application-controller
+spec:
+  replicas: 0
+  template:
+    spec:
+      containers:
+      - name: argocd-application-controller
+        args:
+        - /usr/local/bin/argocd-application-controller
+        env:
+        - name: ARGOCD_CONTROLLER_REPLICAS
+          value: "0"
diff --git a/manifests/base/application-controller-deployment/kustomization.yaml b/manifests/base/application-controller-deployment/kustomization.yaml
@@ -2,5 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+- ../application-controller-roles
 - argocd-application-controller-service.yaml
+- argocd-application-controller-statefulset.yaml
 - argocd-application-controller-deployment.yaml
+
diff --git a/...r/argocd-application-controller-role.yaml → ...s/argocd-application-controller-role.yaml b/...r/argocd-application-controller-role.yaml → ...s/argocd-application-controller-role.yaml
diff --git a/...d-application-controller-rolebinding.yaml → ...d-application-controller-rolebinding.yaml b/...d-application-controller-rolebinding.yaml → ...d-application-controller-rolebinding.yaml
diff --git a/...ler/argocd-application-controller-sa.yaml → ...les/argocd-application-controller-sa.yaml b/...ler/argocd-application-controller-sa.yaml → ...les/argocd-application-controller-sa.yaml
diff --git a/manifests/base/application-controller-roles/kustomization.yaml b/manifests/base/application-controller-roles/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- argocd-application-controller-sa.yaml
+- argocd-application-controller-role.yaml
+- argocd-application-controller-rolebinding.yaml
diff --git a/manifests/base/application-controller/kustomization.yaml b/manifests/base/application-controller/kustomization.yaml
@@ -2,9 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- argocd-application-controller-sa.yaml
-- argocd-application-controller-role.yaml
-- argocd-application-controller-rolebinding.yaml
+- ../application-controller-roles
 - argocd-application-controller-statefulset.yaml
 - argocd-metrics.yaml
 - argocd-application-controller-network-policy.yaml
diff --git a/manifests/ha/base/controller-deployment/kustomization.yaml b/manifests/ha/base/controller-deployment/kustomization.yaml
@@ -1,20 +1,17 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-
 patches:
+- path: argocd-application-controller-statefulset.yaml
 - path: argocd-repo-server-deployment.yaml
 - path: argocd-server-deployment.yaml
-- path: argocd-application-controller-statefulset.yaml
 - path: argocd-cmd-params-cm.yaml
 
-
 images:
 - name: quay.io/argoproj/argocd
   newName: quay.io/argoproj/argocd
   newTag: latest
 resources:
-- ../../../base/application-controller
 - ../../../base/application-controller-deployment
 - ../../../base/applicationset-controller
 - ../../../base/dex