Merge branch 'master' into ap-update-crd

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+### 2.0.3
+
+An automatically generated list of changes can be found on Github at: [2.0.3 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.3)
+
+A curated list of changes can be found in the [Releases](http:https://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website.
+
+### 1.12.3
+
+An automatically generated list of changes can be found on Github at: [1.12.3 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.3)
+
+A curated list of changes can be found in the [Releases](http:https://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website.
+
 ### 2.0.2
 
 An automatically generated list of changes can be found on Github at: [2.0.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.2)

README.md

@@ -53,7 +53,7 @@ Read [this doc](https://docs.nginx.com/nginx-ingress-controller/intro/nginx-plus
 
 We publish Ingress controller releases on GitHub. See our [releases page](https://github.com/nginxinc/kubernetes-ingress/releases).
 
-The latest stable release is [2.0.2](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.2). For production use, we recommend that you choose the latest stable release. As an alternative, you can choose the *edge* version built from the [latest commit](https://github.com/nginxinc/kubernetes-ingress/commits/master) from the master branch. The edge version is useful for experimenting with new features that are not yet published in a stable release.
+The latest stable release is [2.0.3](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.3). For production use, we recommend that you choose the latest stable release. As an alternative, you can choose the *edge* version built from the [latest commit](https://github.com/nginxinc/kubernetes-ingress/commits/master) from the master branch. The edge version is useful for experimenting with new features that are not yet published in a stable release.
 
 To use the Ingress controller, you need to have access to:
 * An Ingress controller image.
@@ -66,7 +66,7 @@ The table below summarizes the options regarding the images, manifests, helm cha
 
 | Version | Description | Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples |
 | ------- | ----------- | --------------- | -------------------- | ---------------------------------------| -------------------------- |
-| Latest stable release | For production use | `nginx/nginx-ingress:2.0.2`, `nginx/nginx-ingress:2.0.2-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | Use the 2.0.2 image from [the F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.2/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.2/deployments/helm-chart). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
+| Latest stable release | For production use | `nginx/nginx-ingress:2.0.3`, `nginx/nginx-ingress:2.0.3-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | Use the 2.0.3 image from [the F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/deployments/helm-chart). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
 | Edge | For testing and experimenting | `nginx/nginx-ingress:edge`, `nginx/nginx-ingress:edge-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/master/docs/content/installation/building-ingress-controller-image.md). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/master/docs/content/installation/building-ingress-controller-image.md). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/master/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/master/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/master/docs/content). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples). |
 
 ## Contacts

build/Dockerfile

@@ -83,12 +83,18 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
 ############################################# Base image for UBI 8 #############################################
 FROM redhat/ubi8-minimal AS ubi-base-8
 
+# temporary fix for CVE-2021-22946, CVE-2021-22947, CVE-2021-33928, CVE-2021-33929, CVE-2021-33930, CVE-2021-33938
+RUN microdnf upgrade -y curl libsolv
+
 
 ############################################# Base image for UBI 7 #############################################
 FROM registry.access.redhat.com/ubi7/ubi AS ubi-base-7
 
 RUN yum install -y microdnf
 
+# temporary fix for CVE-2021-42574
+RUN yum upgrade -y binutils
+
 
 ############################################# Base image for UBI #############################################
 FROM ubi-base-${UBI_VERSION} AS ubi-base
@@ -169,12 +175,11 @@ RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ cp -av /tmp/usr/local/li
 
 ############################################# Build image for Opentracing with NGINX Plus #############################################
 FROM debian-plus as opentracing-plus
-ARG NGINX_PLUS_VERSION
 
 RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
  --mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
  apt-get update \
- && apt-get install --no-install-recommends --no-install-suggests -y nginx-plus-module-opentracing-${NGINX_PLUS_VERSION} \
+ && apt-get install --no-install-recommends --no-install-suggests -y libcurl4 nginx-plus-module-opentracing \
  && rm -rf /var/lib/apt/lists/*
 
 RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ cp -av /tmp/usr/local/lib/libjaegertracing*so* /tmp/usr/local/lib/libzipkin*so* /tmp/usr/local/lib/libdd*so* /tmp/usr/local/lib/libyaml*so* /usr/local/lib/ \

cmd/nginx-ingress/main.go

@@ -154,7 +154,7 @@ var (
  "Enable preview policies")
 
  enableSnippets = flag.Bool("enable-snippets", false,
- "Enable custom NGINX configuration snippets in VirtualServer, VirtualServerRoute and TransportServer resources.")
+ "Enable custom NGINX configuration snippets in Ingress, VirtualServer, VirtualServerRoute and TransportServer resources.")
 
  globalConfiguration = flag.String("global-configuration", "",
  `The namespace/name of the GlobalConfiguration resource for global configuration of the Ingress Controller. Requires -enable-custom-resources. Format: <namespace>/<name>`)
@@ -638,6 +638,7 @@ func main() {
  IsPrometheusEnabled: *enablePrometheusMetrics,
  IsLatencyMetricsEnabled: *enableLatencyMetrics,
  IsTLSPassthroughEnabled: *enableTLSPassthrough,
+ SnippetsEnabled: *enableSnippets,
  }
 
  lbc := k8s.NewLoadBalancerController(lbcInput)

deployments/daemon-set/nginx-ingress.yaml

@@ -18,7 +18,7 @@ spec:
  spec:
  serviceAccountName: nginx-ingress
  containers:
- - image: nginx/nginx-ingress:2.0.2
+ - image: nginx/nginx-ingress:2.0.3
  imagePullPolicy: IfNotPresent
  name: nginx-ingress
  ports:

deployments/daemon-set/nginx-plus-ingress.yaml

@@ -18,7 +18,7 @@ spec:
  spec:
  serviceAccountName: nginx-ingress
  containers:
- - image: nginx-plus-ingress:2.0.2
+ - image: nginx-plus-ingress:2.0.3
  imagePullPolicy: IfNotPresent
  name: nginx-plus-ingress
  ports:

deployments/deployment/nginx-ingress.yaml

@@ -19,7 +19,7 @@ spec:
  spec:
  serviceAccountName: nginx-ingress
  containers:
- - image: nginx/nginx-ingress:2.0.2
+ - image: nginx/nginx-ingress:2.0.3
  imagePullPolicy: IfNotPresent
  name: nginx-ingress
  ports:

deployments/deployment/nginx-plus-ingress.yaml

@@ -19,7 +19,7 @@ spec:
  spec:
  serviceAccountName: nginx-ingress
  containers:
- - image: nginx-plus-ingress:2.0.2
+ - image: nginx-plus-ingress:2.0.3
  imagePullPolicy: IfNotPresent
  name: nginx-plus-ingress
  ports:

deployments/helm-chart/Chart.yaml

@@ -1,13 +1,13 @@
 name: nginx-ingress
-version: 0.11.2
-appVersion: 2.0.2
+version: 0.11.3
+appVersion: 2.0.3
 apiVersion: v1
 kubeVersion: ">= 1.19.0-0"
 description: NGINX Ingress Controller
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.0.2/deployments/helm-chart/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.0.3/deployments/helm-chart/chart-icon.png
 home: https://github.com/nginxinc/kubernetes-ingress
 sources:
- - https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.2/deployments/helm-chart
+ - https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.3/deployments/helm-chart
 keywords:
  - ingress
  - nginx

deployments/helm-chart/README.md

@@ -26,7 +26,7 @@ This step is required if you're installing the chart using its sources. Addition
 2. Change your working directory to /deployments/helm-chart:
  ```console
  $ cd kubernetes-ingress/deployments/helm-chart
- $ git checkout v2.0.2
+ $ git checkout v2.0.3
  ```
 
 ## Adding the Helm Repository
@@ -152,7 +152,7 @@ Parameter | Description | Default
 `controller.nginxDebug` | Enables debugging for NGINX. Uses the `nginx-debug` binary. Requires `error-log-level: debug` in the ConfigMap via `controller.config.entries`. | false
 `controller.logLevel` | The log level of the Ingress Controller. | 1
 `controller.image.repository` | The image repository of the Ingress controller. | nginx/nginx-ingress
-`controller.image.tag` | The tag of the Ingress controller image. | 2.0.2
+`controller.image.tag` | The tag of the Ingress controller image. | 2.0.3
 `controller.image.pullPolicy` | The pull policy for the Ingress controller image. | IfNotPresent
 `controller.config.name` | The name of the ConfigMap used by the Ingress controller. | Autogenerated
 `controller.config.annotations` | The annotations of the Ingress controller configmap. | {}
@@ -181,7 +181,7 @@ Parameter | Description | Default
 `controller.enableTLSPassthrough` | Enable TLS Passthrough on port 443. Requires `controller.enableCustomResources`. | false
 `controller.globalConfiguration.create` | Creates the GlobalConfiguration custom resource. Requires `controller.enableCustomResources`. | false
 `controller.globalConfiguration.spec` | The spec of the GlobalConfiguration for defining the global configuration parameters of the Ingress Controller. | {}
-`controller.enableSnippets` | Enable custom NGINX configuration snippets in VirtualServer, VirtualServerRoute and TransportServer resources. | false
+`controller.enableSnippets` | Enable custom NGINX configuration snippets in Ingress, VirtualServer, VirtualServerRoute and TransportServer resources. | false
 `controller.healthStatus` | Add a location "/nginx-health" to the default server. The location responds with the 200 status code for any request. Useful for external health-checking of the Ingress controller. | false
 `controller.healthStatusURI` | Sets the URI of health status location in the default server. Requires `controller.healthStatus`. | "/nginx-health"
 `controller.nginxStatus.enable` | Enable the NGINX stub_status, or the NGINX Plus API. | true

deployments/helm-chart/values-icp.yaml

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

deployments/helm-chart/values-plus.yaml

@@ -2,4 +2,4 @@ controller:
  nginxplus: true
  image:
  repository: nginx-plus-ingress
- tag: "2.0.2"
+ tag: "2.0.3"

deployments/helm-chart/values.yaml

@@ -34,7 +34,7 @@ controller:
  repository: nginx/nginx-ingress
 
  ## The tag of the Ingress controller image.
- tag: "2.0.2"
+ tag: "2.0.3"
 
  ## The pull policy for the Ingress controller image.
  pullPolicy: IfNotPresent
@@ -161,7 +161,7 @@ controller:
  # port: 5353
  # protocol: TCP
 
- ## Enable custom NGINX configuration snippets in VirtualServer, VirtualServerRoute and TransportServer resources.
+ ## Enable custom NGINX configuration snippets in Ingress, VirtualServer, VirtualServerRoute and TransportServer resources.
  enableSnippets: false
 
  ## Add a location based on the value of health-status-uri to the default server. The location responds with the 200 status code for any request.