Merge branch 'main' into feat/regex-ingress-resource

nginx · Jul 26, 2023 · 585bedc · 585bedc
2 parents 6d0c969 + 0a02259
commit 585bedc
Show file tree

Hide file tree

Showing 24 changed files with 141 additions and 243 deletions.
diff --git a/.github/dependency-review-config.yml b/.github/dependency-review-config.yml
diff --git a/.github/labels.yml b/.github/labels.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -389,6 +389,7 @@ jobs:
     if: ${{ github.event_name == 'push' && ! startsWith(github.ref, 'refs/heads/release-') }}
     permissions:
       contents: write # for pushing to Helm Charts repository
+      packages: write # for helm to push to GHCR
     steps:
       - name: Checkout Repository
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -25,4 +25,4 @@ jobs:
       - name: "Dependency Review"
         uses: actions/dependency-review-action@1360a344ccb0ab6e9475edef90ad2f46bf8003b1 # v3.0.6
         with:
-          config-file: "./.github/dependency-review-config.yml"
+          config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
diff --git a/.github/workflows/update-docker-images.yml b/.github/workflows/update-docker-images.yml
@@ -174,6 +174,12 @@ jobs:
       platforms: linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x
       image: debian
       tag: ${{ needs.variables.outputs.kic-tag }}
+    permissions:
+      contents: read
+      actions: read
+      security-events: write
+      id-token: write
+      packages: write
     secrets: inherit
     if: ${{ needs.check.outputs.needs-updating-debian == 'true' }}
 
@@ -185,6 +191,12 @@ jobs:
       platforms: linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x
       image: alpine
       tag: ${{ needs.variables.outputs.kic-tag }}
+    permissions:
+      contents: read
+      actions: read
+      security-events: write
+      id-token: write
+      packages: write
     secrets: inherit
     if: ${{ needs.check.outputs.needs-updating-alpine == 'true' }}
 
@@ -196,5 +208,11 @@ jobs:
       platforms: linux/arm64,linux/amd64,linux/ppc64le,linux/s390x
       image: ubi
       tag: ${{ needs.variables.outputs.kic-tag }}
+    permissions:
+      contents: read
+      actions: read
+      security-events: write
+      id-token: write
+      packages: write
     secrets: inherit
     if: ${{ needs.check.outputs.needs-updating-ubi == 'true' }}
diff --git a/deployments/helm-chart/templates/_helpers.tpl b/deployments/helm-chart/templates/_helpers.tpl
@@ -64,9 +64,13 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "nginx-ingress.selectorLabels" -}}
+{{- if .Values.controller.selectorLabels -}}
+{{ toYaml .Values.controller.selectorLabels }}
+{{- else -}}
 app.kubernetes.io/name: {{ include "nginx-ingress.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
+{{- end -}}
+{{- end -}}
 
 {{/*
 Expand the name of the configmap.

diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml
@@ -5,6 +5,9 @@ controller:
   ## The kind of the Ingress Controller installation - deployment or daemonset.
   kind: deployment
 
+  ## The selectorLabels used to overide the default values.
+  selectorLabels: {}
+
   ## Annotations for deployments and daemonsets
   annotations: {}
 

diff --git a/examples/custom-resources/app-protect-dos/syslog.yaml b/examples/custom-resources/app-protect-dos/syslog.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601

diff --git a/examples/custom-resources/app-protect-dos/syslog2.yaml b/examples/custom-resources/app-protect-dos/syslog2.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog-2
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601

diff --git a/examples/custom-resources/app-protect-waf/syslog.yaml b/examples/custom-resources/app-protect-waf/syslog.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601

diff --git a/examples/ingress-resources/app-protect-dos/syslog.yaml b/examples/ingress-resources/app-protect-dos/syslog.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601

diff --git a/examples/ingress-resources/app-protect-dos/syslog2.yaml b/examples/ingress-resources/app-protect-dos/syslog2.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog-2
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601

diff --git a/examples/ingress-resources/app-protect-waf/syslog.yaml b/examples/ingress-resources/app-protect-waf/syslog.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601

diff --git a/tests/data/ap-waf-grpc/syslog.yaml b/tests/data/ap-waf-grpc/syslog.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601

diff --git a/tests/data/ap-waf/syslog.yaml b/tests/data/ap-waf/syslog.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601

diff --git a/tests/data/ap-waf/syslog2.yaml b/tests/data/ap-waf/syslog2.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog2
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601

diff --git a/tests/data/appprotect/syslog.yaml b/tests/data/appprotect/syslog.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: syslog
-        image: balabit/syslog-ng:3.38.1
+        image: balabit/syslog-ng:4.3.0
         ports:
         - containerPort: 514
         - containerPort: 601

diff --git a/tests/data/appprotect/syslog2.yaml b/tests/data/appprotect/syslog2.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: syslog2
-        image: balabit/syslog-ng:3.38.1
+        image: balabit/syslog-ng:4.3.0
         ports:
         - containerPort: 514
         - containerPort: 601

diff --git a/tests/data/dos/dos-syslog.yaml b/tests/data/dos/dos-syslog.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601

diff --git a/tests/data/transport-server-externalname/external-svc-deployment.yaml b/tests/data/transport-server-externalname/external-svc-deployment.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: coredns-external-backend
-        image: coredns/coredns:1.8.6
+        image: coredns/coredns:1.10.1
         args: [ "-conf", "/etc/coredns/Corefile" ]
         volumeMounts:
         - name: config-volume

diff --git a/tests/data/transport-server-externalname/standard/service_deployment.yaml b/tests/data/transport-server-externalname/standard/service_deployment.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: coredns
-        image: coredns/coredns:1.8.6
+        image: coredns/coredns:1.10.1
         args: [ "-conf", "/etc/coredns/Corefile" ]
         volumeMounts:
         - name: config-volume

diff --git a/tests/data/virtual-server-dos/syslog.yaml b/tests/data/virtual-server-dos/syslog.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: syslog
-          image: balabit/syslog-ng:3.38.1
+          image: balabit/syslog-ng:4.3.0
           ports:
             - containerPort: 514
             - containerPort: 601