diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 43a0e9a5..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 https://chartmuseum.codefresh.io/cf-common ct install --config "ct.yaml" unittest-charts: 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/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 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..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: @@ -280,6 +292,7 @@ nginx: {{- $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