Skip to content

Commit

Permalink
fix: [CDS-88838]: Fix Cluster Roles for Argo CD (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
mankrit-singh authored Jan 19, 2024
1 parent 11c82d9 commit b5a194e
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 5 deletions.
19 changes: 19 additions & 0 deletions templates/argocd-application-controller/clusterrole.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{{- if .Values.harness.createClusterRoles }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "argo-cd.controller.fullname" . }}-{{ .Release.Namespace }}
labels:
{{- include "harness.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
rules:
- apiGroups:
- '*'
resources:
- '*'
verbs:
- '*'
- nonResourceURLs:
- '*'
verbs:
- '*'
{{- end }}
16 changes: 16 additions & 0 deletions templates/argocd-application-controller/clusterrolebinding.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{{- if .Values.harness.createClusterRoles }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "argo-cd.controller.fullname" . }}-{{ .Release.Namespace }}
labels:
{{- include "harness.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ include "argo-cd.controller.fullname" . }}-{{ .Release.Namespace }}
subjects:
- kind: ServiceAccount
name: {{ include "argo-cd.controllerServiceAccountName" . }}
namespace: {{ .Release.Namespace }}
{{- end }}
19 changes: 19 additions & 0 deletions templates/argocd-repo-server/clusterrole.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{{- if .Values.harness.createClusterRoles }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "argo-cd.repoServer.fullname" . }}-{{ .Release.Namespace }}
labels:
{{- include "harness.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
rules:
- apiGroups:
- '*'
resources:
- '*'
verbs:
- '*'
- nonResourceURLs:
- '*'
verbs:
- '*'
{{- end }}
16 changes: 16 additions & 0 deletions templates/argocd-repo-server/clusterrolebinding.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{{- if .Values.harness.createClusterRoles }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "argo-cd.repoServer.fullname" . }}-{{ .Release.Namespace }}
labels:
{{- include "harness.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ include "argo-cd.repoServer.fullname" . }}-{{ .Release.Namespace }}
subjects:
- kind: ServiceAccount
name: {{ include "argo-cd.repoServerServiceAccountName" . }}
namespace: {{ .Release.Namespace }}
{{- end }}
2 changes: 1 addition & 1 deletion templates/gitops-agent/clusterrole.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- $argo := (index .Values "argo-cd") -}}
{{- if .Values.agent.createClusterRole }}
{{- if .Values.harness.createClusterRoles }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down
2 changes: 1 addition & 1 deletion templates/gitops-agent/clusterrolebinding.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.agent.createClusterRole }}
{{- if .Values.harness.createClusterRoles }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand Down
13 changes: 10 additions & 3 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ argo-cd:
# -- String to fully override `"argo-cd.fullname"`
fullnameOverride: argocd

# -- These are added as custom templates in each component
createClusterRoles: false

## Argo Configs
configs:
# General Argo CD configuration
Expand Down Expand Up @@ -188,6 +191,9 @@ harness:
enabled: false
secret: ""

# -- Create cluster role for Argo CD and GitOps agent, required for in-cluster
createClusterRoles: true

# Default Harness network policy rules used by all components
networkPolicy:
# -- Create NetworkPolicy objects for all components
Expand All @@ -212,9 +218,6 @@ agent:
# -- GitOps Agent identifier name
harnessName: gitops-agent

# -- Create cluster role for the agent, required for in-cluster
createClusterRole: true

# -- The number of agent pods to run
replicas: 1

Expand Down Expand Up @@ -496,12 +499,16 @@ global:

repoServer:
name: repo-server
serviceAccount:
create: true

applicationSet:
name: applicationset-controller

controller:
name: application-controller
serviceAccount:
create: true

redis:
name: redis

0 comments on commit b5a194e

Please sign in to comment.