From 742c40224dacb395c09c03bfe74d6fdcb22b31c8 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 25 Aug 2025 11:48:07 +0300 Subject: [PATCH 1/5] feat(internal-gateway): add promotion-orchestrator route --- charts/internal-gateway/Chart.yaml | 2 +- .../internal-gateway/templates/_default_values.tpl | 3 +++ charts/internal-gateway/templates/_location_map.tpl | 12 ++++++++++++ charts/internal-gateway/values.yaml | 3 +++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/charts/internal-gateway/Chart.yaml b/charts/internal-gateway/Chart.yaml index b1a2c0e1..e2252cfd 100644 --- a/charts/internal-gateway/Chart.yaml +++ b/charts/internal-gateway/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v0.0.0 description: A Helm chart for Codefresh Internal Gateway name: internal-gateway -version: 0.10.6 +version: 0.11.0 home: https://github.com/codefresh-io/helm-charts keywords: - codefresh diff --git a/charts/internal-gateway/templates/_default_values.tpl b/charts/internal-gateway/templates/_default_values.tpl index c86af24a..7f5b5c65 100644 --- a/charts/internal-gateway/templates/_default_values.tpl +++ b/charts/internal-gateway/templates/_default_values.tpl @@ -49,6 +49,9 @@ codefresh: argo-platform-broadcaster: svc: '{{ index .Values.codefresh "argo-platform-broadcaster-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}' port: {{ index .Values.codefresh "argo-platform-broadcaster-port" }} + argo-platform-promotion-orchestrator: + svc: '{{ index .Values.codefresh "argo-platform-promotion-orchestrator-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}' + port: {{ index .Values.codefresh "argo-platform-promotion-orchestrator-port" }} argo-hub: svc: '{{ .Release.Name }}-{{ index .Values.codefresh "argo-hub-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}' port: {{ index .Values.codefresh "argo-hub-port" }} diff --git a/charts/internal-gateway/templates/_location_map.tpl b/charts/internal-gateway/templates/_location_map.tpl index 186bcef1..3fa5d0cf 100644 --- a/charts/internal-gateway/templates/_location_map.tpl +++ b/charts/internal-gateway/templates/_location_map.tpl @@ -280,6 +280,18 @@ nginx: {{- $presets.locationSnippet | toYaml | nindent 10 }} locationDirectives: {{- $presets.locationDirectives | toYaml | nindent 10 }} + + /2.0/api/promotion-orchestrator: + enabled: true + proxy: + host: {{ index $endpoints.serviceEndpoints "argo-platform-promotion-orchestrator" "svc" }} + port: {{ index $endpoints.serviceEndpoints "argo-platform-promotion-orchestrator" "port" }} + proxyPassSnippet: + {{- $presets.authHeaderSet | toYaml | nindent 12 }} + locationSnippet: + {{- $presets.locationSnippet | toYaml | nindent 10 }} + locationDirectives: + {{- $presets.locationDirectives | toYaml | nindent 10 }} {{- end }} {{- define "internal-gateway.nginx-config" }} diff --git a/charts/internal-gateway/values.yaml b/charts/internal-gateway/values.yaml index 73a3abee..c1116f38 100644 --- a/charts/internal-gateway/values.yaml +++ b/charts/internal-gateway/values.yaml @@ -54,6 +54,9 @@ codefresh: argo-platform-broadcaster-svc: argo-platform-broadcaster argo-platform-broadcaster-port: 80 + argo-platform-promotion-orchestrator-svc: argo-platform-promotion-orchestrator + argo-platform-promotion-orchestrator-port: 80 + argo-hub-svc: argo-hub-platform argo-hub-port: 80 From fb20434926c395dfc8d9ce7e733ed64765d80d2e Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 25 Aug 2025 11:50:13 +0300 Subject: [PATCH 2/5] feat(internal-gateway): add promotion-orchestrator route --- charts/internal-gateway/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/internal-gateway/README.md b/charts/internal-gateway/README.md index 0cb7a384..6f3ee619 100644 --- a/charts/internal-gateway/README.md +++ b/charts/internal-gateway/README.md @@ -1,6 +1,6 @@ # internal-gateway -![Version: 0.10.6](https://img.shields.io/badge/Version-0.10.6-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square) +![Version: 0.11.0](https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square) A Helm chart for Codefresh Internal Gateway From 9ed05a6251f2de4471fb8a462a8ca992c88ec6e4 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 25 Aug 2025 11:52:45 +0300 Subject: [PATCH 3/5] feat(internal-gateway): add promotion-orchestrator route --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 43a0e9a5..21a4d090 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -97,7 +97,7 @@ jobs: # Do not run `ct install` for cf-common (library chart) or builder/runner exit 0 fi - helm repo add cf-common https://chartmuseum.codefresh.io/cf-common + helm repo add cf-common oci://quay.io/codefresh/charts/cf-common ct install --config "ct.yaml" unittest-charts: From 526735ea4f5f8bbe11321b8efecdfb47a5e5426f Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 25 Aug 2025 11:55:44 +0300 Subject: [PATCH 4/5] feat(internal-gateway): add promotion-orchestrator route --- .github/workflows/lint-test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 21a4d090..0bdc6de9 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -97,7 +97,6 @@ jobs: # Do not run `ct install` for cf-common (library chart) or builder/runner exit 0 fi - helm repo add cf-common oci://quay.io/codefresh/charts/cf-common ct install --config "ct.yaml" unittest-charts: From 7ef30d377dbd6b1d8d7a064733c0f8aabd4e246a Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 27 Aug 2025 15:54:44 +0300 Subject: [PATCH 5/5] feat(internal-gateway): add promotion-orchestrator route --- .../templates/_location_map.tpl | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/charts/internal-gateway/templates/_location_map.tpl b/charts/internal-gateway/templates/_location_map.tpl index 3fa5d0cf..1e379943 100644 --- a/charts/internal-gateway/templates/_location_map.tpl +++ b/charts/internal-gateway/templates/_location_map.tpl @@ -241,6 +241,18 @@ nginx: locationDirectives: {{- $presets.locationDirectives | toYaml | nindent 10 }} + /2.0/api/promotion-orchestrator: + enabled: true + proxy: + host: {{ index $endpoints.serviceEndpoints "argo-platform-promotion-orchestrator" "svc" }} + port: {{ index $endpoints.serviceEndpoints "argo-platform-promotion-orchestrator" "port" }} + proxyPassSnippet: + {{- $presets.authHeaderSet | toYaml | nindent 12 }} + locationSnippet: + {{- $presets.locationSnippet | toYaml | nindent 10 }} + locationDirectives: + {{- $presets.locationDirectives | toYaml | nindent 10 }} + /2.0: enabled: true proxy: @@ -281,17 +293,6 @@ nginx: locationDirectives: {{- $presets.locationDirectives | toYaml | nindent 10 }} - /2.0/api/promotion-orchestrator: - enabled: true - proxy: - host: {{ index $endpoints.serviceEndpoints "argo-platform-promotion-orchestrator" "svc" }} - port: {{ index $endpoints.serviceEndpoints "argo-platform-promotion-orchestrator" "port" }} - proxyPassSnippet: - {{- $presets.authHeaderSet | toYaml | nindent 12 }} - locationSnippet: - {{- $presets.locationSnippet | toYaml | nindent 10 }} - locationDirectives: - {{- $presets.locationDirectives | toYaml | nindent 10 }} {{- end }} {{- define "internal-gateway.nginx-config" }}