This repository has been archived by the owner on May 24, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
15 changed files
with
96 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -158,6 +158,17 @@ jobs: | |
labels: | | ||
org.opencontainers.image.documentation=https://docs.nginx.com/nginx-ingress-controller | ||
org.opencontainers.image.vendor=NGINX Inc <[email protected]> | ||
- name: Output Variables | ||
id: var | ||
run: | | ||
version=${{ steps.meta.outputs.version }} | ||
if ${{ startsWith(github.ref, 'refs/tags/') }}; then | ||
operator_version=v$version | ||
else | ||
tag=$(git describe --tags --abbrev=0) | ||
operator_version=$tag-$version-${{ needs.vars.outputs.sha_short }} | ||
fi | ||
echo "::set-output name=version::$operator_version" | ||
- name: Build Image | ||
uses: docker/build-push-action@v2 | ||
with: | ||
|
@@ -171,6 +182,8 @@ jobs: | |
load: ${{ github.event_name == 'pull_request' }} | ||
push: ${{ github.event_name != 'pull_request' }} | ||
pull: true | ||
build-args: | | ||
VERSION=${{ steps.var.outputs.version }} | ||
- name: Run Trivy vulnerability scanner | ||
uses: aquasecurity/[email protected] | ||
continue-on-error: true | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,7 +25,8 @@ COPY config/crd/kic ./config/crd/kic | |
COPY LICENSE /licenses/ | ||
|
||
LABEL name="NGINX Ingress Operator" \ | ||
vendor="NGINX Inc <[email protected]" \ | ||
maintainer="[email protected]" \ | ||
vendor="NGINX Inc" \ | ||
version="v${VERSION}" \ | ||
release="1" \ | ||
summary="The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers" \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ metadata: | |
"image": { | ||
"pullPolicy": "Always", | ||
"repository": "docker.io/nginx/nginx-ingress", | ||
"tag": "2.0.0-ubi" | ||
"tag": "2.1.0-ubi" | ||
}, | ||
"ingressClass": "nginx", | ||
"nginxPlus": false, | ||
|
@@ -24,9 +24,16 @@ metadata: | |
} | ||
] | ||
capabilities: Basic Install | ||
categories: Monitoring, Networking | ||
certified: "true" | ||
containerImage: nginx/nginx-ingress-operator:0.5.0 | ||
description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which | ||
deploys and manages one or more NGINX/NGINX Plus Ingress Controllers | ||
operators.operatorframework.io/builder: operator-sdk-v1.15.0 | ||
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 | ||
name: nginx-ingress-operator.v0.4.0 | ||
repository: https://github.com/nginxinc/nginx-ingress-operator | ||
support: NGINX Inc. | ||
name: nginx-ingress-operator.v0.5.0 | ||
namespace: placeholder | ||
spec: | ||
apiservicedefinitions: {} | ||
|
@@ -52,6 +59,10 @@ spec: | |
true. | ||
displayName: App Protect | ||
path: appProtect | ||
- description: App Protect Dos support configuration. Requires enableCRDs set | ||
to true. | ||
displayName: App Protect Dos | ||
path: appProtectDos | ||
- description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ | ||
for more information about possible values. | ||
displayName: Config Map Data | ||
|
@@ -215,6 +226,7 @@ spec: | |
- update | ||
- apiGroups: | ||
- appprotect.f5.com | ||
- appprotectdos.f5.com | ||
- k8s.nginx.org | ||
resources: | ||
- '*' | ||
|
@@ -364,7 +376,7 @@ spec: | |
valueFrom: | ||
fieldRef: | ||
fieldPath: metadata.annotations['olm.targetNamespaces'] | ||
image: nginx/nginx-ingress-operator:0.4.0 | ||
image: nginx/nginx-ingress-operator:0.5.0 | ||
livenessProbe: | ||
httpGet: | ||
path: /healthz | ||
|
@@ -449,7 +461,8 @@ spec: | |
- email: [email protected] | ||
name: NGINX Inc | ||
maturity: alpha | ||
minKubeVersion: 1.19.0 | ||
provider: | ||
name: NGINX Inc | ||
replaces: nginx-ingress-operator.v0.2.0 | ||
version: 0.4.0 | ||
replaces: nginx-ingress-operator.v0.4.0 | ||
version: 0.5.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,13 @@ metadata: | |
annotations: | ||
alm-examples: '[]' | ||
capabilities: Basic Install | ||
categories: Monitoring, Networking | ||
certified: "true" | ||
containerImage: nginx/nginx-ingress-operator:0.5.0 | ||
description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which | ||
deploys and manages one or more NGINX/NGINX Plus Ingress Controllers | ||
repository: https://github.com/nginxinc/nginx-ingress-operator | ||
support: NGINX Inc. | ||
name: nginx-ingress-operator.v0.0.0 | ||
namespace: placeholder | ||
spec: | ||
|
@@ -30,6 +37,10 @@ spec: | |
true. | ||
displayName: App Protect | ||
path: appProtect | ||
- description: App Protect Dos support configuration. Requires enableCRDs set | ||
to true. | ||
displayName: App Protect Dos | ||
path: appProtectDos | ||
- description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ | ||
for more information about possible values. | ||
displayName: Config Map Data | ||
|
@@ -184,7 +195,8 @@ spec: | |
- email: [email protected] | ||
name: NGINX Inc | ||
maturity: alpha | ||
minKubeVersion: 1.19.0 | ||
provider: | ||
name: NGINX Inc | ||
replaces: nginx-ingress-operator.v0.2.0 | ||
replaces: nginx-ingress-operator.v0.4.0 | ||
version: 0.0.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters