revert to nginx-ingress v3.7.1

nginx-ingress/Chart.yaml

@@ -1,14 +1,14 @@
 apiVersion: v2
 name: nginx-ingress
-version: 1.5.0
+version: 1.4.1
-appVersion: 4.0.0
+appVersion: 3.7.1
 kubeVersion: ">= 1.23.0-0"
 type: application
 description: NGINX Ingress Controller
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.7.0/charts/nginx-ingress/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.7.1/charts/nginx-ingress/chart-icon.png
 home: https://github.com/nginxinc/kubernetes-ingress
 sources:
-  - https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.0/charts/nginx-ingress
+  - https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.1/charts/nginx-ingress
 keywords:
   - ingress
   - nginx

nginx-ingress/templates/_helpers.tpl

@@ -244,8 +244,7 @@ Build the args for the service binary.
 - -health-status={{ .Values.controller.healthStatus }}
 - -health-status-uri={{ .Values.controller.healthStatusURI }}
 - -nginx-debug={{ .Values.controller.nginxDebug }}
-- -log-level={{ .Values.controller.logLevel }}
+- -v={{ .Values.controller.logLevel }}
-- -log-format={{ .Values.controller.logFormat }}
 - -nginx-status={{ .Values.controller.nginxStatus.enable }}
 {{- if .Values.controller.nginxStatus.enable }}
 - -nginx-status-port={{ .Values.controller.nginxStatus.port }}
@@ -333,7 +332,7 @@ List of volumes for controller.
   emptyDir: {}
 {{- end }}
 {{- if .Values.controller.appprotect.v5 }}
-{{ toYaml .Values.controller.appprotect.volumes }}
+{{- toYaml .Values.controller.appprotect.volumes }}
 {{- end }}
 {{- if .Values.controller.volumes }}
 {{ toYaml .Values.controller.volumes }}

nginx-ingress/values-icp.yaml

@@ -4,7 +4,7 @@ controller:
   nginxplus: true
   image:
     repository: mycluster.icp:8500/kube-system/nginx-plus-ingress
-    tag: "3.7.0"
+    tag: "3.7.1"
   nodeSelector:
     beta.kubernetes.io/arch: "amd64"
     proxy: true

nginx-ingress/values.schema.json

@@ -486,32 +486,17 @@
           ]
         },
         "logLevel": {
-          "type": "string",
+          "type": "integer",
-          "default": "info",
+          "default": 1,
           "title": "The logLevel of the Ingress Controller",
           "enum": [
-            "trace",
+            0,
-            "debug",
+            1,
-            "info",
+            2,
-            "warning",
+            3
-            "error",
-            "fatal"
           ],
           "examples": [
-            "info"
+            1
-          ]
-        },
-        "logFormat": {
-          "type": "string",
-          "default": "glog",
-          "title": "The logFormat of the Ingress Controller",
-          "enum": [
-            "glog",
-            "json",
-            "text"
-          ],
-          "examples": [
-            "json"
           ]
         },
         "customPorts": {
@@ -555,10 +540,10 @@
             },
             "tag": {
               "type": "string",
-              "default": "3.7.0",
+              "default": "3.7.1",
               "title": "The tag of the Ingress Controller image",
               "examples": [
-                "3.7.0"
+                "3.7.1"
               ]
             },
             "digest": {
@@ -595,7 +580,7 @@
           "examples": [
             {
               "repository": "nginx/nginx-ingress",
-              "tag": "3.7.0",
+              "tag": "3.7.1",
               "pullPolicy": "IfNotPresent"
             }
           ]
@@ -1746,7 +1731,7 @@
           "customPorts": [],
           "image": {
             "repository": "nginx/nginx-ingress",
-            "tag": "3.7.0",
+            "tag": "3.7.1",
             "digest": "",
             "pullPolicy": "IfNotPresent"
           },
@@ -1799,6 +1784,7 @@
           },
           "tolerations": [],
           "affinity": {},
+          "topologySpreadConstraints": {},
           "env": [],
           "volumes": [],
           "volumeMounts": [],
@@ -1853,13 +1839,13 @@
             "httpPort": {
               "enable": true,
               "port": 80,
-              "nodePort": 8443,
+              "nodePort": "",
               "targetPort": 80
             },
             "httpsPort": {
               "enable": true,
               "port": 443,
-              "nodePort": 8443,
+              "nodePort": "",
               "targetPort": 443
             },
             "customPorts": []
@@ -2360,7 +2346,7 @@
         "customPorts": [],
         "image": {
           "repository": "nginx/nginx-ingress",
-          "tag": "3.7.0",
+          "tag": "3.7.1",
           "digest": "",
           "pullPolicy": "IfNotPresent"
         },
@@ -2413,6 +2399,7 @@
         },
         "tolerations": [],
         "affinity": {},
+        "topologySpreadConstraints": {},
         "env": [],
         "volumes": [],
         "volumeMounts": [],
@@ -2467,13 +2454,13 @@
           "httpPort": {
             "enable": true,
             "port": 80,
-            "nodePort": 8080,
+            "nodePort": "",
             "targetPort": 80
           },
           "httpsPort": {
             "enable": true,
             "port": 443,
-            "nodePort": 8443,
+            "nodePort": "",
             "targetPort": 443
           },
           "customPorts": []
@@ -2559,7 +2546,7 @@
         "logLevel": "error",
         "syslog": {
           "host": "127.0.0.1",
-          "port": 1514
+          "port": "1514"
         },
         "napMonitoring": {
           "collectorBufferSize": 50000,

nginx-ingress/values.yaml

@@ -123,11 +123,8 @@ controller:
   ## Share process namespace between containers in the Ingress Controller pod.
   shareProcessNamespace: false
 
-  ## The log level of the Ingress Controller. Options include: trace, debug, info, warning, error, fatal
+  ## The log level of the Ingress Controller.
-  logLevel: info
+  logLevel: 1
-
-  ## Sets the log format of Ingress Controller. Options include: glog, json, text
-  logFormat: glog
 
   ## A list of custom ports to expose on the NGINX Ingress Controller pod. Follows the conventional Kubernetes yaml syntax for container ports.
   customPorts: []
@@ -137,7 +134,7 @@ controller:
     repository: nginx/nginx-ingress
 
     ## The tag of the Ingress Controller image. If not specified the appVersion from Chart.yaml is used as a tag.
-    # tag: "3.7.0"
+    # tag: "3.7.1"
     ## The digest of the Ingress Controller image.
     ## If digest is specified it has precedence over tag and will be used instead
     # digest: "sha256:CHANGEME"