onprem: 2.6.11 (#37)

Author: mikhail-klimko

codefresh/Chart.lock

@@ -37,7 +37,7 @@ dependencies:
   version: 1.3.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

codefresh/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Helm Chart for Codefresh On-Prem
 name: codefresh
-version: 2.6.10
+version: 2.6.11
 keywords:
   - codefresh
 home: https://codefresh.io/
@@ -18,15 +18,8 @@ annotations:
   artifacthub.io/containsSecurityUpdates: "true"
   # supported kinds are added, changed, deprecated, removed, fixed and security.
   artifacthub.io/changes: |
-    - kind: changed
-      description: "Add procps to cf-system-etl-postgres"
-      links:
-        - name: JIRA Issue
-          url: https://codefresh-io.atlassian.net/browse/CR-27956
     - kind: security
-      description: "Misc security updates"
-    - kind: changed
-      description: "Rename cf-k8s-monitor image to k8s-monitor"
+      description: "Upgrade ingress-nginx controller"
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts
@@ -76,7 +69,7 @@ dependencies:
     condition: runner.enabled
     version: 1.3.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

codefresh/README.md

@@ -1,6 +1,6 @@
 ## Codefresh On-Premises
 
-![Version: 2.6.10](https://img.shields.io/badge/Version-2.6.10-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
+![Version: 2.6.11](https://img.shields.io/badge/Version-2.6.11-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.
 
@@ -2240,7 +2240,7 @@ kubectl -n $NAMESPACE delete secret codefresh-certs-server
 | 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 |

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
@@ -972,7 +969,7 @@ ingress-nginx:
   enabled: true
   controller:
     enableAnnotationValidations: true
-    allowSnippetAnnotations: true
+    allowSnippetAnnotations: false
     ingressClassResource:
       enabled: true
       default: false
@@ -992,6 +989,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