diff --git a/codefresh/Chart.lock b/codefresh/Chart.lock index 9d32339f0..ceef2b909 100644 --- a/codefresh/Chart.lock +++ b/codefresh/Chart.lock @@ -37,7 +37,7 @@ dependencies: version: 1.4.0 - name: ingress-nginx repository: https://kubernetes.github.io/ingress-nginx - version: 4.11.2 + version: 4.12.1 - name: cluster-providers repository: oci://quay.io/codefresh/charts version: 1.17.15 @@ -170,5 +170,5 @@ dependencies: - name: onboarding-status repository: oci://quay.io/codefresh/charts version: 1.8.8 -digest: sha256:1a674a100aee5e84b21984cd9586ffe3ca48dc6951fed91023cf93bf58c67111 -generated: "2025-03-26T11:42:09.123651+03:00" +digest: sha256:bdf0f27e7c70cc8fcd0c09ab72616db6f0429f171941f75e5edb554d542979a6 +generated: "2025-03-26T12:45:57.737771+03:00" diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml index 4b1515006..c3eef6171 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.7.4 +version: 2.7.5 keywords: - codefresh home: https://codefresh.io/ @@ -18,8 +18,8 @@ annotations: # artifacthub.io/containsSecurityUpdates: "true" # supported kinds are added, changed, deprecated, removed, fixed and security. artifacthub.io/changes: | - - kind: fixed - description: "REDIS_FEATURE_* env vars in cf-api" + - kind: security + description: "Upgrade ingress-nginx controller" dependencies: - name: cf-common repository: oci://quay.io/codefresh/charts @@ -69,7 +69,7 @@ dependencies: condition: runner.enabled version: 1.4.0 - name: ingress-nginx - version: 4.11.2 + version: 4.12.1 repository: https://kubernetes.github.io/ingress-nginx condition: ingress-nginx.enabled - name: cluster-providers diff --git a/codefresh/README.md b/codefresh/README.md index c942f2ae6..18497cea0 100644 --- a/codefresh/README.md +++ b/codefresh/README.md @@ -1,6 +1,6 @@ ## Codefresh On-Premises -![Version: 2.7.4](https://img.shields.io/badge/Version-2.7.4-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square) +![Version: 2.7.5](https://img.shields.io/badge/Version-2.7.5-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square) Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes. @@ -2290,7 +2290,7 @@ After platform upgrade, Consul fails with the error `refusing to rejoin cluster | hermes | object | See below | hermes | | hooks | object | See below | Pre/post-upgrade Job hooks. Updates images in `system/default` runtime. | | imageCredentials | object | `{}` | Credentials for Image Pull Secret object | -| ingress | object | `{"annotations":{"nginx.ingress.kubernetes.io/configuration-snippet":"more_set_headers \"X-Request-ID: $request_id\";\nproxy_set_header X-Request-ID $request_id;\n","nginx.ingress.kubernetes.io/service-upstream":"true","nginx.ingress.kubernetes.io/ssl-redirect":"false","nginx.org/redirect-to-https":"false"},"enabled":true,"ingressClassName":"nginx-codefresh","nameOverride":"","services":{"internal-gateway":["/"]},"tls":{"cert":"","enabled":false,"existingSecret":"","key":"","secretName":"star.codefresh.io"}}` | Ingress | +| ingress | object | `{"annotations":{"nginx.ingress.kubernetes.io/service-upstream":"true","nginx.ingress.kubernetes.io/ssl-redirect":"false","nginx.org/redirect-to-https":"false"},"enabled":true,"ingressClassName":"nginx-codefresh","nameOverride":"","services":{"internal-gateway":["/"]},"tls":{"cert":"","enabled":false,"existingSecret":"","key":"","secretName":"star.codefresh.io"}}` | Ingress | | ingress-nginx | object | See below | ingress-nginx Ref: https://github.com/kubernetes/ingress-nginx/blob/main/charts/ingress-nginx/values.yaml | | ingress.annotations | object | See below | Set annotations for ingress. | | ingress.enabled | bool | `true` | Enable the Ingress | diff --git a/codefresh/values.yaml b/codefresh/values.yaml index 6835b4177..daae2861d 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 @@ -986,7 +983,7 @@ ingress-nginx: enabled: true controller: enableAnnotationValidations: true - allowSnippetAnnotations: true + allowSnippetAnnotations: false ingressClassResource: enabled: true default: false @@ -1006,6 +1003,8 @@ ingress-nginx: proxy-body-size: "5M" log-format-escape-json: "true" log-format-upstream: '{ "time": "$time_iso8601", "remote_addr": "$proxy_protocol_addr", "x-forward-for": "$proxy_add_x_forwarded_for", "remote_user": "$remote_user", "bytes_sent": $bytes_sent, "request_time": $request_time, "status": $status, "vhost": "$host", "request_proto": "$server_protocol", "path": "$uri", "request_query": "$args", "request_length": $request_length, "duration": $request_time, "method": "$request_method", "http_referrer": "$http_referer", "http_user_agent": "$http_user_agent", "http_x_github_delivery": "$http_x_github_delivery", "http_x_hook_uuid": "$http_x_hook_uuid", "metadata": { "correlationId": "$request_id", "service": "ingress", "time": "$time_iso8601" } }' + http-snippet: | + proxy_set_header X-Request-ID $request_id; # -- k8s-monitor # @default -- See below