support singleNamespace option

Author: ATGardner

charts/gitops-runtime/Chart.yaml

@@ -31,14 +31,15 @@ dependencies:
 - name: sealed-secrets
   repository: https://bitnami-labs.github.io/sealed-secrets/
   version: 2.16.1
+  condition: sealed-secrets.enabled
 - name: codefresh-tunnel-client
   repository: oci://quay.io/codefresh/charts
   version: 0.1.18
   alias: tunnel-client
   condition: tunnel-client.enabled
 - name: codefresh-gitops-operator
-  repository: oci://quay.io/codefresh/charts
-  version: 0.3.12
+  repository: oci://quay.io/codefresh/charts/dev
+  version: 0.0.0-feat-cr-24670-namespaced-install
   alias: gitops-operator
   condition: gitops-operator.enabled
 - name: garage

charts/gitops-runtime/templates/_helpers.tpl

@@ -242,10 +242,13 @@ Output comma separated list of installed runtime components
 {{- define "codefresh-gitops-runtime.component-list"}}
   {{- $argoCD := dict "name" "argocd" "version" (get .Subcharts "argo-cd").Chart.AppVersion }}
   {{- $argoEvents := dict "name" "argo-events" "version" (get .Subcharts "argo-events").Chart.AppVersion }}
-  {{- $sealedSecrets := dict "name" "sealed-secrets" "version" (get .Subcharts "sealed-secrets").Chart.AppVersion }}
   {{- $internalRouter := dict "name" "internal-router" "version" .Chart.AppVersion }}
   {{- $appProxy := dict "name" "app-proxy" "version" (index (get .Values "app-proxy") "image" "tag") }}
-  {{- $comptList := list $argoCD $argoEvents $appProxy $sealedSecrets $internalRouter}}
+  {{- $comptList := list $argoCD $argoEvents $appProxy $internalRouter}}
+  {{- if index (get .Values "sealed-secrets") "enabled" }}
+    {{- $sealedSecrets := dict "name" "sealed-secrets" "version" (get .Subcharts "sealed-secrets").Chart.AppVersion }}
+    {{- $comptList = append $comptList $sealedSecrets }}
+  {{- end }}
   {{- if index (get .Values "argo-rollouts") "enabled" }}
     {{- $rolloutReporter := dict "name" "rollout-reporter" "version" .Chart.AppVersion }}
     {{- $argoRollouts := dict "name" "argo-rollouts" "version" (get .Subcharts "argo-rollouts").Chart.AppVersion }}

charts/gitops-runtime/templates/app-proxy/workflows-crb.yaml

@@ -4,15 +4,18 @@
 {{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
 {{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
+kind: {{ $appProxyContext.Values.singleNamespace | ternary "RoleBinding" "ClusterRoleBinding" }}
 metadata:
   name: cap-app-proxy-argo-workflows
+  {{- if $appProxyContext.Values.singleNamespace }}
+  namespace: {{ .Release.Namespace }}
+  {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
+  kind: {{ $appProxyContext.Values.singleNamespace | ternary "Role" "ClusterRole" }}
   name: {{ include "codefresh-gitops-runtime.argo-workflows.server.name" . }}
 subjects:
   - kind: ServiceAccount
     name: {{ include "cap-app-proxy.serviceAccountName" $appProxyContext }}
     namespace: {{ .Release.Namespace }}
-{{- end }}
+{{- end }}

charts/gitops-runtime/templates/gitops-operator.yaml

@@ -1,4 +1,4 @@
-{{- if index (get .Values "gitops-operator") "libraryMode" }}
+{{- if and (index (get .Values "gitops-operator") "libraryMode") (index (get .Values "gitops-operator") "enabled") }}
   {{- $gitopsOperatorContext := (index .Subcharts "gitops-operator")}}
   {{- $argoCDImageDict := index .Subcharts "argo-cd" "Values" "global" "image" }}
   {{- if not $argoCDImageDict.tag }}

charts/gitops-runtime/values.yaml

@@ -124,6 +124,7 @@ installer:
 # Sealed secrets
 # -----------------------------------------------------------------------------------------------------------------------
 sealed-secrets:
+  enabled: true
   fullnameOverride: sealed-secrets-controller
   keyrenewperiod: "720h"
   image:
@@ -383,6 +384,7 @@ tunnel-client:
 #-----------------------------------------------------------------------------------------------------------------------
 app-proxy:
   replicaCount: 1
+  singleNamespace: false
   # -- Image enrichment process configuration
   image-enrichment:
     # -- Enable or disable enrichment process. Please note that for enrichemnt, argo-workflows has to be enabled as well.
@@ -562,11 +564,12 @@ gitops-operator:
     # -- Additional labels for gitops operator CRDs
     additionalLabels: {}
 
+  singleNamespace: false
   env: {}
-  image: {}
-    # -- defaults
-    # repository: quay.io/codefresh/codefresh-gitops-operator
-    # tag: 'v{{ .Chart.AppVersion }}'
+  image:
+  # -- defaults
+  # repository: quay.io/codefresh/codefresh-gitops-operator
+    tag: feat-cr-24670-namespaced-install-cdc9a73
 
   serviceAccount:
     create: true