From 4669ee272fa44327cf7641e8a19abe5d34d3395e Mon Sep 17 00:00:00 2001 From: iam-veeramalla Date: Fri, 8 Mar 2024 13:58:15 +0530 Subject: [PATCH] fix: missing fields in the api Signed-off-by: iam-veeramalla --- ...gitops-operator.clusterserviceversion.yaml | 11 +++++- .../samples/argoproj.io_v1beta1_argocd.yaml | 38 +++++++++++++------ 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index a64b585c6..42045ae64 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -61,7 +61,7 @@ metadata: "apiVersion": "argoproj.io/v1beta1", "kind": "ArgoCD", "metadata": { - "name": "argocd-sample" + "name": "argocd" }, "spec": { "controller": { @@ -89,6 +89,11 @@ metadata: } } }, + "rbac": { + "defaultPolicy": "", + "policy": "g, system:cluster-admins, role:admin\n", + "scopes": "[groups]" + }, "redis": { "resources": { "limits": { @@ -105,7 +110,7 @@ metadata: "resources": { "limits": { "cpu": "1000m", - "memory": "512Mi" + "memory": "1024Mi" }, "requests": { "cpu": "250m", @@ -113,6 +118,7 @@ metadata: } } }, + "resourceExclusions": "- apiGroups:\n - tekton.dev\n clusters:\n - '*'\n kinds:\n - TaskRun\n - PipelineRun \n", "server": { "resources": { "limits": { @@ -130,6 +136,7 @@ metadata: }, "sso": { "dex": { + "openShiftOAuth": true, "resources": { "limits": { "cpu": "500m", diff --git a/config/samples/argoproj.io_v1beta1_argocd.yaml b/config/samples/argoproj.io_v1beta1_argocd.yaml index cc02629c4..986e61960 100644 --- a/config/samples/argoproj.io_v1beta1_argocd.yaml +++ b/config/samples/argoproj.io_v1beta1_argocd.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1beta1 kind: ArgoCD metadata: - name: argocd-sample + name: argocd spec: server: resources: @@ -17,10 +17,21 @@ spec: resources: limits: cpu: 1000m - memory: 512Mi + memory: 1024Mi requests: cpu: 250m memory: 256Mi + sso: + provider: dex + dex: + openShiftOAuth: true + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 250m + memory: 128Mi ha: enabled: false resources: @@ -30,6 +41,11 @@ spec: requests: cpu: 250m memory: 128Mi + rbac: + defaultPolicy: '' + policy: | + g, system:cluster-admins, role:admin + scopes: '[groups]' redis: resources: limits: @@ -38,16 +54,14 @@ spec: requests: cpu: 250m memory: 128Mi - sso: - provider: dex - dex: - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi + resourceExclusions: | + - apiGroups: + - tekton.dev + clusters: + - '*' + kinds: + - TaskRun + - PipelineRun controller: resources: limits: