Merge branch 'main' into fix/app-proxy-cors

Author: mikhail-klimko

charts/gitops-runtime/Chart.yaml

@@ -38,3 +38,7 @@ dependencies:
   version: 0.1.22
   alias: tunnel-client
   condition: tunnel-client.enabled
+- name: redis-ha
+  version: 4.33.4
+  repository: https://dandydeveloper.github.io/charts/
+  condition: redis-ha.enabled

charts/gitops-runtime/README.md

@@ -364,4 +364,20 @@ gitops-operator:
     tag: vX.Y.Z
 ```
 
+### To 0.24.x
+
+####  Affected values
+
+- `.Values.redis`/`.Values.redis-ha`/`.Values.redis-secret-init` were added
+
+```yaml
+# Enabled standalone Redis (single Deployment with 1 replica)
+redis:
+  enabled: true
+
+# Enabled Redis High Availability (StatefulSet with Proxy)
+redis-ha:
+  enabled: false
+```
+
 {{ template "chart.valuesSection" . }}

charts/gitops-runtime/README.md.gotmpl

@@ -214,6 +214,13 @@ LEADER_ID:
     fieldRef:
       fieldPath: metadata.name
 {{- end }}
+CACHE_HOST: {{ (splitList ":" (include "codefresh-gitops-runtime.argocd.redis.url" .) | first) }}
+CACHE_PORT: {{ (splitList ":" (include "codefresh-gitops-runtime.argocd.redis.url" .) | last) }}
+CACHE_PASSWORD:
+  valueFrom:
+    secretKeyRef:
+      name: gitops-runtime-redis
+      key: auth
 {{ include "codefresh-gitops-runtime.get-proxy-env-vars" . }}
 {{- end -}}
 

charts/gitops-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml

@@ -306,18 +306,18 @@ Determine argocd server username ConfigMap.
 Determine argocd redis url
 */}}
 {{- define "codefresh-gitops-runtime.argocd.redis.url" -}}
-{{- $argoCDValues := (get .Values "argo-cd") }}
-{{- if (index .Values "argo-cd" "enabled") }}
-  {{- $serviceName := include "codefresh-gitops-runtime.argocd.redis.servicename" . }}
-  {{- $port := include "codefresh-gitops-runtime.argocd.redis.serviceport" . }}
-  {{- printf "%s:%s" $serviceName $port }}
-{{- else if (index .Values "global" "external-argo-cd" "redis") }}
-  {{- $redis := (index .Values "global" "external-argo-cd" "redis") }}
-  {{- $svc := required "ArgoCD is not enabled and .Values.global.external-argo-cd.redis.svc is not set" $redis.svc }}
-  {{- $port := required "ArgoCD is not enabled and .Values.global.external-argo-cd.redis.port is not set" $redis.port }}
-  {{- printf "%s:%v" $svc $port }}
+{{- if and (index .Values "redis-ha" "enabled") (index .Values "redis-ha" "haproxy" "enabled") }}
+  {{- $redisHa := (index .Values "redis-ha") -}}
+  {{- $redisHaContext := dict "Chart" (dict "Name" "redis-ha") "Release" .Release "Values" $redisHa -}}
+  {{- $serverName := printf "%s-haproxy" (include "redis-ha.fullname" $redisHaContext) | trunc 63 | trimSuffix "-" -}}
+  {{- $port := $redisHa.haproxy.servicePort -}}
+  {{- printf "%s:%v" $serverName $port }}
+{{- else if .Values.redis.enabled }}
+  {{- $serviceName := include "redis.fullname" . }}
+  {{- $port := .Values.redis.service.ports.redis.port }}
+  {{- printf "%s:%v" $serviceName $port }}
 {{- else }}
-  {{- fail "ArgoCD is not enabled and .Values.global.external-argo-cd.redis is not set" }}
+  {{- fail "ERROR: .Values.redis or .Values.redis-ha must be enabled!" }}
 {{- end }}
 {{- end}}
 
@@ -516,7 +516,6 @@ NO_PROXY: {{ .Values.global.noProxy | quote }}
 {{- printf "%s" $eventBusName }}
 {{- end }}
 
-
 {{- define "codefresh-gitops-runtime.image.name" -}}
   {{/* Restoring root $ context */}}
   {{- $ := .context -}}

charts/gitops-runtime/templates/_helpers.tpl

@@ -3,6 +3,8 @@
 {{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
 {{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
 {{- $_ := set $appProxyContext.Values "argo-cd" (get .Values "argo-cd") }}
+{{- $_ := set $appProxyContext.Values "redis" (get .Values "redis") }}
+{{- $_ := set $appProxyContext.Values "redis-ha" (get .Values "redis-ha") }}
 
 {{/* Merge environment variables with the ones in _app-proxy-env.yaml */}}
 {{- $mainContainerMergedValues := mergeOverwrite $appProxyContext.Values.env (include "codefresh-gitops-runtime.app-proxy.calculated-env-vars" . | fromYaml) }}

charts/gitops-runtime/templates/app-proxy/deployment.yaml

@@ -63,29 +63,29 @@ LISTEN_ADDRESS:
 REDISDB:
   valueFrom:
     configMapKeyRef:
-      name: argocd-cmd-params-cm
+      name: argo-gateway-cmd-params-cm
       key: redis.db
       optional: true
 REDIS_COMPRESSION:
   valueFrom:
     configMapKeyRef:
-      name: argocd-cmd-params-cm
+      name: argo-gateway-cmd-params-cm
       key: redis.compression
       optional: true
 REDIS_PASSWORD:
   valueFrom:
     secretKeyRef:
-      name: argocd-redis
+      name: gitops-runtime-redis
       key: auth
 REDIS_SERVER:
   valueFrom:
     configMapKeyRef:
-      name: argocd-cmd-params-cm
+      name: argo-gateway-cmd-params-cm
       key: redis.server
 REDIS_USERNAME:
   valueFrom:
     secretKeyRef:
-      name: argocd-redis
+      name: argo-gateway-cmd-params-cm
       key: redis-username
       optional: true
 REPO_SERVER:

charts/gitops-runtime/templates/argo-gateway/_env.yaml

@@ -111,29 +111,29 @@ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:
 REDISDB:
   valueFrom:
     configMapKeyRef:
-      name: argocd-cmd-params-cm
+      name: cluster-event-reporter-cmd-params-cm
       key: redis.db
       optional: true
 REDIS_COMPRESSION:
   valueFrom:
     configMapKeyRef:
-      name: argocd-cmd-params-cm
+      name: cluster-event-reporter-cmd-params-cm
       key: redis.compression
       optional: true
 REDIS_PASSWORD:
   valueFrom:
     secretKeyRef:
-      name: argocd-redis
+      name: gitops-runtime-redis
       key: auth
 REDIS_SERVER:
   valueFrom:
     configMapKeyRef:
-      name: argocd-cmd-params-cm
+      name: cluster-event-reporter-cmd-params-cm
       key: redis.server
 REDIS_USERNAME:
   valueFrom:
     secretKeyRef:
-      name: argocd-redis
+      name: cluster-event-reporter-cmd-params-cm
       key: redis-username
       optional: true
 REPO_SERVER:

charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/_env.yaml

@@ -111,29 +111,29 @@ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:
 REDISDB:
   valueFrom:
     configMapKeyRef:
-      name: argocd-cmd-params-cm
+      name: runtime-event-reporter-cmd-params-cm
       key: redis.db
       optional: true
 REDIS_COMPRESSION:
   valueFrom:
     configMapKeyRef:
-      name: argocd-cmd-params-cm
+      name: runtime-event-reporter-cmd-params-cm
       key: redis.compression
       optional: true
 REDIS_PASSWORD:
   valueFrom:
     secretKeyRef:
-      name: argocd-redis
+      name: gitops-runtime-redis
       key: auth
 REDIS_SERVER:
   valueFrom:
     configMapKeyRef:
-      name: argocd-cmd-params-cm
+      name: runtime-event-reporter-cmd-params-cm
       key: redis.server
 REDIS_USERNAME:
   valueFrom:
     secretKeyRef:
-      name: argocd-redis
+      name: runtime-event-reporter-cmd-params-cm
       key: redis-username
       optional: true
 REPO_SERVER:

charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/_env.yaml

@@ -0,0 +1,37 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: redis-secret-init
+  annotations:
+    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
+    helm.sh/hook-weight: "10"
+spec:
+  backoffLimit: 0
+  ttlSecondsAfterFinished: 300
+  template:
+    spec:
+      serviceAccountName: redis-secret-init
+      restartPolicy: Never
+      containers:
+      - name: redis-secret-init
+        image: {{ include "codefresh-gitops-runtime.image.name" (dict "image" (index .Values "redis-secret-init" "image") "context" .) }}
+        imagePullPolicy: {{ index .Values "redis-secret-init" "image" "pullPolicy" | default "IfNotPresent" }}
+        command: ["sh", "-c"]
+        args:
+        - |
+          PASSWORD=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c16)
+          if kubectl get secret gitops-runtime-redis -o jsonpath="{.data.auth}" &> /dev/null; then
+            echo "Secret gitops-runtime-redis already exists, skipping creation"
+            exit 0
+          fi
+          kubectl create secret generic gitops-runtime-redis --from-literal=auth=$PASSWORD --dry-run=client -o yaml | kubectl apply -f -
+      {{- with (index .Values "redis-secret-init" "nodeSelector") | default .Values.global.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with (index .Values "redis-secret-init" "tolerations") | default .Values.global.tolerations }}
+      tolerations: {{ toYaml . | nindent 6 }}
+      {{- end }}
+      {{- with (index .Values "redis-secret-init" "affinity") }}
+      affinity: {{ toYaml . | nindent 8 }}
+      {{- end }}