From ba2e7936b9f506e3df9a5f6274a3fa8e88843751 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 13 Jan 2025 16:42:00 +0300 Subject: [PATCH 01/21] onprem: 2.6.7 --- codefresh/Chart.yaml | 6 +++--- codefresh/README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml index 5b3652eb7..0d75688a2 100644 --- a/codefresh/Chart.yaml +++ b/codefresh/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Helm Chart for Codefresh On-Prem name: codefresh -version: 2.6.6 +version: 2.6.7 keywords: - codefresh home: https://codefresh.io/ @@ -18,8 +18,8 @@ annotations: artifacthub.io/containsSecurityUpdates: "false" # supported kinds are added, changed, deprecated, removed, fixed and security. artifacthub.io/changes: | - - kind: security - description: "Miscellaneous security updates" + - kind: fixed + description: "E2E tests" dependencies: - name: cf-common repository: oci://quay.io/codefresh/charts diff --git a/codefresh/README.md b/codefresh/README.md index 804804d9d..1cfda6d3a 100644 --- a/codefresh/README.md +++ b/codefresh/README.md @@ -1,6 +1,6 @@ ## Codefresh On-Premises -![Version: 2.6.6](https://img.shields.io/badge/Version-2.6.6-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 2.6.7](https://img.shields.io/badge/Version-2.6.7-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes. From 4c9f9393a9b19eab8f3f9af01bb08dc9173c46d0 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 3 Feb 2025 20:03:28 +0300 Subject: [PATCH 02/21] fix: updates for codefresh-dev chart --- codefresh/templates/internal-gateway.yaml | 36 ++++++++++++++--------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/codefresh/templates/internal-gateway.yaml b/codefresh/templates/internal-gateway.yaml index 3848f33ab..16cd8e557 100644 --- a/codefresh/templates/internal-gateway.yaml +++ b/codefresh/templates/internal-gateway.yaml @@ -1,31 +1,39 @@ {{- if index .Values "internal-gateway" "enabled" -}} -{{ $cfApiEndpointsSvc := (index .Subcharts "cfapi" ).Chart.Name }} +{{- if (index .Subchart "cfapi").Values.fullnameoverride }} + {{ $cfApiEndpointsSvc := (index .Subchart "cfapi").Values.fullnameoverride }} +{{- else }} + {{ $cfApiEndpointsSvc := printf "%s-%s" .Release.Name (index .Subcharts "cfapi" ).Chart.Name }} +{{- end }} + {{ $cfApiEndpointsPort := (index .Subcharts "cfapi" ).Values.service.main.ports.http.port }} {{- if index .Values "cfapi-endpoints" "enabled" -}} - {{ $cfApiEndpointsSvc = (index .Subcharts "cfapi-endpoints" ).Chart.Name }} + {{- if (index .Subchart "cfapi").Values.fullnameoverride }} + {{ $cfApiEndpointsSvc := (index .Subchart "cfapi-endpoints").Values.fullnameoverride }} + {{- else }} + {{ $cfApiEndpointsSvc := printf "%s-%s" .Release.Name (index .Subcharts "cfapi" ).Chart.Name }} + {{- end }} {{ $cfApiEndpointsPort = (index .Subcharts "cfapi-endpoints" ).Values.service.main.ports.http.port }} {{- end -}} {{- $internalGatewayContext := (index .Subcharts "internal-gateway") }} - {{- /* If onprem is installed with single-role cf-api mode */}} {{- if and (eq (toString .Values.global.cfapiService) "cfapi") (eq (toString .Values.global.cfapiEndpointsService) "cfapi" ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-auth") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-endpoints") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-environments") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-downloadlogmanager") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-gitops-resource-receiver") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-test-reporting") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetesresourcemonitor") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetes-endpoints") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-admin") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-teams") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-ws") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-auth") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-endpoints") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-environments") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-downloadlogmanager") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-gitops-resource-receiver") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-test-reporting") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetesresourcemonitor") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetes-endpoints") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-admin") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-teams") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-ws") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} {{- end }} From fe9fc2423d90fb6f72138bae3da48b2638428d6f Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 3 Feb 2025 20:31:07 +0300 Subject: [PATCH 03/21] fix: updates for codefresh-dev chart --- codefresh/templates/internal-gateway.yaml | 36 +++++++++-------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/codefresh/templates/internal-gateway.yaml b/codefresh/templates/internal-gateway.yaml index 16cd8e557..3848f33ab 100644 --- a/codefresh/templates/internal-gateway.yaml +++ b/codefresh/templates/internal-gateway.yaml @@ -1,39 +1,31 @@ {{- if index .Values "internal-gateway" "enabled" -}} -{{- if (index .Subchart "cfapi").Values.fullnameoverride }} - {{ $cfApiEndpointsSvc := (index .Subchart "cfapi").Values.fullnameoverride }} -{{- else }} - {{ $cfApiEndpointsSvc := printf "%s-%s" .Release.Name (index .Subcharts "cfapi" ).Chart.Name }} -{{- end }} - +{{ $cfApiEndpointsSvc := (index .Subcharts "cfapi" ).Chart.Name }} {{ $cfApiEndpointsPort := (index .Subcharts "cfapi" ).Values.service.main.ports.http.port }} {{- if index .Values "cfapi-endpoints" "enabled" -}} - {{- if (index .Subchart "cfapi").Values.fullnameoverride }} - {{ $cfApiEndpointsSvc := (index .Subchart "cfapi-endpoints").Values.fullnameoverride }} - {{- else }} - {{ $cfApiEndpointsSvc := printf "%s-%s" .Release.Name (index .Subcharts "cfapi" ).Chart.Name }} - {{- end }} + {{ $cfApiEndpointsSvc = (index .Subcharts "cfapi-endpoints" ).Chart.Name }} {{ $cfApiEndpointsPort = (index .Subcharts "cfapi-endpoints" ).Values.service.main.ports.http.port }} {{- end -}} {{- $internalGatewayContext := (index .Subcharts "internal-gateway") }} + {{- /* If onprem is installed with single-role cf-api mode */}} {{- if and (eq (toString .Values.global.cfapiService) "cfapi") (eq (toString .Values.global.cfapiEndpointsService) "cfapi" ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-auth") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-endpoints") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-environments") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-downloadlogmanager") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-gitops-resource-receiver") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-test-reporting") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetesresourcemonitor") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetes-endpoints") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-admin") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-teams") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-ws") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-auth") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-endpoints") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-environments") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-downloadlogmanager") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-gitops-resource-receiver") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-test-reporting") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetesresourcemonitor") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetes-endpoints") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-admin") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-teams") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-ws") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} {{- end }} From 092ac69fef385c14e38ec567847875386f67d745 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 3 Feb 2025 23:28:08 +0300 Subject: [PATCH 04/21] fix: updates for codefresh-dev chart --- codefresh/templates/internal-gateway.yaml | 30 +++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/codefresh/templates/internal-gateway.yaml b/codefresh/templates/internal-gateway.yaml index 3848f33ab..67a1c5322 100644 --- a/codefresh/templates/internal-gateway.yaml +++ b/codefresh/templates/internal-gateway.yaml @@ -1,31 +1,35 @@ {{- if index .Values "internal-gateway" "enabled" -}} -{{ $cfApiEndpointsSvc := (index .Subcharts "cfapi" ).Chart.Name }} +{{ $cfApiEndpointsSvc := printf "%s-%s" .Release.Name (index .Subcharts "cfapi" ).Chart.Name }} {{ $cfApiEndpointsPort := (index .Subcharts "cfapi" ).Values.service.main.ports.http.port }} {{- if index .Values "cfapi-endpoints" "enabled" -}} - {{ $cfApiEndpointsSvc = (index .Subcharts "cfapi-endpoints" ).Chart.Name }} + {{ $cfApiEndpointsSvc = printf "%s-%s" .Release.Name (index .Subcharts "cfapi-endpoints" ).Chart.Name }} {{ $cfApiEndpointsPort = (index .Subcharts "cfapi-endpoints" ).Values.service.main.ports.http.port }} {{- end -}} {{- $internalGatewayContext := (index .Subcharts "internal-gateway") }} +{{ $cfApiEndpointsSvcFullName := (index .Subcharts "cfapi").Values.fullnameoverride }} +{{- if $cfApiEndpointsSvcFullName }} + {{- $cfApiEndpointsSvc = $cfApiEndpointsSvcFullName }} +{{- end }} {{- /* If onprem is installed with single-role cf-api mode */}} {{- if and (eq (toString .Values.global.cfapiService) "cfapi") (eq (toString .Values.global.cfapiEndpointsService) "cfapi" ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-auth") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-endpoints") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-environments") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-downloadlogmanager") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-gitops-resource-receiver") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-test-reporting") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetesresourcemonitor") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetes-endpoints") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-admin") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-teams") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} -{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-ws") "svc" (printf "%s-%s.%s.svc.%s" .Release.Name $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-auth") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-endpoints") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-environments") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-downloadlogmanager") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-gitops-resource-receiver") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-test-reporting") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetesresourcemonitor") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-kubernetes-endpoints") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-admin") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-teams") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfapi-ws") "svc" (printf "%s.%s.svc.%s" $cfApiEndpointsSvc .Release.Namespace .Values.global.clusterDomain ) }} {{- end }} From f9b8319367881abe0b9e309741f6cb48bde55226 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 3 Feb 2025 23:36:48 +0300 Subject: [PATCH 05/21] fix: updates for codefresh-dev chart --- codefresh/templates/internal-gateway.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh/templates/internal-gateway.yaml b/codefresh/templates/internal-gateway.yaml index 67a1c5322..3d50f3549 100644 --- a/codefresh/templates/internal-gateway.yaml +++ b/codefresh/templates/internal-gateway.yaml @@ -9,7 +9,7 @@ {{- $internalGatewayContext := (index .Subcharts "internal-gateway") }} -{{ $cfApiEndpointsSvcFullName := (index .Subcharts "cfapi").Values.fullnameoverride }} +{{ $cfApiEndpointsSvcFullName := (index .Subcharts "cfapi").Values.fullnameOverride }} {{- if $cfApiEndpointsSvcFullName }} {{- $cfApiEndpointsSvc = $cfApiEndpointsSvcFullName }} {{- end }} From 59357dcac1c6f33a7ec5963d0e4367159258e462 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 3 Feb 2025 23:46:47 +0300 Subject: [PATCH 06/21] fix: updates for codefresh-dev chart --- codefresh/templates/internal-gateway.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/codefresh/templates/internal-gateway.yaml b/codefresh/templates/internal-gateway.yaml index 3d50f3549..6d8940625 100644 --- a/codefresh/templates/internal-gateway.yaml +++ b/codefresh/templates/internal-gateway.yaml @@ -14,6 +14,12 @@ {{- $cfApiEndpointsSvc = $cfApiEndpointsSvcFullName }} {{- end }} +{{ $cfUiSvc := printf "%s-%s" .Release.Name (index .Subcharts "cfui" ).Chart.Name }} +{{- $cfUiSvcFullName := (index .Subcharts "cfui").Values.fullnameOverride }} +{{- if $cfUiSvcFullName }} + {{- $cfUiSvc = $cfUiSvcFullName }} +{{- end }} + {{- /* If onprem is installed with single-role cf-api mode */}} @@ -33,6 +39,8 @@ If onprem is installed with single-role cf-api mode {{- end }} +{{- $_ := set (index $internalGatewayContext.Values.codefresh.serviceEndpoints "cfui") "svc" (printf "%s.%s.svc.%s" $cfUiSvc .Release.Namespace .Values.global.clusterDomain ) }} + {{- include "internal-gateway.resources" $internalGatewayContext }} {{- end -}} From c4684c47a89a3e11ead28c5b1b41917070590e15 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 4 Feb 2025 10:22:59 +0300 Subject: [PATCH 07/21] fix: updates for codefresh-dev chart --- codefresh/templates/ingress.yaml | 7 ++++++- codefresh/templates/internal-gateway.yaml | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/codefresh/templates/ingress.yaml b/codefresh/templates/ingress.yaml index 71630a71e..013976682 100644 --- a/codefresh/templates/ingress.yaml +++ b/codefresh/templates/ingress.yaml @@ -37,10 +37,15 @@ spec: pathType: ImplementationSpecific backend: service: + {{- $fullServiceName := (index $.Subcharts $serviceName).Values.fullnameOverride }} + {{- if $fullServiceName }} + name: {{ $fullServiceName }} + {{- else }} name: {{ printf "%s-%s" $.Release.Name (index $.Subcharts $serviceName ).Chart.Name }} + {{- end }} port: number: {{ (index $.Subcharts $serviceName ).Values.service.main.ports.http.port }} {{- end }} {{- end }} {{- end }} -{{- end}} \ No newline at end of file +{{- end}} diff --git a/codefresh/templates/internal-gateway.yaml b/codefresh/templates/internal-gateway.yaml index 6d8940625..0a4773559 100644 --- a/codefresh/templates/internal-gateway.yaml +++ b/codefresh/templates/internal-gateway.yaml @@ -9,15 +9,15 @@ {{- $internalGatewayContext := (index .Subcharts "internal-gateway") }} -{{ $cfApiEndpointsSvcFullName := (index .Subcharts "cfapi").Values.fullnameOverride }} -{{- if $cfApiEndpointsSvcFullName }} - {{- $cfApiEndpointsSvc = $cfApiEndpointsSvcFullName }} +{{ $fullnameCfApiEndpointsSvc := (index .Subcharts "cfapi").Values.fullnameOverride }} +{{- if $fullnameCfApiEndpointsSvc }} + {{- $cfApiEndpointsSvc = $fullnameCfApiEndpointsSvc }} {{- end }} {{ $cfUiSvc := printf "%s-%s" .Release.Name (index .Subcharts "cfui" ).Chart.Name }} -{{- $cfUiSvcFullName := (index .Subcharts "cfui").Values.fullnameOverride }} -{{- if $cfUiSvcFullName }} - {{- $cfUiSvc = $cfUiSvcFullName }} +{{- $fullnameCfUiSvc := (index .Subcharts "cfui").Values.fullnameOverride }} +{{- if $fullnameCfUiSvc }} + {{- $cfUiSvc = $fullnameCfUiSvc }} {{- end }} {{- /* From ccc752ab91dbfd102d1ec78c96974fb9bcd329f5 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 4 Feb 2025 10:56:15 +0300 Subject: [PATCH 08/21] fix: updates for codefresh-dev chart --- codefresh/templates/ingress.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/codefresh/templates/ingress.yaml b/codefresh/templates/ingress.yaml index 013976682..0c8c7feeb 100644 --- a/codefresh/templates/ingress.yaml +++ b/codefresh/templates/ingress.yaml @@ -21,11 +21,6 @@ spec: - {{ .Values.global.appUrl }} secretName: {{ include "codefresh.ingress.tlsSecretName" . }} {{- end }} - defaultBackend: - service: - name: {{ printf "%s-%s" .Release.Name (index .Subcharts "cfui" ).Chart.Name }} - port: - number: {{ (index .Subcharts "cfui" ).Values.service.main.ports.http.port }} rules: - host: {{ .Values.ingress.domain | default .Values.global.appUrl }} http: From 1f40f180e760ed4befe9a46238e17076f09bec2d Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 4 Feb 2025 11:38:11 +0300 Subject: [PATCH 09/21] fix: updates for codefresh-dev chart --- codefresh/values.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/codefresh/values.yaml b/codefresh/values.yaml index 4ff039d4b..349365c07 100644 --- a/codefresh/values.yaml +++ b/codefresh/values.yaml @@ -122,9 +122,6 @@ ingress: nginx.ingress.kubernetes.io/service-upstream: "true" nginx.ingress.kubernetes.io/ssl-redirect: "false" nginx.org/redirect-to-https: "false" - nginx.ingress.kubernetes.io/configuration-snippet: | - more_set_headers "X-Request-ID: $request_id"; - proxy_set_header X-Request-ID $request_id; # -- Global parameters # @default -- See below From 47c090438424ecb040419ec5bea5525fafa4a114 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 4 Feb 2025 12:02:10 +0300 Subject: [PATCH 10/21] fix: updates for codefresh-dev chart --- codefresh/templates/_helpers.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/codefresh/templates/_helpers.tpl b/codefresh/templates/_helpers.tpl index bbded8dca..b657b6742 100644 --- a/codefresh/templates/_helpers.tpl +++ b/codefresh/templates/_helpers.tpl @@ -66,8 +66,12 @@ Return runtime image (classic runtime) with private registry prefix Return Image Pull Secret */}} {{- define "codefresh.imagePullSecret" }} +{{- if index .Values ".dockerconfigjson" -}} +{{- printf "%s" (index .Values ".dockerconfigjson") }} +{{- else }} {{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.imageCredentials.registry (printf "%s:%s" .Values.imageCredentials.username .Values.imageCredentials.password | b64enc) | b64enc }} {{- end }} +{{- end }} {{/* Return the secret containing TLS certificates for Ingress From 5e02666dd9d292325adbafdc32f3686ea65b3ed5 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 4 Feb 2025 12:57:12 +0300 Subject: [PATCH 11/21] fix: updates for codefresh-dev chart --- codefresh/files/assets/packs.json | 103 +++++++++++++++++++ codefresh/files/mongoSeedJobScript.sh | 17 +++ codefresh/templates/seed/mongo-seed-job.yaml | 5 + codefresh/values.yaml | 2 + 4 files changed, 127 insertions(+) create mode 100644 codefresh/files/assets/packs.json diff --git a/codefresh/files/assets/packs.json b/codefresh/files/assets/packs.json new file mode 100644 index 000000000..01f944315 --- /dev/null +++ b/codefresh/files/assets/packs.json @@ -0,0 +1,103 @@ +[ + { + "workflows": { + "concurrency": { + "amount": 2, + "absorb": 2, + "allowUnlimited": false + } + }, + "runtime": { + "defaultDindResources": { + "requests": { + "cpu": "900m", + "memory": "1024Mi" + } + }, + "name": "system/linux_paying_plan", + "os": "linux", + "architecture": "amd64", + "cpu": "1000m", + "memory": "1024Mi", + "storage": "8G", + "dindStorage": "8G" + }, + "id": "5cd1746617313f468d669013", + "metadata": { + "description": "1 GB RAM 1 CPU", + "name": "small" + } + }, + { + "workflows": { + "concurrency": { + "amount": 2, + "absorb": 2, + "allowUnlimited": false + } + }, + "runtime": { + "defaultDindResources": { + "requests": { + "cpu": "1200m", + "memory": "1500Mi" + } + }, + "name": "system/linux_paying_plan", + "os": "linux", + "architecture": "amd64", + "cpu": "2000m", + "memory": "4096Mi", + "storage": "16G", + "dindStorage": "16G" + }, + "id": "5cd1746717313f468d669014", + "metadata": { + "description": "4 GB RAM 2 CPU", + "name": "medium" + } + }, + { + "workflows": { + "concurrency": { + "amount": 2, + "absorb": 2, + "allowUnlimited": false + } + }, + "runtime": { + "defaultDindResources": { + "requests": { + "cpu": "1500m", + "memory": "3000Mi" + } + }, + "name": "system/linux_paying_plan", + "os": "linux", + "architecture": "amd64", + "cpu": "4000m", + "memory": "8192Mi", + "storage": "32G", + "dindStorage": "32G" + }, + "id": "5cd1746817313f468d669015", + "metadata": { + "description": "8 GB RAM 4 CPU", + "name": "large" + } + }, + { + "workflows": { + "concurrency": { + "amount": -1, + "absorb": 0, + "allowUnlimited": true + } + }, + "id": "5cd1746817313f468d669016", + "metadata": { + "description": "Hybrid runtime-environment", + "name": "runner" + } + } +] diff --git a/codefresh/files/mongoSeedJobScript.sh b/codefresh/files/mongoSeedJobScript.sh index 3bcaf6f98..9f441d217 100644 --- a/codefresh/files/mongoSeedJobScript.sh +++ b/codefresh/files/mongoSeedJobScript.sh @@ -66,6 +66,18 @@ getMongoVersion() { MONOGDB_VERSION=$(mongosh ${MONGODB_ROOT_URI} --eval "db.version()" 2>&1 | tail -n1) } +setSystemAdmin() { + mongosh $MONGO_URI --eval "db.users.update({}, {\$set: {roles: ['User', 'Admin', 'Account Admin']}}, {multi: true})" +} + +setPacks() { + PACKS=$(cat ${ASSETS_PATH}packs.json) + mongosh $MONGO_URI --eval "db.accounts.update({}, {\$set: {'build.packs': ${PACKS} }}, {multi: true})" + + MONGO_URI=${MONGO_URI/\/codefresh/\/payments} + mongosh $MONGO_URI --eval "db.accounts.update({}, {\$set: {'plan.packs': ${PACKS} }}, {multi: true})" +} + parseMongoURI $MONGO_URI disableMongoTelemetry @@ -88,3 +100,8 @@ mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"codefresh\").changeUserPas mongoimport --uri ${MONGO_URI} --collection idps --type json --legacy --file ${ASSETS_PATH}idps.json mongoimport --uri ${MONGO_URI} --collection accounts --type json --legacy --file ${ASSETS_PATH}accounts.json mongoimport --uri ${MONGO_URI} --collection users --type json --legacy --file ${ASSETS_PATH}users.json + +if [[ $DEVELOPMENT_CHART == "true" ]]; then + setSystemAdmin + setPacks +fi diff --git a/codefresh/templates/seed/mongo-seed-job.yaml b/codefresh/templates/seed/mongo-seed-job.yaml index 85a8c3eca..0acaab748 100644 --- a/codefresh/templates/seed/mongo-seed-job.yaml +++ b/codefresh/templates/seed/mongo-seed-job.yaml @@ -46,6 +46,8 @@ spec: {{- include "codefresh.mongodb-root-user-env-var-value" . | indent 12 }} - name: MONGODB_ROOT_PASSWORD {{- include "codefresh.mongodb-root-password-env-var-value" . | indent 12 }} + - name: DEVELOPMENT_CHART + value: {{ .Values.developmentChart }} command: - "/bin/bash" - "-exc" @@ -63,6 +65,9 @@ spec: - name: seed-data mountPath: "/usr/share/extras/idps.json" subPath: "idps.json" + - name: seed-data + mountPath: "/usr/share/extras/packs.json" + subPath: "idps.json" {{- include (printf "%s.volumeMounts" $libTemplateName) ( dict "Values" .Values.seed.volumeMounts "context" $ ) | nindent 8 }} {{- with .Values.seed.nodeSelector }} nodeSelector: diff --git a/codefresh/values.yaml b/codefresh/values.yaml index 349365c07..cf7ae6b5f 100644 --- a/codefresh/values.yaml +++ b/codefresh/values.yaml @@ -1884,3 +1884,5 @@ seed-e2e: ci: enabled: false + +developmentChart: false From b6fd7037659a4662dd44ae3748ab7eb056e21c7a Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 4 Feb 2025 13:02:54 +0300 Subject: [PATCH 12/21] fix: updates for codefresh-dev chart --- codefresh/templates/seed/mongo-seed-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh/templates/seed/mongo-seed-job.yaml b/codefresh/templates/seed/mongo-seed-job.yaml index 0acaab748..8a5758f86 100644 --- a/codefresh/templates/seed/mongo-seed-job.yaml +++ b/codefresh/templates/seed/mongo-seed-job.yaml @@ -47,7 +47,7 @@ spec: - name: MONGODB_ROOT_PASSWORD {{- include "codefresh.mongodb-root-password-env-var-value" . | indent 12 }} - name: DEVELOPMENT_CHART - value: {{ .Values.developmentChart }} + value: {{ .Values.developmentChart | quote }} command: - "/bin/bash" - "-exc" From b25cbe3b899313b3b36cd76997bfe6f30268e506 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 4 Feb 2025 18:08:17 +0300 Subject: [PATCH 13/21] fix: updates for codefresh-dev chart --- codefresh/Chart.yaml | 20 ++++++++++++++++++++ codefresh/files/mongoSeedJobScript.sh | 2 ++ codefresh/values.yaml | 15 +++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml index 0d75688a2..0a4665ed2 100644 --- a/codefresh/Chart.yaml +++ b/codefresh/Chart.yaml @@ -248,3 +248,23 @@ dependencies: repository: oci://quay.io/codefresh/charts version: "*" condition: cf-oidc-provider.enabled + - name: mailer + version: "*" + repository: oci://quay.io/codefresh/charts + condition: mailer.enabled + - name: payments + version: "*" + repository: oci://quay.io/codefresh/charts + condition: payments.enabled + - name: segment-reporter + version: "*" + repository: oci://quay.io/codefresh/charts + condition: segment-reporter.enabled + - name: salesforce-reporter + version: "*" + repository: oci://quay.io/codefresh/charts + condition: salesforce-reporter.enabled + - name: onboarding-status + version: "*" + repository: oci://quay.io/codefresh/charts + condition: onboarding-status.enabled diff --git a/codefresh/files/mongoSeedJobScript.sh b/codefresh/files/mongoSeedJobScript.sh index 9f441d217..5e7d7cb67 100644 --- a/codefresh/files/mongoSeedJobScript.sh +++ b/codefresh/files/mongoSeedJobScript.sh @@ -29,6 +29,8 @@ MONGODB_DATABASES=( "platform-analytics-postgres" "read-models" "runtime-environment-manager" + "onboarding-status" + "payments" ) disableMongoTelemetry() { diff --git a/codefresh/values.yaml b/codefresh/values.yaml index cf7ae6b5f..5d01766d6 100644 --- a/codefresh/values.yaml +++ b/codefresh/values.yaml @@ -1886,3 +1886,18 @@ ci: enabled: false developmentChart: false + +mailer: + enabled: false + +payments: + enabled: false + +segment-reporter: + enabled: false + +salesforce-reporter: + enabled: false + +onboarding-status: + enabled: false From 04692914c2a645c4726116bf076f6c05e0a65ccc Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 4 Feb 2025 19:25:37 +0300 Subject: [PATCH 14/21] fix: updates for codefresh-dev chart --- codefresh/templates/seed/mongo-seed-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh/templates/seed/mongo-seed-job.yaml b/codefresh/templates/seed/mongo-seed-job.yaml index 8a5758f86..bb8d8a0a3 100644 --- a/codefresh/templates/seed/mongo-seed-job.yaml +++ b/codefresh/templates/seed/mongo-seed-job.yaml @@ -67,7 +67,7 @@ spec: subPath: "idps.json" - name: seed-data mountPath: "/usr/share/extras/packs.json" - subPath: "idps.json" + subPath: "packs.json" {{- include (printf "%s.volumeMounts" $libTemplateName) ( dict "Values" .Values.seed.volumeMounts "context" $ ) | nindent 8 }} {{- with .Values.seed.nodeSelector }} nodeSelector: From de1224684217828d1430f84a9bb6214a700168d0 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 4 Feb 2025 19:39:59 +0300 Subject: [PATCH 15/21] fix: updates for codefresh-dev chart --- .../templates/seed/mongo-seed-config.yaml | 106 +----------------- 1 file changed, 6 insertions(+), 100 deletions(-) diff --git a/codefresh/templates/seed/mongo-seed-config.yaml b/codefresh/templates/seed/mongo-seed-config.yaml index cbb57a6ec..a65f1b8a9 100644 --- a/codefresh/templates/seed/mongo-seed-config.yaml +++ b/codefresh/templates/seed/mongo-seed-config.yaml @@ -8,105 +8,11 @@ metadata: {{ include "codefresh.labels" . | nindent 4 }} data: idps.json: | - { - "_id" : ObjectId("5b79a32e3b80d12608352f8e"), - "clientName" : "local", - "displayName" : "local", - "tokenSecret" : "q9MNUmE6assnoANmGZEjtrAa", - "clientType" : "localUserPassword", - "accounts" : [] - } +{{ .Files.Get "files/assets/idps.json" | indent 4 }} accounts.json: | - { - "_id" : ObjectId("59009117c102763beda7ce71"), - "badgeToken" : "eyJhbGciOiJIUzI1NiJ9.NTkwMDkxMTdjMTAyNzYzYmVkYTdjZTcx.B0HOUL6HlpTRNr_e95pVucSRMRzP2cobe5kIoMtrDSc", - "createdAt" : ISODate("2017-04-26T12:22:48.001+0000"), - "updatedAt" : ISODate("2017-04-26T12:27:13.720+0000"), - "name" : "admin-cf", - "runtimeEnvironment" : "codefresh", - "canUsePrivateRepos" : true, - "dedicatedInfrastructure" : false, - "cfcrRepositoryPath": "admin-cf", - "build" : { - "nodes" : NumberInt(0), - "parallel" : NumberInt(10), - "strategy" : "account" - }, - "integrations" : { - "stash" : { - "active" : false - }, - "registries" : [ - - ] - }, - "notifications" : [ - { - "type" : "pr", - "events" : [ - "build-success" - ] - } - ], - "repoPermission" : "public", - "environment" : NumberInt(1), - "admins" : [ - ObjectId("59009221c102763beda7cf04") - ], - "localUserPasswordIDPEnabled": true, -{{- if and (index .Values "seed-e2e" "enabled") }} - "features" : { - "analyticsClassicBuildsReports" : true, - "argoCdFlag" : true, - "commonDashboardProjectOne" : true, - "csdpDoraMetrics" : true, - "csdpIntegrations" : true, - "csdpJiraOauthIntegration" : true, - "environmentsV2Flag" : true, - "helm3NewUIFeature" : true, - "helmOptimizedQueue" : true, - "pipelineScopes" : true, - "pipelinesDashboardProjectOne" : true, - "showGitOpsHomeDashboardInTheProjectOneMenu" : true, - "csdpManagedArgo" : true - }, -{{- end }} - "__v" : NumberInt(0) - } +{{ .Files.Get "files/assets/accounts.json" | indent 4 }} users.json: | - { - "_id" : ObjectId("59009221c102763beda7cf04"), - "register_date" : ISODate("2017-04-26T12:27:13.608+0000"), - "userName" : "AdminCF", - "email" : "admin@codefresh.io", - "defaultAccount" : NumberInt(0), - "notifications" : [ - { - "type" : "mail", - "events" : [ - "build-success", - "build-failure" - ] - } - ], - "logins": [{ - "idp": ObjectId("5b79a32e3b80d12608352f8e") - }], - "status" : "new", - "account" : [ - ObjectId("59009117c102763beda7ce71") - ], - "roles" : [ - "User", - "Admin" - ], - "key" : { - "key" : "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAz6JQxcFORE6KwmBO1UnfpCph/PyARfm65eYXRuCOzdv5EIcz\n+4rRBwooH/SR8Wq49QRjq+Qm6ce2EBj2HD57t4rMj3W6X+5CwoFRXfF0tB4GqPSe\nDagbrNJbx93/dbEM+qEZNFk1MxtoJcBmj3jfrlGdTrarR3VOeBgKVLm/+Wz36pjM\nI4utzupHFAPquSIz0jis02/vccIZ8rAtyVdCd1q6Wz5DVu6iuGyMCYrpa9MFcupR\nc2eggyZ6PyNhmKuP7twr7y22elDQDkSo0G2yv4qbZnHEmShHhO/PKePMETUYMRvM\nzSS9qndT+Nax8vQvxeOCN3cEwm/Jy1oboYiwAwIDAQABAoIBAHyAJpC9nXGl6tws\npXiNKFWmuETbHwtWeDQcKL7uLZLQoOLBP3FIRphDBdZLbytkQ+1fKWjLkG3Du66h\nWQmMieB/kLNA83VMR6mboy+Cdej+zB2JODCWKaoSJMiOm/x1IoQyDwvtpdG0UFm6\nqYTEBNPgykOFkuRxOZEXUTKGgs9K7CFt1TbN8/bGCLgdq9plH2OvlOZkr4Cz0LpS\ns+Y/QJ/H4DDNZ6538NYLpq40Qi2NNq7iFJQ3iddEDi0i5O7pJK3Lziin/h3m99a+\nDbQET1bHm5Jh+Nrfxh1iwHaXdQLLoz5cex/ie5H6jtEMCSdcd53sPivSyHwMprEm\ng+0sNnECgYEA7q1eYNGJoA/UNXotVjPCaArf9/s1xiOTr5Fv1nWkH0jkmrj0WdjB\nsLQByC/wjSmZpfcKp38Z3JDFUimUEuCtZzgBCN6JB6VXe1t3L0wI1VTnxJwvsk8V\nQCB/gTugIDE1oE97kTvDuGl74XyY7uHyA1aYiXVnJ0bw8mcNCW2EzZkCgYEA3rQp\n3JjBGxBXaz7yCfhoQn5YZXw5yMBngyP8emu8u+7excZvCqIG+8NVh5KGFApOw9oe\n0aHUXGgfhSsl+xFA/m+E56mxm/J1PqRrWbnaEkLzPRSoFJBckjBm3ADHb6PuGbOL\nT72qxKPdZ1kdt0QfqIbZpR45COVk6KtmHMCO0/sCgYB6YaL2+fobfIJPOWptvPR9\n7LWSrdiQ1EUxzN0Plhqlf/bX7uY7+4y1Uldnkk1B1IbYNqfb4qwcEI9c5bzrQREo\nz+qX5aNVrE4DDo86TT5qRLLieUNrpmk7DG7UkQI1/4WDwb2WZpKgyFWg9QZl1q0F\nUS29rdlKpnF9maFxqBpkYQKBgBPU31VxlOCgF+jI9izFHiOttJl08oBaAd2/up/8\nMBZcMyJRhVnhC9Ynkto7xgzKzjDKn6vzSUHhU808BmnRI4SE0cT/a32DncUyRwz6\na9zscVSjHkSWhmfOP5qfxyK96loHjwRO04InRXQKj4beXiNXvtHhWxrbspy1hqZQ\nz2c5AoGBAO0tRNKfgoZH+sTiaphR550YFnIn8U9ROa1iQUvSiM0nHW6FraIR1sYB\nUTCtgOSJdffGMFrvH+PhShJPw7u3juZh9NBzrARjZPwBJyBaYDw3elVc3epZWoGC\n8EBEgdFVqFwPctkGvqyJ/5Zl3KnTioXxslHjP45H+Ne/nEWPejuP\n-----END RSA PRIVATE KEY-----\n", - "pubKey" : "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPolDFwU5ETorCYE7VSd+kKmH8/IBF+brl5hdG4I7N2/kQhzP7itEHCigf9JHxarj1BGOr5Cbpx7YQGPYcPnu3isyPdbpf7kLCgVFd8XS0Hgao9J4NqBus0lvH3f91sQz6oRk0WTUzG2glwGaPeN+uUZ1OtqtHdU54GApUub/5bPfqmMwji63O6kcUA+q5IjPSOKzTb+9xwhnysC3JV0J3WrpbPkNW7qK4bIwJiulr0wVy6lFzZ6CDJno/I2GYq4/u3CvvLbZ6UNAORKjQbbK/iptmccSZKEeE788p48wRNRgxG8zNJL2qd1P41rHy9C/F44I3dwTCb8nLWhuhiLAD blabla\n" - }, - "__v" : NumberInt(1), - "last_login_date" : ISODate("2017-04-26T12:27:21.788+0000"), - "hashedPassword" : "jRFgMK8CYVXa4FRBVsZQyWHdw/ErWSJzO/WKqdGcLpmeOZw8e6X5TvkYIkc617LU76RCB9B1jPNsbNVaTQGt4g==", - "salt" : "GswhajDWen9vNW+fZ+xVbA==" - } -{{- end }} \ No newline at end of file +{{ .Files.Get "files/assets/users.json" | indent 4 }} + packs.json: | +{{ .Files.Get "files/assets/packs.json" | indent 4 }} +{{- end }} From 548df9c3d00daf399e9bbc6b9ae44d2a6fab55dd Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 5 Feb 2025 00:49:56 +0300 Subject: [PATCH 16/21] fix: updates for codefresh-dev chart --- codefresh/files/mongoSeedJobScript.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/codefresh/files/mongoSeedJobScript.sh b/codefresh/files/mongoSeedJobScript.sh index 5e7d7cb67..da6a4e70b 100644 --- a/codefresh/files/mongoSeedJobScript.sh +++ b/codefresh/files/mongoSeedJobScript.sh @@ -99,11 +99,11 @@ mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"codefresh\").grantRolesToU mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"codefresh\").grantRolesToUser( \"${MONGODB_USER}\", [ { role: \"readWrite\", db: \"platform-analytics-postgres\" } ] )" 2>&1 || true mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"codefresh\").changeUserPassword(\"${MONGODB_USER}\",\"${MONGODB_PASSWORD}\")" 2>&1 || true -mongoimport --uri ${MONGO_URI} --collection idps --type json --legacy --file ${ASSETS_PATH}idps.json -mongoimport --uri ${MONGO_URI} --collection accounts --type json --legacy --file ${ASSETS_PATH}accounts.json -mongoimport --uri ${MONGO_URI} --collection users --type json --legacy --file ${ASSETS_PATH}users.json - -if [[ $DEVELOPMENT_CHART == "true" ]]; then - setSystemAdmin - setPacks -fi +# mongoimport --uri ${MONGO_URI} --collection idps --type json --legacy --file ${ASSETS_PATH}idps.json +# mongoimport --uri ${MONGO_URI} --collection accounts --type json --legacy --file ${ASSETS_PATH}accounts.json +# mongoimport --uri ${MONGO_URI} --collection users --type json --legacy --file ${ASSETS_PATH}users.json + +# if [[ $DEVELOPMENT_CHART == "true" ]]; then +# setSystemAdmin +# setPacks +# fi From 528af46efd813a066a6b912d5f1a22c0a95b82c6 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 6 Feb 2025 17:11:26 +0300 Subject: [PATCH 17/21] fix: updates for codefresh-dev chart --- codefresh/files/mongoSeedJobScript.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/codefresh/files/mongoSeedJobScript.sh b/codefresh/files/mongoSeedJobScript.sh index da6a4e70b..5e7d7cb67 100644 --- a/codefresh/files/mongoSeedJobScript.sh +++ b/codefresh/files/mongoSeedJobScript.sh @@ -99,11 +99,11 @@ mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"codefresh\").grantRolesToU mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"codefresh\").grantRolesToUser( \"${MONGODB_USER}\", [ { role: \"readWrite\", db: \"platform-analytics-postgres\" } ] )" 2>&1 || true mongosh ${MONGODB_ROOT_URI} --eval "db.getSiblingDB(\"codefresh\").changeUserPassword(\"${MONGODB_USER}\",\"${MONGODB_PASSWORD}\")" 2>&1 || true -# mongoimport --uri ${MONGO_URI} --collection idps --type json --legacy --file ${ASSETS_PATH}idps.json -# mongoimport --uri ${MONGO_URI} --collection accounts --type json --legacy --file ${ASSETS_PATH}accounts.json -# mongoimport --uri ${MONGO_URI} --collection users --type json --legacy --file ${ASSETS_PATH}users.json - -# if [[ $DEVELOPMENT_CHART == "true" ]]; then -# setSystemAdmin -# setPacks -# fi +mongoimport --uri ${MONGO_URI} --collection idps --type json --legacy --file ${ASSETS_PATH}idps.json +mongoimport --uri ${MONGO_URI} --collection accounts --type json --legacy --file ${ASSETS_PATH}accounts.json +mongoimport --uri ${MONGO_URI} --collection users --type json --legacy --file ${ASSETS_PATH}users.json + +if [[ $DEVELOPMENT_CHART == "true" ]]; then + setSystemAdmin + setPacks +fi From 837e9c9810d3e4af91741efdad7880c0e626f1d6 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 6 Feb 2025 17:41:20 +0300 Subject: [PATCH 18/21] fix: updates for codefresh-dev chart --- .../configmaps/runtimeEnvironments.json.tpl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/codefresh/templates/configmaps/runtimeEnvironments.json.tpl b/codefresh/templates/configmaps/runtimeEnvironments.json.tpl index 4a711ced7..cf88a3a7f 100644 --- a/codefresh/templates/configmaps/runtimeEnvironments.json.tpl +++ b/codefresh/templates/configmaps/runtimeEnvironments.json.tpl @@ -257,6 +257,16 @@ }, "isPublic": true, "nonComplete": false - } + }, + { + "metadata": { + "name": "system/linux_paying_plan", + "agent": false + }, + "description": "MAIN Linux runtime for paying customers", + "extends": [ + "system/default" + ] + } ] {{- end -}} From 86c4b07fd01fc972b193487169e43e778801d8c1 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Fri, 7 Feb 2025 17:22:13 +0300 Subject: [PATCH 19/21] fix: updates for codefresh-dev chart --- codefresh/templates/ingress.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/codefresh/templates/ingress.yaml b/codefresh/templates/ingress.yaml index 0c8c7feeb..e02834b01 100644 --- a/codefresh/templates/ingress.yaml +++ b/codefresh/templates/ingress.yaml @@ -14,7 +14,9 @@ metadata: {{ toYaml . | nindent 4 }} {{- end }} spec: - ingressClassName: {{ .Values.ingress.ingressClassName | default (index .Values "ingress-nginx" "controller" "ingressClassResource" "name") }} + {{- with .Values.ingress.ingressClassName }} + ingressClassName: {{ . }} + {{- end }} {{- if .Values.ingress.tls.enabled }} tls: - hosts: From d756edc894decb25cc0b8e38ca0565afbccc24cd Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Fri, 7 Feb 2025 18:03:39 +0300 Subject: [PATCH 20/21] fix: updates for codefresh-dev chart --- codefresh/files/assets/accounts.json | 5 ++--- codefresh/templates/ingress.yaml | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/codefresh/files/assets/accounts.json b/codefresh/files/assets/accounts.json index dce410ea9..068004d0b 100644 --- a/codefresh/files/assets/accounts.json +++ b/codefresh/files/assets/accounts.json @@ -3,11 +3,10 @@ "badgeToken": "eyJhbGciOiJIUzI1NiJ9.NTkwMDkxMTdjMTAyNzYzYmVkYTdjZTcx.B0HOUL6HlpTRNr_e95pVucSRMRzP2cobe5kIoMtrDSc", "createdAt": ISODate("2017-04-26T12:22:48.001+0000"), "updatedAt": ISODate("2017-04-26T12:27:13.720+0000"), - "name": "admin-cf", + "name": "codefresh-inc", "runtimeEnvironment": "codefresh", "canUsePrivateRepos": true, "dedicatedInfrastructure": false, - "cfcrRepositoryPath": "admin-cf", "build": { "nodes": NumberInt(0), "parallel": NumberInt(10), @@ -34,4 +33,4 @@ ], "localUserPasswordIDPEnabled": true, "__v": NumberInt(0) -} \ No newline at end of file +} diff --git a/codefresh/templates/ingress.yaml b/codefresh/templates/ingress.yaml index e02834b01..0c8c7feeb 100644 --- a/codefresh/templates/ingress.yaml +++ b/codefresh/templates/ingress.yaml @@ -14,9 +14,7 @@ metadata: {{ toYaml . | nindent 4 }} {{- end }} spec: - {{- with .Values.ingress.ingressClassName }} - ingressClassName: {{ . }} - {{- end }} + ingressClassName: {{ .Values.ingress.ingressClassName | default (index .Values "ingress-nginx" "controller" "ingressClassResource" "name") }} {{- if .Values.ingress.tls.enabled }} tls: - hosts: From e95c063301332b6b4a93ad7c0f87c202a822fcd1 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 10 Feb 2025 11:33:26 +0300 Subject: [PATCH 21/21] fix: updates for codefresh-dev chart --- codefresh/files/assets/accounts.json | 288 ++++++++++++++++++++++++--- 1 file changed, 257 insertions(+), 31 deletions(-) diff --git a/codefresh/files/assets/accounts.json b/codefresh/files/assets/accounts.json index 068004d0b..aafb68468 100644 --- a/codefresh/files/assets/accounts.json +++ b/codefresh/files/assets/accounts.json @@ -1,36 +1,262 @@ { - "_id": ObjectId("59009117c102763beda7ce71"), - "badgeToken": "eyJhbGciOiJIUzI1NiJ9.NTkwMDkxMTdjMTAyNzYzYmVkYTdjZTcx.B0HOUL6HlpTRNr_e95pVucSRMRzP2cobe5kIoMtrDSc", - "createdAt": ISODate("2017-04-26T12:22:48.001+0000"), - "updatedAt": ISODate("2017-04-26T12:27:13.720+0000"), - "name": "codefresh-inc", - "runtimeEnvironment": "codefresh", - "canUsePrivateRepos": true, - "dedicatedInfrastructure": false, - "build": { - "nodes": NumberInt(0), - "parallel": NumberInt(10), - "strategy": "account" - }, - "integrations": { - "stash": { - "active": false - }, - "registries": [] - }, - "notifications": [ - { - "type": "pr", - "events": [ - "build-success" - ] - } + "_id" : ObjectId("59009117c102763beda7ce71"), + "name" : "codefresh-inc", + "suspension" : { + "isSuspended" : false + }, + "activation" : { + "isActivated" : true, + "performedBy" : "System" + }, + "cloudBuilds" : { + "isActivated" : true, + "isRequested" : false, + "performedBy" : "System" + }, + "allowedDomains" : [ + ], - "repoPermission": "public", - "environment": NumberInt(1), - "admins": [ + "enabledAllowedDomains" : true, + "admins" : [ ObjectId("59009221c102763beda7cf04") + ], + "environment" : NumberInt(1), + "runtimeEnvironment" : "codefresh", + "integrations" : { + "stash" : { + "active" : false + }, + "github" : { + "active" : false + }, + "gitlab" : { + "active" : false + }, + "aks" : { + "exist" : false + }, + "aks_sp" : { + "exist" : false + }, + "aks_mi" : { + "exist" : false + }, + "gcloud" : { + "exist" : false + }, + "digitalOcean" : { + "exist" : false + }, + "registries" : [ + + ] + }, + "badgeToken" : "eyJhbGciOiJIUzI1NiJ9.NTkwMDkxMTdjMTAyNzYzYmVkYTdjZTcx.B0HOUL6HlpTRNr_e95pVucSRMRzP2cobe5kIoMtrDSc", + "createdAt" : ISODate("2017-04-26T12:22:48.001+0000"), + "updatedAt" : ISODate("2017-04-26T12:27:13.720+0000"), + "build" : { + "strategy" : "account", + "nodes" : NumberInt(0), + "packs" : [ + { + "id" : "5cd1746617313f468d669013", + "metadata" : { + "name" : "small", + "description" : "1 GB RAM 1 CPU" + }, + "workflows" : { + "concurrency" : { + "amount" : NumberInt(1), + "absorb" : NumberInt(0), + "allowUnlimited" : false + } + }, + "runtime" : { + "name" : "system/linux_paying_plan", + "defaultDindResources" : { + "requests" : { + "cpu" : "900m", + "memory" : "1024Mi" + } + }, + "cpu" : "1000m", + "memory" : "1024Mi", + "storage" : "8G", + "dindStorage" : "8G", + "os" : "linux", + "architecture" : "amd64" + } + }, + { + "id" : "5cd1746717313f468d669014", + "metadata" : { + "name" : "medium", + "description" : "4 GB RAM 2 CPU" + }, + "workflows" : { + "concurrency" : { + "amount" : NumberInt(1), + "absorb" : NumberInt(0), + "allowUnlimited" : false + } + }, + "runtime" : { + "name" : "system/linux_paying_plan", + "defaultDindResources" : { + "requests" : { + "cpu" : "1200m", + "memory" : "1500Mi" + } + }, + "cpu" : "2000m", + "memory" : "4096Mi", + "storage" : "16G", + "dindStorage" : "16G", + "os" : "linux", + "architecture" : "amd64" + } + }, + { + "id" : "5cd1746817313f468d669015", + "metadata" : { + "name" : "large", + "description" : "8 GB RAM 4 CPU" + }, + "workflows" : { + "concurrency" : { + "amount" : NumberInt(1), + "absorb" : NumberInt(0), + "allowUnlimited" : false + } + }, + "runtime" : { + "name" : "system/linux_paying_plan", + "defaultDindResources" : { + "requests" : { + "cpu" : "1500m", + "memory" : "3000Mi" + } + }, + "cpu" : "4000m", + "memory" : "8192Mi", + "storage" : "32G", + "dindStorage" : "32G", + "os" : "linux", + "architecture" : "amd64" + } + }, + { + "id" : "5cd1746817313f468d669016", + "metadata" : { + "name" : "runner", + "description" : "Hybrid runtime-environment" + }, + "workflows" : { + "concurrency" : { + "amount" : NumberInt(-1), + "absorb" : NumberInt(1), + "allowUnlimited" : true + } + } + } + ], + "defaultPack" : ObjectId("5cd1746617313f468d669013") + }, + "dedicatedInfrastructure" : false, + "canUsePrivateRepos" : true, + "features" : { + "launchDarklyManagement" : true + }, + "supportPlan" : "PLATINUM", + "increasedAttention" : false, + "cfcrRepositoryPath" : "codefresh-inc", + "paymentPlan" : { + "id" : "PRO_1", + "trial" : { + "trialing" : true, + "trialStart" : ISODate("2025-02-07T15:33:32.532+0000"), + "trialEnd" : ISODate("2025-02-22T15:33:32.532+0000"), + "trialWillEndNotified" : false, + "trialEndedNotified" : false, + "type" : "NEW_ACCOUNT", + "previousSegment" : "BASIC" + }, + "isWiredTransfer" : false, + "provider" : "codefresh" + }, + "gradualExposure" : "SEGMENT", + "codefreshEnv" : "latest", + "imageViewConfig" : { + "version" : "V1" + }, + "buildStepConfig" : { + "version" : "V1", + "disablePush" : false + }, + "CFCRState" : { + "dates" : { + "one" : { + "startDate" : "2020-03-10", + "endDate" : "2020-07-02" + }, + "two" : { + "startDate" : "2020-07-02", + "endDate" : "2020-07-16" + } + }, + "enabled" : false, + "system" : "ACTIVE", + "displayGlobalNotice" : true, + "accountChoice" : "ACTIVE" + }, + "noPersonalAccountForInvitedUser" : true, + "pipelineConfig" : { + "general" : { + "templates" : false, + "clone" : true, + "autoCreateProjectsForTeams" : false, + "lowMemoryWarningThreshold" : "70" + }, + "yaml" : { + "inline" : true, + "git" : true, + "url" : true + }, + "execution" : { + "keepPVCsForPendingApproval" : false, + "pendingApprovalConcurrencyApplied" : false, + "injectClustersFromPipelineSettings" : false, + "permitRestartFromFailedSteps" : true + }, + "pendingApproval" : { + "pendingApprovalConfirmation" : "none" + } + }, + "csdp" : { + "validated" : false + }, + "pauseWorkflowExecution" : false, + "systemType" : "PROJECT_ONE", + "systemTypePrev" : "", + "notifications" : [ + { + "type" : "pr", + "events" : [ + "build-success" + ] + } ], - "localUserPasswordIDPEnabled": true, - "__v": NumberInt(0) + "repoPermission" : "public", + "limits" : { + "collaborators" : { + "limit" : NumberInt(10), + "used" : NumberInt(1) + }, + "dataRetention" : { + "weeks" : NumberInt(24) + } + }, + "localUserPasswordIDPEnabled" : true, + "segment" : "ENTERPRISE", + "__v" : NumberInt(0) }