Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: separate application controller roles into a separate manifests directory #16884

Merged
merged 2 commits into from
Jan 22, 2024
Merged

chore: separate application controller roles into a separate manifests directory #16884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f73edc4
separate application controller roles into a separate manifests direc…
ishitasequeira Jan 16, 2024
94b5f98
Merge branch 'master' of github.com:argoproj/argo-cd into separate-ap…
ishitasequeira Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/base/application-controller-deployment/argocd-application-controller-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
targetPort: 8082
- name: metrics
protocol: TCP
port: 8084
targetPort: 8084
port: 8082
leoluz marked this conversation as resolved.
Show resolved Hide resolved
targetPort: 8082
selector:
app.kubernetes.io/name: argocd-application-controller
15 changes: 15 additions & 0 deletions ...sts/base/application-controller-deployment/argocd-application-controller-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 3 additions & 0 deletions manifests/base/application-controller-deployment/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
leoluz marked this conversation as resolved.
Show resolved Hide resolved
- argocd-application-controller-deployment.yaml

0 ...r/argocd-application-controller-role.yaml → ...s/argocd-application-controller-role.yaml
View file
Open in desktop
File renamed without changes.
0 ...d-application-controller-rolebinding.yaml → ...d-application-controller-rolebinding.yaml
View file
Open in desktop
File renamed without changes.
0 ...ler/argocd-application-controller-sa.yaml → ...les/argocd-application-controller-sa.yaml
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions manifests/base/application-controller-roles/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions manifests/base/application-controller/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 1 addition & 4 deletions manifests/ha/base/controller-deployment/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading