diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 4afa881032..6fdc1f8773 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,5 +4,5 @@ contact_links: url: https://docs.nginx.com/nginx-ingress-controller about: Check out our documentation. - name: General inquiries - url: https://github.com/nginxinc/kubernetes-ingress/discussions + url: https://github.com/nginx/kubernetes-ingress/discussions about: Please use Discussions for all other questions. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c9afef021b..7b1e47f941 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,7 +7,7 @@ that issue here in this description (not in the title of the PR). Before creating a PR, run through this checklist and mark each as complete. -- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/kubernetes-ingress/blob/main/CONTRIBUTING.md) doc +- [ ] I have read the [CONTRIBUTING](https://github.com/nginx/kubernetes-ingress/blob/main/CONTRIBUTING.md) doc - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] I have checked that all unit tests pass after adding my changes - [ ] I have updated necessary documentation diff --git a/.github/config/config-oss-github b/.github/config/config-oss-github index 7a875b18d5..d3c9208e8c 100644 --- a/.github/config/config-oss-github +++ b/.github/config/config-oss-github @@ -1,5 +1,5 @@ export TARGET_REGISTRY=ghcr.io -export TARGET_OSS_IMAGE_PREFIX="nginxinc/kubernetes-ingress" +export TARGET_OSS_IMAGE_PREFIX="nginx/kubernetes-ingress" export PUBLISH_PLUS=false export PUBLISH_WAF=false export PUBLISH_DOS=false diff --git a/.github/config/config-plus-gcr-public b/.github/config/config-plus-gcr-public index 47accb500f..1ee0912dc4 100644 --- a/.github/config/config-plus-gcr-public +++ b/.github/config/config-plus-gcr-public @@ -1,9 +1,9 @@ export PUBLISH_OSS=false export PUBLISH_WAF_DOS=false export TARGET_REGISTRY=gcr.io/f5-7626-networks-public -export TARGET_PLUS_IMAGE_PREFIX=nginxinc/nginx-plus-ingress -export TARGET_NAP_WAF_IMAGE_PREFIX=nginxinc/nginx-plus-ingress-nap -export TARGET_NAP_DOS_IMAGE_PREFIX=nginxinc/nginx-plus-ingress-dos +export TARGET_PLUS_IMAGE_PREFIX=nginx/nginx-plus-ingress +export TARGET_NAP_WAF_IMAGE_PREFIX=nginx/nginx-plus-ingress-nap +export TARGET_NAP_DOS_IMAGE_PREFIX=nginx/nginx-plus-ingress-dos declare -a PLUS_TAG_POSTFIX_LIST=("") declare -a NAP_WAF_TAG_POSTFIX_LIST=("") declare -a NAP_WAFV5_TAG_POSTFIX_LIST=() diff --git a/.github/workflows/build-oss.yml b/.github/workflows/build-oss.yml index 9ba58cf79c..a21909c7e6 100644 --- a/.github/workflows/build-oss.yml +++ b/.github/workflows/build-oss.yml @@ -87,7 +87,7 @@ jobs: type=raw,value=${{ inputs.tag }} labels: | org.opencontainers.image.description=NGINX Ingress Controller for Kubernetes - io.artifacthub.package.readme-url=https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/main/README.md + io.artifacthub.package.readme-url=https://raw.githubusercontent.com/nginx/kubernetes-ingress/main/README.md io.artifacthub.package.logo-url=https://docs.nginx.com/nginx-ingress-controller/images/icons/NGINX-Ingress-Controller-product-icon.svg io.artifacthub.package.maintainers=[{"name":"NGINX Inc","email":"kubernetes@nginx.com"}] io.artifacthub.package.license=Apache-2.0 diff --git a/.github/workflows/build-ot-dependency.yml b/.github/workflows/build-ot-dependency.yml index ddefeec915..0b39e88c47 100644 --- a/.github/workflows/build-ot-dependency.yml +++ b/.github/workflows/build-ot-dependency.yml @@ -72,7 +72,7 @@ jobs: uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 with: images: | - name=ghcr.io/nginxinc/dependencies/nginx-ot,enable=true + name=ghcr.io/nginx/dependencies/nginx-ot,enable=true flavor: suffix=${{ matrix.os != 'debian' && format('-{0}', matrix.os) || '' }},onlatest=true tags: | type=raw,value=nginx-${{ steps.var.outputs.nginx_version }},enable=true diff --git a/.github/workflows/build-ubi-dependency.yml b/.github/workflows/build-ubi-dependency.yml index 9d0c2b1295..d2b7979586 100644 --- a/.github/workflows/build-ubi-dependency.yml +++ b/.github/workflows/build-ubi-dependency.yml @@ -19,7 +19,7 @@ on: default: false env: - IMAGE_NAME: ghcr.io/nginxinc/dependencies/nginx-ubi-ppc64le + IMAGE_NAME: ghcr.io/nginx/dependencies/nginx-ubi-ppc64le concurrency: group: ${{ github.ref_name }}-ubi-ppc64le-build diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4996635bd..33b409ece8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,7 @@ jobs: source .github/data/version.txt echo "ic_version=${IC_VERSION}" >> $GITHUB_OUTPUT echo "chart_version=${HELM_CHART_VERSION}" >> $GITHUB_OUTPUT - echo "forked_workflow=${{ (github.event.pull_request && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name) || github.repository != 'nginxinc/kubernetes-ingress' }}" >> $GITHUB_OUTPUT + echo "forked_workflow=${{ (github.event.pull_request && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name) || github.repository != 'nginx/kubernetes-ingress' }}" >> $GITHUB_OUTPUT ./.github/scripts/variables.sh go_code_md5 >> $GITHUB_OUTPUT ./.github/scripts/variables.sh docker_md5 >> $GITHUB_OUTPUT ./.github/scripts/variables.sh build_tag >> $GITHUB_OUTPUT @@ -192,9 +192,9 @@ jobs: - name: Check if Codegen changed run: | - cd ../.. && mkdir -p github.com/nginxinc && mv kubernetes-ingress/kubernetes-ingress github.com/nginxinc/ && cd github.com/nginxinc/kubernetes-ingress + cd ../.. && mkdir -p github.com/nginx && mv kubernetes-ingress/kubernetes-ingress github.com/nginx/ && cd github.com/nginx/kubernetes-ingress make update-codegen && git diff --name-only --exit-code pkg/** - cd ../../.. && mv github.com/nginxinc/kubernetes-ingress kubernetes-ingress/kubernetes-ingress + cd ../../.. && mv github.com/nginx/kubernetes-ingress kubernetes-ingress/kubernetes-ingress - name: Install gofumpt run: go install mvdan.cc/gofumpt@latest diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index a16c0d2f0d..3fb7152755 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -26,6 +26,6 @@ jobs: - name: "Dependency Review" uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 with: - config-file: "nginxinc/k8s-common/dependency-review-config.yml@main" + config-file: "nginx/k8s-common/dependency-review-config.yml@main" base-ref: ${{ github.event.pull_request.base.sha || github.event.repository.default_branch }} head-ref: ${{ github.event.pull_request.base.sha || github.ref }} diff --git a/.github/workflows/image-promotion.yml b/.github/workflows/image-promotion.yml index 3cbbe1e0d1..2c8d033ebf 100644 --- a/.github/workflows/image-promotion.yml +++ b/.github/workflows/image-promotion.yml @@ -680,13 +680,13 @@ jobs: helm-chart=${{ needs.checks.outputs.chart_version }} notes-footer: | ## Upgrade - - For NGINX, use the {{version}} images from our [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name={{version-number}}), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress). + - For NGINX, use the {{version}} images from our [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name={{version-number}}), [GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress). - For NGINX Plus, use the {{version}} images from the F5 Container registry, the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE), the [GCP Marketplace](https://console.cloud.google.com/marketplace/browse?filter=partner:F5,%20Inc.&filter=solution-type:k8s&filter=category:networking), [Azure Marketplace](https://azuremarketplace.microsoft.com/en-gb/marketplace/apps/category/containers?page=1&search=f5&subcategories=container-apps) or build your own image using the {{version}} source code. - For Helm, use version {{helm-chart}} of the chart. ## Resources - Documentation -- https://docs.nginx.com/nginx-ingress-controller/ - - Configuration examples -- https://github.com/nginxinc/kubernetes-ingress/tree/{{version}}/examples - - Helm Chart -- https://github.com/nginxinc/kubernetes-ingress/tree/{{version}}/deployments/helm-chart - - Operator -- https://github.com/nginxinc/nginx-ingress-helm-operator + - Configuration examples -- https://github.com/nginx/kubernetes-ingress/tree/{{version}}/examples + - Helm Chart -- https://github.com/nginx/kubernetes-ingress/tree/{{version}}/deployments/helm-chart + - Operator -- https://github.com/nginx/nginx-ingress-helm-operator if: ${{ github.event_name == 'push' && contains(github.ref_name, 'release-') }} diff --git a/.github/workflows/issues.yaml b/.github/workflows/issues.yaml index 8c9a37ccb5..7473a41b54 100644 --- a/.github/workflows/issues.yaml +++ b/.github/workflows/issues.yaml @@ -20,7 +20,7 @@ jobs: id: controller if: contains(github.event.issue.body, 'nginx.ingress.kubernetes.io') run: | - text="\n\n I\'ve parsed the text of your issue and it looks like you might be mixing up the two Ingress Controllers, please take a look at this [page](https://docs.nginx.com/nginx-ingress-controller/intro/nginx-ingress-controllers) to see the differences between \`nginxinc/kubernetes-ingress\` (this repo) and \`kubernetes/ingress-nginx\`." + text="\n\n I\'ve parsed the text of your issue and it looks like you might be mixing up the two Ingress Controllers, please take a look at this [page](https://docs.nginx.com/nginx-ingress-controller/intro/nginx-ingress-controllers) to see the differences between \`nginx/kubernetes-ingress\` (this repo) and \`kubernetes/ingress-nginx\`." echo "text=$text" >> $GITHUB_OUTPUT - name: Check if Issue author is Org member @@ -53,5 +53,5 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - body: 'Hi @${{github.event.issue.user.login}} thanks for reporting! \n\n Be sure to check out the [docs](https://docs.nginx.com/nginx-ingress-controller) and the [Contributing Guidelines](https://github.com/nginxinc/kubernetes-ingress/blob/main/CONTRIBUTING.md) while you wait for a human to take a look at this :slightly_smiling_face:${{ steps.controller.outputs.text }}\n\n Cheers!' + body: 'Hi @${{github.event.issue.user.login}} thanks for reporting! \n\n Be sure to check out the [docs](https://docs.nginx.com/nginx-ingress-controller) and the [Contributing Guidelines](https://github.com/nginx/kubernetes-ingress/blob/main/CONTRIBUTING.md) while you wait for a human to take a look at this :slightly_smiling_face:${{ steps.controller.outputs.text }}\n\n Cheers!' }) diff --git a/.github/workflows/publish-helm.yml b/.github/workflows/publish-helm.yml index be31ee00a9..85bfda65fa 100644 --- a/.github/workflows/publish-helm.yml +++ b/.github/workflows/publish-helm.yml @@ -85,7 +85,7 @@ jobs: - name: Push to OCI registries run: | - helm push ${{ steps.package.outputs.path }} oci://ghcr.io/nginxinc/charts + helm push ${{ steps.package.outputs.path }} oci://ghcr.io/nginx/charts helm push ${{ steps.package.outputs.path }} oci://registry-1.docker.io/nginxcharts - name: Checkout Repository diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e87afaea1..2ee2771c19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -404,19 +404,19 @@ jobs: role-to-assume: ${{ secrets.AWS_ROLE_MARKETPLACE }} - name: Publish to AWS Marketplace - uses: nginxinc/aws-marketplace-publish@108e752101152582ed409c5faed859a891e0d7aa # v1.0.7 + uses: nginx/aws-marketplace-publish@accf7b4c725796b744f2ee27acc2488d76f63d32 # v1.0.8 continue-on-error: true with: version: ${{ inputs.nic_version }} product-id: ${{ secrets[matrix.product_id] }} registry: ${{ matrix.image }} - release-notes: https://github.com/nginxinc/kubernetes-ingress/releases/tag/v${{ inputs.nic_version }} + release-notes: https://github.com/nginx/kubernetes-ingress/releases/tag/v${{ inputs.nic_version }} description: | Best-in-class traffic management solution for services in Amazon EKS. This is the official implementation of NGINX Ingress Controller (based on NGINX Plus) from NGINX. usage-instructions: | This container requires Kubernetes and can be deployed to EKS. - Review the installation instructions https://docs.nginx.com/nginx-ingress-controller/installation/ and utilize the deployment resources available https://github.com/nginxinc/kubernetes-ingress/tree/v${{ inputs.nic_version }}/deployments + Review the installation instructions https://docs.nginx.com/nginx-ingress-controller/installation/ and utilize the deployment resources available https://github.com/nginx/kubernetes-ingress/tree/v${{ inputs.nic_version }}/deployments Use this image instead of building your own. binaries: @@ -601,7 +601,7 @@ jobs: "type": "section", "text": { "type": "mrkdwn", - "text": "NGINX Ingress Controller v${{ inputs.nic_version }} is out! Check it out: https://github.com/nginxinc/kubernetes-ingress/releases/tag/v${{ inputs.nic_version }}" + "text": "NGINX Ingress Controller v${{ inputs.nic_version }} is out! Check it out: https://github.com/nginx/kubernetes-ingress/releases/tag/v${{ inputs.nic_version }}" } } ] diff --git a/.github/workflows/update-release-draft.yml b/.github/workflows/update-release-draft.yml index bf5c1cd2bb..a32f860d85 100644 --- a/.github/workflows/update-release-draft.yml +++ b/.github/workflows/update-release-draft.yml @@ -72,12 +72,12 @@ jobs: helm-chart=${{ needs.variables.outputs.chart_version }} notes-footer: | ## Upgrade - - For NGINX, use the {{version}} images from our [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name={{version-number}}), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress). + - For NGINX, use the {{version}} images from our [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name={{version-number}}), [GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress). - For NGINX Plus, use the {{version}} images from the F5 Container registry, the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE), the [GCP Marketplace](https://console.cloud.google.com/marketplace/browse?filter=partner:F5,%20Inc.&filter=solution-type:k8s&filter=category:networking), [Azure Marketplace](https://azuremarketplace.microsoft.com/en-gb/marketplace/apps/category/containers?page=1&search=f5&subcategories=container-apps) or build your own image using the {{version}} source code. - For Helm, use version {{helm-chart}} of the chart. ## Resources - Documentation -- https://docs.nginx.com/nginx-ingress-controller/ - - Configuration examples -- https://github.com/nginxinc/kubernetes-ingress/tree/{{version}}/examples - - Helm Chart -- https://github.com/nginxinc/kubernetes-ingress/tree/{{version}}/deployments/helm-chart - - Operator -- https://github.com/nginxinc/nginx-ingress-helm-operator + - Configuration examples -- https://github.com/nginx/kubernetes-ingress/tree/{{version}}/examples + - Helm Chart -- https://github.com/nginx/kubernetes-ingress/tree/{{version}}/deployments/helm-chart + - Operator -- https://github.com/nginx/nginx-ingress-helm-operator diff --git a/CHANGELOG.md b/CHANGELOG.md index 67707865a9..7a174e481d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -Starting with version 1.11.0, an automatically generated list of changes can be found on the [GitHub Releases page](https://github.com/nginxinc/kubernetes-ingress/releases). +Starting with version 1.11.0, an automatically generated list of changes can be found on the [GitHub Releases page](https://github.com/nginx/kubernetes-ingress/releases). A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website. @@ -11,9 +11,9 @@ CHANGES: - Update NGINX version to 1.19.8. - Add Kubernetes 1.20 support. -- [1373](https://github.com/nginxinc/kubernetes-ingress/pull/1373), - [1439](https://github.com/nginxinc/kubernetes-ingress/pull/1439), - [1440](https://github.com/nginxinc/kubernetes-ingress/pull/1440): Fix various issues in the Makefile. In 1.10.0, a bug +- [1373](https://github.com/nginx/kubernetes-ingress/pull/1373), + [1439](https://github.com/nginx/kubernetes-ingress/pull/1439), + [1440](https://github.com/nginx/kubernetes-ingress/pull/1440): Fix various issues in the Makefile. In 1.10.0, a bug was introduced that prevented building Ingress Controller images on versions of make < 4.1. HELM CHART: @@ -44,57 +44,57 @@ You will find the complete changelog for release 1.10.0, including bug fixes, im FEATURES FOR POLICY RESOURCE: -- [1304](https://github.com/nginxinc/kubernetes-ingress/pull/1304) Add Open ID Connect policy. +- [1304](https://github.com/nginx/kubernetes-ingress/pull/1304) Add Open ID Connect policy. FEATURES FOR NGINX APP PROTECT: -- [1281](https://github.com/nginxinc/kubernetes-ingress/pull/1281) Add support for App Protect User Defined Signatures. +- [1281](https://github.com/nginx/kubernetes-ingress/pull/1281) Add support for App Protect User Defined Signatures. FEATURES: -- [1266](https://github.com/nginxinc/kubernetes-ingress/pull/1266) Add workqueue metrics to Prometheus metrics. -- [1233](https://github.com/nginxinc/kubernetes-ingress/pull/1233) Annotate tcp metrics with k8s object labels. -- [1231](https://github.com/nginxinc/kubernetes-ingress/pull/1231) Support k8s objects variables in log format. +- [1266](https://github.com/nginx/kubernetes-ingress/pull/1266) Add workqueue metrics to Prometheus metrics. +- [1233](https://github.com/nginx/kubernetes-ingress/pull/1233) Annotate tcp metrics with k8s object labels. +- [1231](https://github.com/nginx/kubernetes-ingress/pull/1231) Support k8s objects variables in log format. IMPROVEMENTS: -- [1270](https://github.com/nginxinc/kubernetes-ingress/pull/1270) and - [1277](https://github.com/nginxinc/kubernetes-ingress/pull/1277) Improve validation of Ingress annotations. -- [1265](https://github.com/nginxinc/kubernetes-ingress/pull/1265) Report warnings for misconfigured TLS and JWK +- [1270](https://github.com/nginx/kubernetes-ingress/pull/1270) and + [1277](https://github.com/nginx/kubernetes-ingress/pull/1277) Improve validation of Ingress annotations. +- [1265](https://github.com/nginx/kubernetes-ingress/pull/1265) Report warnings for misconfigured TLS and JWK secrets. -- [1262](https://github.com/nginxinc/kubernetes-ingress/pull/1262) Use setcap(8) only once. - [1263](https://github.com/nginxinc/kubernetes-ingress/pull/1263) Use chown(8) only once. - [1264](https://github.com/nginxinc/kubernetes-ingress/pull/1264) Use mkdir(1) only once. Thanks to [Sergey A. +- [1262](https://github.com/nginx/kubernetes-ingress/pull/1262) Use setcap(8) only once. + [1263](https://github.com/nginx/kubernetes-ingress/pull/1263) Use chown(8) only once. + [1264](https://github.com/nginx/kubernetes-ingress/pull/1264) Use mkdir(1) only once. Thanks to [Sergey A. Osokin](https://github.com/osokin). -- [1256](https://github.com/nginxinc/kubernetes-ingress/pull/1256) and - [1260](https://github.com/nginxinc/kubernetes-ingress/pull/1260) Improve handling of secret resources. -- [1240](https://github.com/nginxinc/kubernetes-ingress/pull/1240) Validate TLS and CA secrets. -- [1235](https://github.com/nginxinc/kubernetes-ingress/pull/1235) Use buildkit secret flag for NGINX plus images. -- Documentation improvements: [1282](https://github.com/nginxinc/kubernetes-ingress/pull/1282), - [1293](https://github.com/nginxinc/kubernetes-ingress/pull/1293), - [1303](https://github.com/nginxinc/kubernetes-ingress/pull/1303), - [1315](https://github.com/nginxinc/kubernetes-ingress/pull/1315). +- [1256](https://github.com/nginx/kubernetes-ingress/pull/1256) and + [1260](https://github.com/nginx/kubernetes-ingress/pull/1260) Improve handling of secret resources. +- [1240](https://github.com/nginx/kubernetes-ingress/pull/1240) Validate TLS and CA secrets. +- [1235](https://github.com/nginx/kubernetes-ingress/pull/1235) Use buildkit secret flag for NGINX plus images. +- Documentation improvements: [1282](https://github.com/nginx/kubernetes-ingress/pull/1282), + [1293](https://github.com/nginx/kubernetes-ingress/pull/1293), + [1303](https://github.com/nginx/kubernetes-ingress/pull/1303), + [1315](https://github.com/nginx/kubernetes-ingress/pull/1315). HELM CHART: - The version of the helm chart is now 0.8.0. -- [1290](https://github.com/nginxinc/kubernetes-ingress/pull/1290) Add new preview policies parameter to chart. +- [1290](https://github.com/nginx/kubernetes-ingress/pull/1290) Add new preview policies parameter to chart. `controller.enablePreviewPolicies` was added. -- [1232](https://github.com/nginxinc/kubernetes-ingress/pull/1232) Replace deprecated imagePullSecrets helm setting. +- [1232](https://github.com/nginx/kubernetes-ingress/pull/1232) Replace deprecated imagePullSecrets helm setting. `controller.serviceAccount.imagePullSecrets` was removed. `controller.serviceAccount.imagePullSecretName` was added. -- [1228](https://github.com/nginxinc/kubernetes-ingress/pull/1228) Fix installation of ingressclass on Kubernetes +- [1228](https://github.com/nginx/kubernetes-ingress/pull/1228) Fix installation of ingressclass on Kubernetes versions `v1.18.x-*` CHANGES: -- [1299](https://github.com/nginxinc/kubernetes-ingress/pull/1299) Update NGINX App Protect version to 2.3 and debian +- [1299](https://github.com/nginx/kubernetes-ingress/pull/1299) Update NGINX App Protect version to 2.3 and debian distribution to `debian:buster-slim`. -- [1291](https://github.com/nginxinc/kubernetes-ingress/pull/1291) Update NGINX OSS to `1.19.6`. Update NGINX Plus to +- [1291](https://github.com/nginx/kubernetes-ingress/pull/1291) Update NGINX OSS to `1.19.6`. Update NGINX Plus to `R23`. -- [1290](https://github.com/nginxinc/kubernetes-ingress/pull/1290) Graduate policy resource and accessControl policy to +- [1290](https://github.com/nginx/kubernetes-ingress/pull/1290) Graduate policy resource and accessControl policy to generally available. -- [1225](https://github.com/nginxinc/kubernetes-ingress/pull/1225) Require secrets to have types. -- [1237](https://github.com/nginxinc/kubernetes-ingress/pull/1237) Deprecate support for helm2 clients. +- [1225](https://github.com/nginx/kubernetes-ingress/pull/1225) Require secrets to have types. +- [1237](https://github.com/nginx/kubernetes-ingress/pull/1237) Deprecate support for helm2 clients. UPGRADE: @@ -102,8 +102,8 @@ UPGRADE: or `nginx-ingress:1.10.0-ubi` - For NGINX Plus, please build your own image using the 1.10.0 source code. - For Helm, use version 0.8.0 of the chart. -- As a result of [1270](https://github.com/nginxinc/kubernetes-ingress/pull/1270) and - [1277](https://github.com/nginxinc/kubernetes-ingress/pull/1277), the Ingress Controller improved validation of +- As a result of [1270](https://github.com/nginx/kubernetes-ingress/pull/1270) and + [1277](https://github.com/nginx/kubernetes-ingress/pull/1277), the Ingress Controller improved validation of Ingress annotations: more annotations are validated and validation errors are reported via events for Ingress resources. Additionally, the default behavior for invalid annotation values was changed: instead of using the default values, the Ingress Controller will reject a resource with an invalid annotation value, which will make clients see @@ -111,7 +111,7 @@ UPGRADE: [document](https://docs.nginx.com/nginx-ingress-controller/configuration/ingress-resources/advanced-configuration-with-annotations/#validation) to learn more. Before upgrading, ensure the Ingress resources don't have annotations with invalid values. Otherwise, after the upgrade, the Ingress Controller will reject such resources. -- In [1232](https://github.com/nginxinc/kubernetes-ingress/pull/1232) `controller.serviceAccount.imagePullSecrets` was +- In [1232](https://github.com/nginx/kubernetes-ingress/pull/1232) `controller.serviceAccount.imagePullSecrets` was removed. Use the new `controller.serviceAccount.imagePullSecretName` instead. - The Policy resource was promoted to `v1`. If you used the `alpha1` version, the policies are needed to be recreated with the `v1` version. Before upgrading the Ingress Controller, run the following command to remove the `alpha1` @@ -133,7 +133,7 @@ UPGRADE: UPDATING SECRETS: -In [1225](https://github.com/nginxinc/kubernetes-ingress/pull/1225), as part of improving how the Ingress Controller +In [1225](https://github.com/nginx/kubernetes-ingress/pull/1225), as part of improving how the Ingress Controller handles secret resources, we added a requirement for secrets to be of one of the following types: - `kubernetes.io/tls` for TLS secrets. @@ -213,69 +213,69 @@ You will find the complete changelog for release 1.9.0, including bug fixes, imp FEATURES FOR POLICY RESOURCE: -- [1180](https://github.com/nginxinc/kubernetes-ingress/pull/1180) Add support for EgressMTLS. -- [1166](https://github.com/nginxinc/kubernetes-ingress/pull/1166) Add IngressMTLS policy support. -- [1154](https://github.com/nginxinc/kubernetes-ingress/pull/1154) Add JWT policy support. -- [1120](https://github.com/nginxinc/kubernetes-ingress/pull/1120) Add RateLimit policy support. -- [1058](https://github.com/nginxinc/kubernetes-ingress/pull/1058) Support policies in VS routes and VSR subroutes. +- [1180](https://github.com/nginx/kubernetes-ingress/pull/1180) Add support for EgressMTLS. +- [1166](https://github.com/nginx/kubernetes-ingress/pull/1166) Add IngressMTLS policy support. +- [1154](https://github.com/nginx/kubernetes-ingress/pull/1154) Add JWT policy support. +- [1120](https://github.com/nginx/kubernetes-ingress/pull/1120) Add RateLimit policy support. +- [1058](https://github.com/nginx/kubernetes-ingress/pull/1058) Support policies in VS routes and VSR subroutes. FEATURES FOR NGINX APP PROTECT: -- [1147](https://github.com/nginxinc/kubernetes-ingress/pull/1147) Add option to specify other log destinations in +- [1147](https://github.com/nginx/kubernetes-ingress/pull/1147) Add option to specify other log destinations in AppProtect. -- [1131](https://github.com/nginxinc/kubernetes-ingress/pull/1131) Update packages and CRDs to AppProtect 2.0. This +- [1131](https://github.com/nginx/kubernetes-ingress/pull/1131) Update packages and CRDs to AppProtect 2.0. This update includes features such as: [JSON Schema Validation](https://docs.nginx.com/nginx-app-protect/configuration#applying-a-json-schema), [User-Defined URLs](https://docs.nginx.com/nginx-app-protect/configuration/#user-defined-urls) and [User-Defined Parameters](https://docs.nginx.com/nginx-app-protect/configuration/#user-defined-parameters). See the [release notes](https://docs.nginx.com/nginx-app-protect/releases/#release-2-0) for a complete feature list. -- [1100](https://github.com/nginxinc/kubernetes-ingress/pull/1100) Add external references to AppProtect. -- [1085](https://github.com/nginxinc/kubernetes-ingress/pull/1085) Add installation of threat campaigns package. +- [1100](https://github.com/nginx/kubernetes-ingress/pull/1100) Add external references to AppProtect. +- [1085](https://github.com/nginx/kubernetes-ingress/pull/1085) Add installation of threat campaigns package. FEATURES: -- [1133](https://github.com/nginxinc/kubernetes-ingress/pull/1133) Add support for IngressClass resources. -- [1130](https://github.com/nginxinc/kubernetes-ingress/pull/1130) Add prometheus latency collector. -- [1076](https://github.com/nginxinc/kubernetes-ingress/pull/1076) Add prometheus worker process metrics. -- [1075](https://github.com/nginxinc/kubernetes-ingress/pull/1075) Add support for NGINX Service Mesh internal routes. +- [1133](https://github.com/nginx/kubernetes-ingress/pull/1133) Add support for IngressClass resources. +- [1130](https://github.com/nginx/kubernetes-ingress/pull/1130) Add prometheus latency collector. +- [1076](https://github.com/nginx/kubernetes-ingress/pull/1076) Add prometheus worker process metrics. +- [1075](https://github.com/nginx/kubernetes-ingress/pull/1075) Add support for NGINX Service Mesh internal routes. IMPROVEMENTS: -- [1178](https://github.com/nginxinc/kubernetes-ingress/pull/1178) Resolve host collisions in VirtualServer and +- [1178](https://github.com/nginx/kubernetes-ingress/pull/1178) Resolve host collisions in VirtualServer and Ingresses. -- [1158](https://github.com/nginxinc/kubernetes-ingress/pull/1158) Support variables in action proxy headers. -- [1137](https://github.com/nginxinc/kubernetes-ingress/pull/1137) Add pod_owner label to metrics when +- [1158](https://github.com/nginx/kubernetes-ingress/pull/1158) Support variables in action proxy headers. +- [1137](https://github.com/nginx/kubernetes-ingress/pull/1137) Add pod_owner label to metrics when -spire-agent-address is set. -- [1107](https://github.com/nginxinc/kubernetes-ingress/pull/1107) Extend Upstream Servers with pod_name label. -- [1099](https://github.com/nginxinc/kubernetes-ingress/pull/1099) Add reason label to total_reload metrics. -- [1088](https://github.com/nginxinc/kubernetes-ingress/pull/1088) Extend Upstream Servers and Server Zones metrics, +- [1107](https://github.com/nginx/kubernetes-ingress/pull/1107) Extend Upstream Servers with pod_name label. +- [1099](https://github.com/nginx/kubernetes-ingress/pull/1099) Add reason label to total_reload metrics. +- [1088](https://github.com/nginx/kubernetes-ingress/pull/1088) Extend Upstream Servers and Server Zones metrics, thanks to [Raúl](https://github.com/Rulox). -- [1080](https://github.com/nginxinc/kubernetes-ingress/pull/1080) Support pathType field in the Ingress resource. -- [1078](https://github.com/nginxinc/kubernetes-ingress/pull/1078) Remove trailing blank lines in vs/vsr snippets. -- Documentation improvements: [1083](https://github.com/nginxinc/kubernetes-ingress/pull/1083), - [1092](https://github.com/nginxinc/kubernetes-ingress/pull/1092), - [1089](https://github.com/nginxinc/kubernetes-ingress/pull/1089), - [1174](https://github.com/nginxinc/kubernetes-ingress/pull/1174), - [1175](https://github.com/nginxinc/kubernetes-ingress/pull/1175), - [1171](https://github.com/nginxinc/kubernetes-ingress/pull/1171). +- [1080](https://github.com/nginx/kubernetes-ingress/pull/1080) Support pathType field in the Ingress resource. +- [1078](https://github.com/nginx/kubernetes-ingress/pull/1078) Remove trailing blank lines in vs/vsr snippets. +- Documentation improvements: [1083](https://github.com/nginx/kubernetes-ingress/pull/1083), + [1092](https://github.com/nginx/kubernetes-ingress/pull/1092), + [1089](https://github.com/nginx/kubernetes-ingress/pull/1089), + [1174](https://github.com/nginx/kubernetes-ingress/pull/1174), + [1175](https://github.com/nginx/kubernetes-ingress/pull/1175), + [1171](https://github.com/nginx/kubernetes-ingress/pull/1171). BUGFIXES: -- [1179](https://github.com/nginxinc/kubernetes-ingress/pull/1179) Fix TransportServers in debian AppProtect image. -- [1129](https://github.com/nginxinc/kubernetes-ingress/pull/1129) Support real-ip in default server. -- [1110](https://github.com/nginxinc/kubernetes-ingress/pull/1110) Add missing threat campaigns key to AppProtect CRD. +- [1179](https://github.com/nginx/kubernetes-ingress/pull/1179) Fix TransportServers in debian AppProtect image. +- [1129](https://github.com/nginx/kubernetes-ingress/pull/1129) Support real-ip in default server. +- [1110](https://github.com/nginx/kubernetes-ingress/pull/1110) Add missing threat campaigns key to AppProtect CRD. HELM CHART: - The version of the helm chart is now 0.7.0 -- [1105](https://github.com/nginxinc/kubernetes-ingress/pull/1105) Fix GlobalConfiguration support in helm chart. +- [1105](https://github.com/nginx/kubernetes-ingress/pull/1105) Fix GlobalConfiguration support in helm chart. - Add new parameters to the Chart: `controller.setAsDefaultIngress`, `controller.enableLatencyMetrics`. Added in - [1133](https://github.com/nginxinc/kubernetes-ingress/pull/1133) and - [1148](https://github.com/nginxinc/kubernetes-ingress/pull/1148). + [1133](https://github.com/nginx/kubernetes-ingress/pull/1133) and + [1148](https://github.com/nginx/kubernetes-ingress/pull/1148). CHANGES: -- [1182](https://github.com/nginxinc/kubernetes-ingress/pull/1182) Update NGINX version to 1.19.3. +- [1182](https://github.com/nginx/kubernetes-ingress/pull/1182) Update NGINX version to 1.19.3. UPGRADE: @@ -346,31 +346,31 @@ You will find the complete changelog for release 1.8.0, including bug fixes, imp FEATURES FOR VIRTUALSERVER AND VIRTUALSERVERROUTE RESOURCES: -- [1036](https://github.com/nginxinc/kubernetes-ingress/pull/1036): Add VirtualServer custom template support. -- [1028](https://github.com/nginxinc/kubernetes-ingress/pull/1028): Add access control policy. -- [1019](https://github.com/nginxinc/kubernetes-ingress/pull/1019): Add VirtualServer/VirtualServerRoute snippets +- [1036](https://github.com/nginx/kubernetes-ingress/pull/1036): Add VirtualServer custom template support. +- [1028](https://github.com/nginx/kubernetes-ingress/pull/1028): Add access control policy. +- [1019](https://github.com/nginx/kubernetes-ingress/pull/1019): Add VirtualServer/VirtualServerRoute snippets support. -- [1006](https://github.com/nginxinc/kubernetes-ingress/pull/1006): Add request/response modifiers to VS and VSR. -- [994](https://github.com/nginxinc/kubernetes-ingress/pull/994): Support Class Field in VS/VSR. -- [973](https://github.com/nginxinc/kubernetes-ingress/pull/973): Add status to VirtualServer and VirtualServerRoute. +- [1006](https://github.com/nginx/kubernetes-ingress/pull/1006): Add request/response modifiers to VS and VSR. +- [994](https://github.com/nginx/kubernetes-ingress/pull/994): Support Class Field in VS/VSR. +- [973](https://github.com/nginx/kubernetes-ingress/pull/973): Add status to VirtualServer and VirtualServerRoute. FEATURES: -- [1035](https://github.com/nginxinc/kubernetes-ingress/pull/1035): Support for App Protect module. -- [1029](https://github.com/nginxinc/kubernetes-ingress/pull/1029): Add readiness endpoint. +- [1035](https://github.com/nginx/kubernetes-ingress/pull/1035): Support for App Protect module. +- [1029](https://github.com/nginx/kubernetes-ingress/pull/1029): Add readiness endpoint. IMPROVEMENTS: -- [995](https://github.com/nginxinc/kubernetes-ingress/pull/995): Emit event for orphaned VirtualServerRoutes. -- Documentation improvements: [946](https://github.com/nginxinc/kubernetes-ingress/pull/946) thanks to [谭九 - 鼎](https://github.com/imba-tjd), [948](https://github.com/nginxinc/kubernetes-ingress/pull/948), - [972](https://github.com/nginxinc/kubernetes-ingress/pull/972), - [965](https://github.com/nginxinc/kubernetes-ingress/pull/965). +- [995](https://github.com/nginx/kubernetes-ingress/pull/995): Emit event for orphaned VirtualServerRoutes. +- Documentation improvements: [946](https://github.com/nginx/kubernetes-ingress/pull/946) thanks to [谭九 + 鼎](https://github.com/imba-tjd), [948](https://github.com/nginx/kubernetes-ingress/pull/948), + [972](https://github.com/nginx/kubernetes-ingress/pull/972), + [965](https://github.com/nginx/kubernetes-ingress/pull/965). BUGFIXES: -- [1030](https://github.com/nginxinc/kubernetes-ingress/pull/1030): Fix port range validation in cli arguments. -- [953](https://github.com/nginxinc/kubernetes-ingress/pull/953): Fix error logging of master/minion ingresses. +- [1030](https://github.com/nginx/kubernetes-ingress/pull/1030): Fix port range validation in cli arguments. +- [953](https://github.com/nginx/kubernetes-ingress/pull/953): Fix error logging of master/minion ingresses. HELM CHART: @@ -378,13 +378,13 @@ HELM CHART: - Add new parameters to the Chart: `controller.appprotect.enable`, `controller.globalConfiguration.create`, `controller.globalConfiguration.spec`, `controller.readyStatus.enable`, `controller.readyStatus.port`, `controller.config.annotations`, `controller.reportIngressStatus.annotations`. Added in - [1035](https://github.com/nginxinc/kubernetes-ingress/pull/1035), - [1034](https://github.com/nginxinc/kubernetes-ingress/pull/1034), - [1029](https://github.com/nginxinc/kubernetes-ingress/pull/1029), - [1003](https://github.com/nginxinc/kubernetes-ingress/pull/1003) thanks to + [1035](https://github.com/nginx/kubernetes-ingress/pull/1035), + [1034](https://github.com/nginx/kubernetes-ingress/pull/1034), + [1029](https://github.com/nginx/kubernetes-ingress/pull/1029), + [1003](https://github.com/nginx/kubernetes-ingress/pull/1003) thanks to [RubyLangdon](https://github.com/RubyLangdon). -- [1047](https://github.com/nginxinc/kubernetes-ingress/pull/1047) and - [1009](https://github.com/nginxinc/kubernetes-ingress/pull/1009): Change how Helm manages the custom resource +- [1047](https://github.com/nginx/kubernetes-ingress/pull/1047) and + [1009](https://github.com/nginx/kubernetes-ingress/pull/1009): Change how Helm manages the custom resource definitions (CRDs) to support installing multiple Ingress Controller releases. **Note**: If you're using the custom resources (`controller.enableCustomResources` is set to `true`), this is a breaking change. See the HELM UPGRADE section below for the upgrade instructions. @@ -393,11 +393,11 @@ CHANGES: - Update NGINX version to 1.19.1. - Update NGINX Plus to R22. -- [1029](https://github.com/nginxinc/kubernetes-ingress/pull/1029): Add readiness endpoint. The Ingress Controller now +- [1029](https://github.com/nginx/kubernetes-ingress/pull/1029): Add readiness endpoint. The Ingress Controller now exposes a readiness endpoint on port `8081` and the path `/nginx-ready`. The endpoint returns a `200` response after the Ingress Controller finishes the initial configuration of NGINX at the start. The pod template was updated to use that endpoint in a readiness probe. -- [980](https://github.com/nginxinc/kubernetes-ingress/pull/980): Enable leader election by default. +- [980](https://github.com/nginx/kubernetes-ingress/pull/980): Enable leader election by default. UPGRADE: @@ -468,7 +468,7 @@ Release 1.7.0 includes: - Improved validation of VirtualServer and VirtualServerRoute resources. kubectl and the Kubernetes API server can now detect violations of the structure of VirtualServer/VirtualServerRoute resources and return an error. - Support for an operator which manages the lifecycle of the Ingress Controller on Kubernetes or OpenShift. See the - [NGINX Ingress Operator GitHub repo](https://github.com/nginxinc/nginx-ingress-operator). + [NGINX Ingress Operator GitHub repo](https://github.com/nginx/nginx-ingress-operator). See the [1.7.0 release announcement blog post](https://www.nginx.com/blog/announcing-nginx-ingress-controller-for-kubernetes-release-1-7-0/), which includes an @@ -478,54 +478,54 @@ You will find the complete changelog for release 1.7.0, including bug fixes, imp FEATURES FOR VIRTUALSERVER AND VIRTUALSERVERROUTE RESOURCES: -- [868](https://github.com/nginxinc/kubernetes-ingress/pull/868): Add OpenAPI CRD schema validation. -- [847](https://github.com/nginxinc/kubernetes-ingress/pull/847): Add support for error pages for VS/VSR. +- [868](https://github.com/nginx/kubernetes-ingress/pull/868): Add OpenAPI CRD schema validation. +- [847](https://github.com/nginx/kubernetes-ingress/pull/847): Add support for error pages for VS/VSR. FEATURES: -- [902](https://github.com/nginxinc/kubernetes-ingress/pull/902): Add TransportServer and GlobalConfiguration Resources. -- [894](https://github.com/nginxinc/kubernetes-ingress/pull/894): Add Dockerfile for NGINX Open Source for Openshift. -- [857](https://github.com/nginxinc/kubernetes-ingress/pull/857): Add Openshift Dockerfile for NGINX Plus. -- [852](https://github.com/nginxinc/kubernetes-ingress/pull/852): Add default-server-access-log-off to configmap. -- [845](https://github.com/nginxinc/kubernetes-ingress/pull/845): Add log-format-escaping and stream-log-format-escaping +- [902](https://github.com/nginx/kubernetes-ingress/pull/902): Add TransportServer and GlobalConfiguration Resources. +- [894](https://github.com/nginx/kubernetes-ingress/pull/894): Add Dockerfile for NGINX Open Source for Openshift. +- [857](https://github.com/nginx/kubernetes-ingress/pull/857): Add Openshift Dockerfile for NGINX Plus. +- [852](https://github.com/nginx/kubernetes-ingress/pull/852): Add default-server-access-log-off to configmap. +- [845](https://github.com/nginx/kubernetes-ingress/pull/845): Add log-format-escaping and stream-log-format-escaping configmap keys. Thanks to [Alexey Maslov](https://github.com/alxmsl). -- [827](https://github.com/nginxinc/kubernetes-ingress/pull/827): Add ingress class label to all Prometheus metrics. +- [827](https://github.com/nginx/kubernetes-ingress/pull/827): Add ingress class label to all Prometheus metrics. IMPROVEMENTS: -- [850](https://github.com/nginxinc/kubernetes-ingress/pull/850): Extend redirect URI validation with protocol check in +- [850](https://github.com/nginx/kubernetes-ingress/pull/850): Extend redirect URI validation with protocol check in VS/VSR. -- [832](https://github.com/nginxinc/kubernetes-ingress/pull/832): Update the examples to run the +- [832](https://github.com/nginx/kubernetes-ingress/pull/832): Update the examples to run the `nginxdemos/nginx-hello:plain-text` image, that doesn't require root user. -- [825](https://github.com/nginxinc/kubernetes-ingress/pull/825): Add multi-stage docker builds. +- [825](https://github.com/nginx/kubernetes-ingress/pull/825): Add multi-stage docker builds. BUGFIXES: -- [828](https://github.com/nginxinc/kubernetes-ingress/pull/828): Fix error messages for actions of the type return. +- [828](https://github.com/nginx/kubernetes-ingress/pull/828): Fix error messages for actions of the type return. HELM CHART: - The version of the helm chart is now 0.5.0. - Add new parameters to the Chart: `controller.enableTLSPassthrough`, `controller.volumes`, `controller.volumeMounts`, - `controller.priorityClassName`. Added in [921](https://github.com/nginxinc/kubernetes-ingress/pull/921), - [878](https://github.com/nginxinc/kubernetes-ingress/pull/878), - [807](https://github.com/nginxinc/kubernetes-ingress/pull/807) thanks to [Greg Snow](https://github.com/gsnegovskiy). + `controller.priorityClassName`. Added in [921](https://github.com/nginx/kubernetes-ingress/pull/921), + [878](https://github.com/nginx/kubernetes-ingress/pull/878), + [807](https://github.com/nginx/kubernetes-ingress/pull/807) thanks to [Greg Snow](https://github.com/gsnegovskiy). CHANGES: - Update NGINX version to 1.17.10. - Update NGINX Plus to R21. -- [854](https://github.com/nginxinc/kubernetes-ingress/pull/854): Update the Debian base images for NGINX Plus to +- [854](https://github.com/nginx/kubernetes-ingress/pull/854): Update the Debian base images for NGINX Plus to `debian:buster-slim`. -- [852](https://github.com/nginxinc/kubernetes-ingress/pull/852): Add default-server-access-log-off to configmap. The +- [852](https://github.com/nginx/kubernetes-ingress/pull/852): Add default-server-access-log-off to configmap. The access logs for the default server are now enabled by default. -- [847](https://github.com/nginxinc/kubernetes-ingress/pull/847): Add support for error pages for VS/VSR. The PR affects +- [847](https://github.com/nginx/kubernetes-ingress/pull/847): Add support for error pages for VS/VSR. The PR affects how the Ingress Controller generates configuration for VirtualServer and VirtualServerRoutes. See [this - comment](https://github.com/nginxinc/kubernetes-ingress/pull/847) for more details. -- [827](https://github.com/nginxinc/kubernetes-ingress/pull/827): Add ingress class label to all Prometheus metrics. + comment](https://github.com/nginx/kubernetes-ingress/pull/847) for more details. +- [827](https://github.com/nginx/kubernetes-ingress/pull/827): Add ingress class label to all Prometheus metrics. Every Prometheus metric exposed by the Ingress Controller now includes the label `class` with the value of the Ingress Controller class (by default `nginx`), -- [825](https://github.com/nginxinc/kubernetes-ingress/pull/825): Add multi-stage docker builds. When building the +- [825](https://github.com/nginx/kubernetes-ingress/pull/825): Add multi-stage docker builds. When building the Ingress Controller image in Docker, we now use a multi-stage docker build. UPGRADE: @@ -607,62 +607,62 @@ You will find the complete changelog for release 1.6.0, including bug fixes, imp FEATURES FOR VIRTUALSERVER AND VIRTUALSERVERROUTE RESOURCES: -- [780](https://github.com/nginxinc/kubernetes-ingress/pull/780): Add support for canned responses to VS/VSR. -- [778](https://github.com/nginxinc/kubernetes-ingress/pull/778): Add redirect support in VS/VSR. -- [766](https://github.com/nginxinc/kubernetes-ingress/pull/766): Add exact matches and regex support to location paths +- [780](https://github.com/nginx/kubernetes-ingress/pull/780): Add support for canned responses to VS/VSR. +- [778](https://github.com/nginx/kubernetes-ingress/pull/778): Add redirect support in VS/VSR. +- [766](https://github.com/nginx/kubernetes-ingress/pull/766): Add exact matches and regex support to location paths in VS/VSR. -- [748](https://github.com/nginxinc/kubernetes-ingress/pull/748): Add TLS redirect support in Virtualserver. -- [745](https://github.com/nginxinc/kubernetes-ingress/pull/745): Improve routing rules in VS/VSR -- [728](https://github.com/nginxinc/kubernetes-ingress/pull/728): Add session persistence in VS/VSR. -- [724](https://github.com/nginxinc/kubernetes-ingress/pull/724): Add VS/VSR Prometheus metrics. -- [712](https://github.com/nginxinc/kubernetes-ingress/pull/712): Add service subselector support in vs/vsr. -- [707](https://github.com/nginxinc/kubernetes-ingress/pull/707): Emit warning events in VS/VSR. -- [701](https://github.com/nginxinc/kubernetes-ingress/pull/701): Add support queue in upstreams for plus in VS/VSR. -- [693](https://github.com/nginxinc/kubernetes-ingress/pull/693): Add ServerStatusZones support in vs/vsr. -- [670](https://github.com/nginxinc/kubernetes-ingress/pull/670): Add buffering support for vs/vsr. -- [660](https://github.com/nginxinc/kubernetes-ingress/pull/660): Add ClientBodyMaxSize support in vs/vsr. -- [659](https://github.com/nginxinc/kubernetes-ingress/pull/659): Support configuring upstream zone sizes in VS/VSR. -- [655](https://github.com/nginxinc/kubernetes-ingress/pull/655): Add slow-start support in vs/vsr. -- [653](https://github.com/nginxinc/kubernetes-ingress/pull/653): Add websockets support for vs/vsr upstreams. -- [641](https://github.com/nginxinc/kubernetes-ingress/pull/641): Add support for ExternalName Services for vs/vsr. -- [635](https://github.com/nginxinc/kubernetes-ingress/pull/635): Add HealthChecks support for vs/vsr. -- [634](https://github.com/nginxinc/kubernetes-ingress/pull/634): Add Active Connections support to vs/vsr. -- [628](https://github.com/nginxinc/kubernetes-ingress/pull/628): Add retries support for vs/vsr. -- [621](https://github.com/nginxinc/kubernetes-ingress/pull/621): Add TLS support for vs/vsr upstreams. -- [617](https://github.com/nginxinc/kubernetes-ingress/pull/617): Add keepalive support to vs/vsr. -- [612](https://github.com/nginxinc/kubernetes-ingress/pull/612): Add timeouts support to vs/vsr. -- [607](https://github.com/nginxinc/kubernetes-ingress/pull/607): Add fail-timeout and max-fails support to vs/vsr. -- [596](https://github.com/nginxinc/kubernetes-ingress/pull/596): Add lb-method support in vs and vsr. +- [748](https://github.com/nginx/kubernetes-ingress/pull/748): Add TLS redirect support in Virtualserver. +- [745](https://github.com/nginx/kubernetes-ingress/pull/745): Improve routing rules in VS/VSR +- [728](https://github.com/nginx/kubernetes-ingress/pull/728): Add session persistence in VS/VSR. +- [724](https://github.com/nginx/kubernetes-ingress/pull/724): Add VS/VSR Prometheus metrics. +- [712](https://github.com/nginx/kubernetes-ingress/pull/712): Add service subselector support in vs/vsr. +- [707](https://github.com/nginx/kubernetes-ingress/pull/707): Emit warning events in VS/VSR. +- [701](https://github.com/nginx/kubernetes-ingress/pull/701): Add support queue in upstreams for plus in VS/VSR. +- [693](https://github.com/nginx/kubernetes-ingress/pull/693): Add ServerStatusZones support in vs/vsr. +- [670](https://github.com/nginx/kubernetes-ingress/pull/670): Add buffering support for vs/vsr. +- [660](https://github.com/nginx/kubernetes-ingress/pull/660): Add ClientBodyMaxSize support in vs/vsr. +- [659](https://github.com/nginx/kubernetes-ingress/pull/659): Support configuring upstream zone sizes in VS/VSR. +- [655](https://github.com/nginx/kubernetes-ingress/pull/655): Add slow-start support in vs/vsr. +- [653](https://github.com/nginx/kubernetes-ingress/pull/653): Add websockets support for vs/vsr upstreams. +- [641](https://github.com/nginx/kubernetes-ingress/pull/641): Add support for ExternalName Services for vs/vsr. +- [635](https://github.com/nginx/kubernetes-ingress/pull/635): Add HealthChecks support for vs/vsr. +- [634](https://github.com/nginx/kubernetes-ingress/pull/634): Add Active Connections support to vs/vsr. +- [628](https://github.com/nginx/kubernetes-ingress/pull/628): Add retries support for vs/vsr. +- [621](https://github.com/nginx/kubernetes-ingress/pull/621): Add TLS support for vs/vsr upstreams. +- [617](https://github.com/nginx/kubernetes-ingress/pull/617): Add keepalive support to vs/vsr. +- [612](https://github.com/nginx/kubernetes-ingress/pull/612): Add timeouts support to vs/vsr. +- [607](https://github.com/nginx/kubernetes-ingress/pull/607): Add fail-timeout and max-fails support to vs/vsr. +- [596](https://github.com/nginx/kubernetes-ingress/pull/596): Add lb-method support in vs and vsr. FEATURES: -- [750](https://github.com/nginxinc/kubernetes-ingress/pull/750): Add support for health status uri customisation. -- [691](https://github.com/nginxinc/kubernetes-ingress/pull/691): Helper Functions for custom annotations. -- [631](https://github.com/nginxinc/kubernetes-ingress/pull/631): Add max_conns support for NGINX plus. -- [629](https://github.com/nginxinc/kubernetes-ingress/pull/629): Added upstream zone directive annotation. Thanks to +- [750](https://github.com/nginx/kubernetes-ingress/pull/750): Add support for health status uri customisation. +- [691](https://github.com/nginx/kubernetes-ingress/pull/691): Helper Functions for custom annotations. +- [631](https://github.com/nginx/kubernetes-ingress/pull/631): Add max_conns support for NGINX plus. +- [629](https://github.com/nginx/kubernetes-ingress/pull/629): Added upstream zone directive annotation. Thanks to [Victor Regalado](https://github.com/vrrs). -- [616](https://github.com/nginxinc/kubernetes-ingress/pull/616): Add proxy-send-timeout to configmap key and +- [616](https://github.com/nginx/kubernetes-ingress/pull/616): Add proxy-send-timeout to configmap key and annotation. -- [615](https://github.com/nginxinc/kubernetes-ingress/pull/615): Add support for Opentracing. -- [614](https://github.com/nginxinc/kubernetes-ingress/pull/614): Add max-conns annotation. Thanks to [Victor +- [615](https://github.com/nginx/kubernetes-ingress/pull/615): Add support for Opentracing. +- [614](https://github.com/nginx/kubernetes-ingress/pull/614): Add max-conns annotation. Thanks to [Victor Regalado](https://github.com/vrrs). IMPROVEMENTS: -- [678](https://github.com/nginxinc/kubernetes-ingress/pull/678): Increase defaults for server-names-hash-max-size and +- [678](https://github.com/nginx/kubernetes-ingress/pull/678): Increase defaults for server-names-hash-max-size and servers-names-hash-bucket-size ConfigMap keys. -- [694](https://github.com/nginxinc/kubernetes-ingress/pull/694): Reject VS/VSR resources with enabled plus features for +- [694](https://github.com/nginx/kubernetes-ingress/pull/694): Reject VS/VSR resources with enabled plus features for OSS. -- Documentation improvements: [713](https://github.com/nginxinc/kubernetes-ingress/pull/713) thanks to [Matthew +- Documentation improvements: [713](https://github.com/nginx/kubernetes-ingress/pull/713) thanks to [Matthew Wahner](https://github.com/mattwahner). BUGFIXES: -- [788](https://github.com/nginxinc/kubernetes-ingress/pull/788): Fix VSR updates when namespace is set implicitly. -- [736](https://github.com/nginxinc/kubernetes-ingress/pull/736): Init Ingress labeled metrics on start. -- [686](https://github.com/nginxinc/kubernetes-ingress/pull/686): Check if config map created for leader-election. -- [664](https://github.com/nginxinc/kubernetes-ingress/pull/664): Fix reporting events for Ingress minions. -- [632](https://github.com/nginxinc/kubernetes-ingress/pull/632): Fix hsts support when not using SSL. Thanks to [Martín +- [788](https://github.com/nginx/kubernetes-ingress/pull/788): Fix VSR updates when namespace is set implicitly. +- [736](https://github.com/nginx/kubernetes-ingress/pull/736): Init Ingress labeled metrics on start. +- [686](https://github.com/nginx/kubernetes-ingress/pull/686): Check if config map created for leader-election. +- [664](https://github.com/nginx/kubernetes-ingress/pull/664): Fix reporting events for Ingress minions. +- [632](https://github.com/nginx/kubernetes-ingress/pull/632): Fix hsts support when not using SSL. Thanks to [Martín Fernández](https://github.com/bilby91). HELM CHART: @@ -670,32 +670,32 @@ HELM CHART: - The version of the helm chart is now 0.4.0. - Add new parameters to the Chart: `controller.healthCheckURI`, `controller.resources`, `controller.logLevel`, `controller.customPorts`, `controller.service.customPorts`. Added in - [750](https://github.com/nginxinc/kubernetes-ingress/pull/750), - [636](https://github.com/nginxinc/kubernetes-ingress/pull/636) thanks to [Guilherme - Oki](https://github.com/guilhermeoki), [600](https://github.com/nginxinc/kubernetes-ingress/pull/600), - [581](https://github.com/nginxinc/kubernetes-ingress/pull/581) thanks to [Alex + [750](https://github.com/nginx/kubernetes-ingress/pull/750), + [636](https://github.com/nginx/kubernetes-ingress/pull/636) thanks to [Guilherme + Oki](https://github.com/guilhermeoki), [600](https://github.com/nginx/kubernetes-ingress/pull/600), + [581](https://github.com/nginx/kubernetes-ingress/pull/581) thanks to [Alex Meijer](https://github.com/ameijer-corsha). -- [722](https://github.com/nginxinc/kubernetes-ingress/pull/722): Fix trailing leader election cm when using helm. This +- [722](https://github.com/nginx/kubernetes-ingress/pull/722): Fix trailing leader election cm when using helm. This change might lead to a failed upgrade. See the helm upgrade instruction below. -- [573](https://github.com/nginxinc/kubernetes-ingress/pull/573): Use Controller name value for app selectors. +- [573](https://github.com/nginx/kubernetes-ingress/pull/573): Use Controller name value for app selectors. CHANGES: - Update NGINX versions to 1.17.6. - Update NGINX Plus version to R20. -- [799](https://github.com/nginxinc/kubernetes-ingress/pull/779): Enable CRDs by default. VirtualServer and +- [799](https://github.com/nginx/kubernetes-ingress/pull/779): Enable CRDs by default. VirtualServer and VirtualServerRoute resources are now enabled by default. -- [772](https://github.com/nginxinc/kubernetes-ingress/pull/772): Update VS/VSR version from v1alpha1 to v1. Make sure +- [772](https://github.com/nginx/kubernetes-ingress/pull/772): Update VS/VSR version from v1alpha1 to v1. Make sure to update the `apiVersion` of your VirtualServer and VirtualServerRoute resources. -- [748](https://github.com/nginxinc/kubernetes-ingress/pull/748): Add TLS redirect support in VirtualServer. The +- [748](https://github.com/nginx/kubernetes-ingress/pull/748): Add TLS redirect support in VirtualServer. The `redirect-to-https` and `ssl-redirect` ConfigMap keys no longer have any effect on generated configs for VirtualServer resources. -- [745](https://github.com/nginxinc/kubernetes-ingress/pull/745): Improve routing rules. Update the spec of +- [745](https://github.com/nginx/kubernetes-ingress/pull/745): Improve routing rules. Update the spec of VirtualServer and VirtualServerRoute accordingly. See YAML examples of the changes - [here](https://github.com/nginxinc/kubernetes-ingress/pull/745). -- [710](https://github.com/nginxinc/kubernetes-ingress/pull/710): Run IC as non-root. Make sure to use the updated + [here](https://github.com/nginx/kubernetes-ingress/pull/745). +- [710](https://github.com/nginx/kubernetes-ingress/pull/710): Run IC as non-root. Make sure to use the updated manifests to install/upgrade the Ingress Controller. -- [603](https://github.com/nginxinc/kubernetes-ingress/pull/603): Update apiVersion in Deployments and DaemonSets to +- [603](https://github.com/nginx/kubernetes-ingress/pull/603): Update apiVersion in Deployments and DaemonSets to apps/v1. UPGRADE: @@ -838,7 +838,7 @@ CHANGES: HELM CHART: - The version of the Helm chart is now 0.3.1. -- [593](https://github.com/nginxinc/kubernetes-ingress/pull/593): Fix the selector in the Ingress Controller service +- [593](https://github.com/nginx/kubernetes-ingress/pull/593): Fix the selector in the Ingress Controller service when the `controller.name` parameter is set. This introduces a change, see the HELM UPGRADE section. UPGRADE: @@ -861,7 +861,7 @@ When you upgrade from `0.2.1` to `0.3.1`, make sure to configure the following p - `controller.config.name` is set to `nginx-config`. This ensures the ConfigMap will not be recreated. Upgrading from `0.3.0` to `0.3.1`: Upgrading is not affected unless you customized `controller.name`. In that case, -because of the fix [593](https://github.com/nginxinc/kubernetes-ingress/pull/593), the upgraded service will have a new +because of the fix [593](https://github.com/nginx/kubernetes-ingress/pull/593), the upgraded service will have a new selector, and the upgraded pod spec will have a new label. As a result, during an upgrade, the old pods will be immediately excluded from the service. Also, for the Deployment, the old pods will not terminate but continue to run. To terminate the old pods, manually remove the corresponding ReplicaSet. @@ -870,28 +870,28 @@ terminate the old pods, manually remove the corresponding ReplicaSet. FEATURES: -- [560](https://github.com/nginxinc/kubernetes-ingress/pull/560): Add new configuration resources -- VirtualServer and +- [560](https://github.com/nginx/kubernetes-ingress/pull/560): Add new configuration resources -- VirtualServer and VirtualServerRoute. -- [554](https://github.com/nginxinc/kubernetes-ingress/pull/554): Add new Prometheus metrics related to the Ingress +- [554](https://github.com/nginx/kubernetes-ingress/pull/554): Add new Prometheus metrics related to the Ingress Controller's operation (as opposed to NGINX/NGINX Plus metrics). -- [496](https://github.com/nginxinc/kubernetes-ingress/pull/496): Support a wildcard TLS certificate for TLS-enabled +- [496](https://github.com/nginx/kubernetes-ingress/pull/496): Support a wildcard TLS certificate for TLS-enabled Ingress resources. -- [485](https://github.com/nginxinc/kubernetes-ingress/pull/485): Support ExternalName services in Ingress backends. +- [485](https://github.com/nginx/kubernetes-ingress/pull/485): Support ExternalName services in Ingress backends. IMPROVEMENTS: - Add new ConfigMap keys: `keepalive-timeout`, `keepalive-requests`, `access-log-off`, `variables-hash-bucket-size`, - `variables-hash-max-size`. Added in [565](https://github.com/nginxinc/kubernetes-ingress/pull/565), - [511](https://github.com/nginxinc/kubernetes-ingress/pull/511). -- [504](https://github.com/nginxinc/kubernetes-ingress/pull/504): Run the Prometheus exporter inside the Ingress + `variables-hash-max-size`. Added in [565](https://github.com/nginx/kubernetes-ingress/pull/565), + [511](https://github.com/nginx/kubernetes-ingress/pull/511). +- [504](https://github.com/nginx/kubernetes-ingress/pull/504): Run the Prometheus exporter inside the Ingress Controller process instead of a sidecar container. BUGFIXES: -- [520](https://github.com/nginxinc/kubernetes-ingress/pull/520): Fix the type of the Prometheus port annotation in +- [520](https://github.com/nginx/kubernetes-ingress/pull/520): Fix the type of the Prometheus port annotation in manifests. -- [481](https://github.com/nginxinc/kubernetes-ingress/pull/481): Fix the HSTS support. -- [439](https://github.com/nginxinc/kubernetes-ingress/pull/439): Fix the validation of the `lb-method` ConfigMap key +- [481](https://github.com/nginx/kubernetes-ingress/pull/481): Fix the HSTS support. +- [439](https://github.com/nginx/kubernetes-ingress/pull/439): Fix the validation of the `lb-method` ConfigMap key and `nginx.org/lb-method` annotation. HELM CHART: @@ -903,17 +903,17 @@ HELM CHART: `controller.reportIngressStatus.leaderElectionLockName`, `controller.service.httpPort`, `controller.service.httpsPort`, `controller.service.loadBalancerIP`, `controller.service.loadBalancerSourceRanges`, `controller.tolerations`, `controller.affinity`. Added in - [562](https://github.com/nginxinc/kubernetes-ingress/pull/562), - [561](https://github.com/nginxinc/kubernetes-ingress/pull/561), - [553](https://github.com/nginxinc/kubernetes-ingress/pull/553), - [534](https://github.com/nginxinc/kubernetes-ingress/pull/534) thanks to [Paulo Ribeiro](https://github.com/paigr), - [479](https://github.com/nginxinc/kubernetes-ingress/pull/479) thanks to [Alejandro - Llanes](https://github.com/sombralibre), [468](https://github.com/nginxinc/kubernetes-ingress/pull/468), - [456](https://github.com/nginxinc/kubernetes-ingress/pull/456). -- [546](https://github.com/nginxinc/kubernetes-ingress/pull/546): Support deploying multiple Ingress Controllers in a + [562](https://github.com/nginx/kubernetes-ingress/pull/562), + [561](https://github.com/nginx/kubernetes-ingress/pull/561), + [553](https://github.com/nginx/kubernetes-ingress/pull/553), + [534](https://github.com/nginx/kubernetes-ingress/pull/534) thanks to [Paulo Ribeiro](https://github.com/paigr), + [479](https://github.com/nginx/kubernetes-ingress/pull/479) thanks to [Alejandro + Llanes](https://github.com/sombralibre), [468](https://github.com/nginx/kubernetes-ingress/pull/468), + [456](https://github.com/nginx/kubernetes-ingress/pull/456). +- [546](https://github.com/nginx/kubernetes-ingress/pull/546): Support deploying multiple Ingress Controllers in a cluster. **Note**: The generated resources have new names that are unique for each Ingress Controller. As a consequence, the name change affects the upgrade. See the HELM UPGRADE section for more information. -- [542](https://github.com/nginxinc/kubernetes-ingress/pull/542): Reduce the required privileges in the RBAC manifests. +- [542](https://github.com/nginx/kubernetes-ingress/pull/542): Reduce the required privileges in the RBAC manifests. CHANGES: @@ -1023,64 +1023,64 @@ UPGRADE: FEATURES: -- [401](https://github.com/nginxinc/kubernetes-ingress/pull/401): Add the `-nginx-debug` flag for enabling debugging of +- [401](https://github.com/nginx/kubernetes-ingress/pull/401): Add the `-nginx-debug` flag for enabling debugging of NGINX using the `nginx-debug` binary. -- [387](https://github.com/nginxinc/kubernetes-ingress/pull/387): Add the `-nginx-status-allow-cidrs` command-line +- [387](https://github.com/nginx/kubernetes-ingress/pull/387): Add the `-nginx-status-allow-cidrs` command-line argument for white listing IPv4 IP/CIDR blocks to allow access to NGINX stub_status or the NGINX Plus API. Thanks to [Jasmine Hegman](https://github.com/r4j4h). -- [376](https://github.com/nginxinc/kubernetes-ingress/pull/376): Support the +- [376](https://github.com/nginx/kubernetes-ingress/pull/376): Support the [random](http://nginx.org/en/docs/http/ngx_http_upstream_module.html#random) load balancing method. -- [375](https://github.com/nginxinc/kubernetes-ingress/pull/375): Support custom annotations. -- [346](https://github.com/nginxinc/kubernetes-ingress/pull/346): Support the Prometheus exporter for NGINX (the +- [375](https://github.com/nginx/kubernetes-ingress/pull/375): Support custom annotations. +- [346](https://github.com/nginx/kubernetes-ingress/pull/346): Support the Prometheus exporter for NGINX (the stub_status metrics). -- [344](https://github.com/nginxinc/kubernetes-ingress/pull/344): Expose NGINX Plus API/NGINX stub_status on a custom +- [344](https://github.com/nginx/kubernetes-ingress/pull/344): Expose NGINX Plus API/NGINX stub_status on a custom port via the `-nginx-status-port` command-line argument. See also the CHANGES section. -- [342](https://github.com/nginxinc/kubernetes-ingress/pull/342): Add the `error-log-level` configmap key. Thanks to +- [342](https://github.com/nginx/kubernetes-ingress/pull/342): Add the `error-log-level` configmap key. Thanks to [boran seref](https://github.com/boranx). -- [320](https://github.com/nginxinc/kubernetes-ingress/pull/340): Support TCP/UDP load balancing via the +- [320](https://github.com/nginx/kubernetes-ingress/pull/340): Support TCP/UDP load balancing via the `stream-snippets` configmap key. IMPROVEMENTS: -- [434](https://github.com/nginxinc/kubernetes-ingress/pull/434): Improve consistency of templates. -- [432](https://github.com/nginxinc/kubernetes-ingress/pull/432): Fix cli-docs and Improve main test. -- [419](https://github.com/nginxinc/kubernetes-ingress/pull/419): Refactor config writing. Thanks to +- [434](https://github.com/nginx/kubernetes-ingress/pull/434): Improve consistency of templates. +- [432](https://github.com/nginx/kubernetes-ingress/pull/432): Fix cli-docs and Improve main test. +- [419](https://github.com/nginx/kubernetes-ingress/pull/419): Refactor config writing. Thanks to [feifeiiiiiiiiii](https://github.com/feifeiiiiiiiiiii). -- [403](https://github.com/nginxinc/kubernetes-ingress/pull/403): Improve NGINX start. -- [400](https://github.com/nginxinc/kubernetes-ingress/pull/400): Fix error message in +- [403](https://github.com/nginx/kubernetes-ingress/pull/403): Improve NGINX start. +- [400](https://github.com/nginx/kubernetes-ingress/pull/400): Fix error message in internal/controller/controller.go. Thanks to [Alex O Regan](https://github.com/aaaaaaaalex). -- [399](https://github.com/nginxinc/kubernetes-ingress/pull/399): Improve secret handling. See also the CHANGES section. -- [391](https://github.com/nginxinc/kubernetes-ingress/pull/391): Update default lb-method to be random two least_conn. +- [399](https://github.com/nginx/kubernetes-ingress/pull/399): Improve secret handling. See also the CHANGES section. +- [391](https://github.com/nginx/kubernetes-ingress/pull/391): Update default lb-method to be random two least_conn. See also the CHANGES section. -- [389](https://github.com/nginxinc/kubernetes-ingress/pull/389): Improve parsing nginx.org/rewrites annotation. -- [380](https://github.com/nginxinc/kubernetes-ingress/pull/380): Verify reloads & cache secrets. -- [362](https://github.com/nginxinc/kubernetes-ingress/pull/362): Reduce reloads. -- [357](https://github.com/nginxinc/kubernetes-ingress/pull/357): Improve Project Layout and Refactor Controller +- [389](https://github.com/nginx/kubernetes-ingress/pull/389): Improve parsing nginx.org/rewrites annotation. +- [380](https://github.com/nginx/kubernetes-ingress/pull/380): Verify reloads & cache secrets. +- [362](https://github.com/nginx/kubernetes-ingress/pull/362): Reduce reloads. +- [357](https://github.com/nginx/kubernetes-ingress/pull/357): Improve Project Layout and Refactor Controller Package. See also the CHANGES section. -- [351](https://github.com/nginxinc/kubernetes-ingress/pull/351): Make socket address obvious. +- [351](https://github.com/nginx/kubernetes-ingress/pull/351): Make socket address obvious. BUGFIXES: -- [429](https://github.com/nginxinc/kubernetes-ingress/pull/429): Fix panic with health checks. -- [386](https://github.com/nginxinc/kubernetes-ingress/pull/386): Fix Configmap/Mergeable Ingress Add/Update event +- [429](https://github.com/nginx/kubernetes-ingress/pull/429): Fix panic with health checks. +- [386](https://github.com/nginx/kubernetes-ingress/pull/386): Fix Configmap/Mergeable Ingress Add/Update event logging. -- [379](https://github.com/nginxinc/kubernetes-ingress/pull/379): Fix configmap update. -- [365](https://github.com/nginxinc/kubernetes-ingress/pull/365): Don't enqueue ingress for some service changes. -- [348](https://github.com/nginxinc/kubernetes-ingress/pull/348): Fix Configurator error check. +- [379](https://github.com/nginx/kubernetes-ingress/pull/379): Fix configmap update. +- [365](https://github.com/nginx/kubernetes-ingress/pull/365): Don't enqueue ingress for some service changes. +- [348](https://github.com/nginx/kubernetes-ingress/pull/348): Fix Configurator error check. HELM CHART: -- [430](https://github.com/nginxinc/kubernetes-ingress/pull/430): Add the `controller.serviceAccount.imagePullSecrets` +- [430](https://github.com/nginx/kubernetes-ingress/pull/430): Add the `controller.serviceAccount.imagePullSecrets` parameter to the helm chart. See also the CHANGES section. -- [420](https://github.com/nginxinc/kubernetes-ingress/pull/420): Simplify values files for Helm Chart. -- [398](https://github.com/nginxinc/kubernetes-ingress/pull/398): Add the `controller.nginxStatus.allowCidrs` and +- [420](https://github.com/nginx/kubernetes-ingress/pull/420): Simplify values files for Helm Chart. +- [398](https://github.com/nginx/kubernetes-ingress/pull/398): Add the `controller.nginxStatus.allowCidrs` and `controller.service.externalIPs` parameters to helm chart. -- [393](https://github.com/nginxinc/kubernetes-ingress/pull/393): Refactor Helm Chart templates. -- [390](https://github.com/nginxinc/kubernetes-ingress/pull/390): Add the `controller.service.loadBalancerIP` parameter +- [393](https://github.com/nginx/kubernetes-ingress/pull/393): Refactor Helm Chart templates. +- [390](https://github.com/nginx/kubernetes-ingress/pull/390): Add the `controller.service.loadBalancerIP` parameter to the helm chat. -- [377](https://github.com/nginxinc/kubernetes-ingress/pull/377): Add the `controller.nginxStatus` parameters to the +- [377](https://github.com/nginx/kubernetes-ingress/pull/377): Add the `controller.nginxStatus` parameters to the helm chart. -- [335](https://github.com/nginxinc/kubernetes-ingress/pull/335): Add the `controller.reportIngressStatus` parameters to +- [335](https://github.com/nginx/kubernetes-ingress/pull/335): Add the `controller.reportIngressStatus` parameters to the helm chart. - The version of the Helm chart is now 0.2.0. @@ -1089,35 +1089,35 @@ CHANGES: - Update NGINX version to 1.15.6. - Update NGINX Plus version to R16p1. - Update NGINX Prometheus Exporter to 0.2.0. -- [430](https://github.com/nginxinc/kubernetes-ingress/pull/430): Add the `controller.serviceAccount.imagePullSecrets` +- [430](https://github.com/nginx/kubernetes-ingress/pull/430): Add the `controller.serviceAccount.imagePullSecrets` parameter to the helm chart. **Note**: the `controller.serviceAccountName` parameter has been changed to `controller.serviceAccount.name`. -- [399](https://github.com/nginxinc/kubernetes-ingress/pull/399): Improve secret handling. **Note**: the PR changed how +- [399](https://github.com/nginx/kubernetes-ingress/pull/399): Improve secret handling. **Note**: the PR changed how the Ingress Controller processes Ingress resources with TLS termination enabled but without any referenced (or with invalid) secrets and Ingress resources with JWT validation enabled but without any referenced (or with invalid) JWK. - Please read [here](https://github.com/nginxinc/kubernetes-ingress/pull/399) for more details. -- [357](https://github.com/nginxinc/kubernetes-ingress/pull/357): Improve Project Layout and Refactor Controller + Please read [here](https://github.com/nginx/kubernetes-ingress/pull/399) for more details. +- [357](https://github.com/nginx/kubernetes-ingress/pull/357): Improve Project Layout and Refactor Controller Package. **Note**: the PR significantly changed the layout of the project to follow best practices. -- [347](https://github.com/nginxinc/kubernetes-ingress/pull/347): Use edge version in manifests and Helm chart. +- [347](https://github.com/nginx/kubernetes-ingress/pull/347): Use edge version in manifests and Helm chart. **Note**: the manifests and the helm chart in the master branch now reference the edge version of the Ingress Controller instead of the latest stable version used previously. -- [391](https://github.com/nginxinc/kubernetes-ingress/pull/391): Update default lb-method to be random two least_conn. +- [391](https://github.com/nginx/kubernetes-ingress/pull/391): Update default lb-method to be random two least_conn. **Note**: the default load balancing method is now the power of two choices as it better suits the Ingress Controller use case. Please read the [blog post](https://www.nginx.com/blog/nginx-power-of-two-choices-load-balancing-algorithm/) about the method for more details. -- [344](https://github.com/nginxinc/kubernetes-ingress/pull/344): Expose NGINX Plus API/NGINX stub_status on a custom +- [344](https://github.com/nginx/kubernetes-ingress/pull/344): Expose NGINX Plus API/NGINX stub_status on a custom port via the `-nginx-status-port` command-line argument. **Note**: For NGINX the stub_status is now exposed on port 8080 at the /stub_status URL by default. Previously, the stub_status was not exposed on any port. The stub_status can be disabled via the `-nginx-status` flag. -DOC AND EXAMPLES FIXES/IMPROVEMENTS: [435](https://github.com/nginxinc/kubernetes-ingress/pull/435), -[433](https://github.com/nginxinc/kubernetes-ingress/pull/433), -[432](https://github.com/nginxinc/kubernetes-ingress/pull/432), -[418](https://github.com/nginxinc/kubernetes-ingress/pull/418) (Thanks to [Hal Deadman](https://github.com/hdeadman)), -[406](https://github.com/nginxinc/kubernetes-ingress/pull/406), -[381](https://github.com/nginxinc/kubernetes-ingress/pull/381), -[349](https://github.com/nginxinc/kubernetes-ingress/pull/349) (Thanks to [Artur -Geraschenko](https://github.com/arturgspb)), [343](https://github.com/nginxinc/kubernetes-ingress/pull/343) +DOC AND EXAMPLES FIXES/IMPROVEMENTS: [435](https://github.com/nginx/kubernetes-ingress/pull/435), +[433](https://github.com/nginx/kubernetes-ingress/pull/433), +[432](https://github.com/nginx/kubernetes-ingress/pull/432), +[418](https://github.com/nginx/kubernetes-ingress/pull/418) (Thanks to [Hal Deadman](https://github.com/hdeadman)), +[406](https://github.com/nginx/kubernetes-ingress/pull/406), +[381](https://github.com/nginx/kubernetes-ingress/pull/381), +[349](https://github.com/nginx/kubernetes-ingress/pull/349) (Thanks to [Artur +Geraschenko](https://github.com/arturgspb)), [343](https://github.com/nginx/kubernetes-ingress/pull/343) UPGRADE: @@ -1150,30 +1150,30 @@ UPGRADE: IMPROVEMENTS: -- [325](https://github.com/nginxinc/kubernetes-ingress/pull/325): Report ingress status. -- [311](https://github.com/nginxinc/kubernetes-ingress/pull/311): Support JWT auth in mergeable minions. -- [310](https://github.com/nginxinc/kubernetes-ingress/pull/310): NGINX configuration template custom path support. -- [308](https://github.com/nginxinc/kubernetes-ingress/pull/308): Add prometheus exporter support to helm chart. -- [303](https://github.com/nginxinc/kubernetes-ingress/pull/303): Add fetch custom NGINX template from ConfigMap. -- [301](https://github.com/nginxinc/kubernetes-ingress/pull/301): Update prometheus exporter image for Plus. -- [298](https://github.com/nginxinc/kubernetes-ingress/pull/298): Prefetch ConfigMap before initial NGINX Config +- [325](https://github.com/nginx/kubernetes-ingress/pull/325): Report ingress status. +- [311](https://github.com/nginx/kubernetes-ingress/pull/311): Support JWT auth in mergeable minions. +- [310](https://github.com/nginx/kubernetes-ingress/pull/310): NGINX configuration template custom path support. +- [308](https://github.com/nginx/kubernetes-ingress/pull/308): Add prometheus exporter support to helm chart. +- [303](https://github.com/nginx/kubernetes-ingress/pull/303): Add fetch custom NGINX template from ConfigMap. +- [301](https://github.com/nginx/kubernetes-ingress/pull/301): Update prometheus exporter image for Plus. +- [298](https://github.com/nginx/kubernetes-ingress/pull/298): Prefetch ConfigMap before initial NGINX Config generation. -- [296](https://github.com/nginxinc/kubernetes-ingress/pull/296): Improve Helm Chart. -- [295](https://github.com/nginxinc/kubernetes-ingress/pull/295): Report version information. -- [294](https://github.com/nginxinc/kubernetes-ingress/pull/294): Support dynamic reconfiguration in mergeable ingresses +- [296](https://github.com/nginx/kubernetes-ingress/pull/296): Improve Helm Chart. +- [295](https://github.com/nginx/kubernetes-ingress/pull/295): Report version information. +- [294](https://github.com/nginx/kubernetes-ingress/pull/294): Support dynamic reconfiguration in mergeable ingresses for Plus. -- [287](https://github.com/nginxinc/kubernetes-ingress/pull/287): Support slow-start for Plus. -- [286](https://github.com/nginxinc/kubernetes-ingress/pull/286): Add support for active health checks for Plus. +- [287](https://github.com/nginx/kubernetes-ingress/pull/287): Support slow-start for Plus. +- [286](https://github.com/nginx/kubernetes-ingress/pull/286): Add support for active health checks for Plus. CHANGES: -- [330](https://github.com/nginxinc/kubernetes-ingress/pull/330): Update NGINX version to 1.15.2. -- [329](https://github.com/nginxinc/kubernetes-ingress/pull/329): Enforce annotations inheritance in minions. +- [330](https://github.com/nginx/kubernetes-ingress/pull/330): Update NGINX version to 1.15.2. +- [329](https://github.com/nginx/kubernetes-ingress/pull/329): Enforce annotations inheritance in minions. BUGFIXES: -- [326](https://github.com/nginxinc/kubernetes-ingress/pull/326): Fix find ingress for secret ns bug. -- [284](https://github.com/nginxinc/kubernetes-ingress/pull/284): Correct Logs for Mergeable Types with Duplicate +- [326](https://github.com/nginx/kubernetes-ingress/pull/326): Fix find ingress for secret ns bug. +- [284](https://github.com/nginx/kubernetes-ingress/pull/284): Correct Logs for Mergeable Types with Duplicate Location. Thanks to [Fernando Diaz](https://github.com/diazjf). UPGRADE: @@ -1183,103 +1183,103 @@ UPGRADE: ## 1.2.0 -- [279](https://github.com/nginxinc/kubernetes-ingress/pull/279): Update dependencies. -- [278](https://github.com/nginxinc/kubernetes-ingress/pull/278): Fix mergeable Ingress types. -- [277](https://github.com/nginxinc/kubernetes-ingress/pull/277): Support grpc error responses. -- [276](https://github.com/nginxinc/kubernetes-ingress/pull/276): Add gRPC support. -- [274](https://github.com/nginxinc/kubernetes-ingress/pull/274): Change the default load balancing method to +- [279](https://github.com/nginx/kubernetes-ingress/pull/279): Update dependencies. +- [278](https://github.com/nginx/kubernetes-ingress/pull/278): Fix mergeable Ingress types. +- [277](https://github.com/nginx/kubernetes-ingress/pull/277): Support grpc error responses. +- [276](https://github.com/nginx/kubernetes-ingress/pull/276): Add gRPC support. +- [274](https://github.com/nginx/kubernetes-ingress/pull/274): Change the default load balancing method to least_conn. -- [272](https://github.com/nginxinc/kubernetes-ingress/pull/272): Move nginx-ingress image to the official nginx +- [272](https://github.com/nginx/kubernetes-ingress/pull/272): Move nginx-ingress image to the official nginx DockerHub. -- [268](https://github.com/nginxinc/kubernetes-ingress/pull/268): Correct Mergeable Types misspelling and optimize +- [268](https://github.com/nginx/kubernetes-ingress/pull/268): Correct Mergeable Types misspelling and optimize blacklists. Thanks to [Fernando Diaz](https://github.com/diazjf). -- [266](https://github.com/nginxinc/kubernetes-ingress/pull/266): Add support for passive health checks. -- [261](https://github.com/nginxinc/kubernetes-ingress/pull/261): Update Customization Example. -- [258](https://github.com/nginxinc/kubernetes-ingress/pull/258): Handle annotations and conflicting paths for +- [266](https://github.com/nginx/kubernetes-ingress/pull/266): Add support for passive health checks. +- [261](https://github.com/nginx/kubernetes-ingress/pull/261): Update Customization Example. +- [258](https://github.com/nginx/kubernetes-ingress/pull/258): Handle annotations and conflicting paths for MergeableTypes. Thanks to [Fernando Diaz](https://github.com/diazjf). -- [256](https://github.com/nginxinc/kubernetes-ingress/pull/256): Add helm chart support. -- [249](https://github.com/nginxinc/kubernetes-ingress/pull/249): Add support for prometheus for Plus. -- [241](https://github.com/nginxinc/kubernetes-ingress/pull/241): Update the doc about building the Docker image. -- [240](https://github.com/nginxinc/kubernetes-ingress/pull/240): Use new NGINX Plus API. -- [239](https://github.com/nginxinc/kubernetes-ingress/pull/239): Fix a typo in a variable name. Thanks to [Tony +- [256](https://github.com/nginx/kubernetes-ingress/pull/256): Add helm chart support. +- [249](https://github.com/nginx/kubernetes-ingress/pull/249): Add support for prometheus for Plus. +- [241](https://github.com/nginx/kubernetes-ingress/pull/241): Update the doc about building the Docker image. +- [240](https://github.com/nginx/kubernetes-ingress/pull/240): Use new NGINX Plus API. +- [239](https://github.com/nginx/kubernetes-ingress/pull/239): Fix a typo in a variable name. Thanks to [Tony Li](https://github.com/mysterytony). -- [238](https://github.com/nginxinc/kubernetes-ingress/pull/238): Remove apt-get upgrade from Plus Dockerfile. -- [237](https://github.com/nginxinc/kubernetes-ingress/pull/237): Add unit test for ingress-class handling. -- [236](https://github.com/nginxinc/kubernetes-ingress/pull/236): Always respect `-ingress-class` option. Thanks to +- [238](https://github.com/nginx/kubernetes-ingress/pull/238): Remove apt-get upgrade from Plus Dockerfile. +- [237](https://github.com/nginx/kubernetes-ingress/pull/237): Add unit test for ingress-class handling. +- [236](https://github.com/nginx/kubernetes-ingress/pull/236): Always respect `-ingress-class` option. Thanks to [Nick Novitski](https://github.com/nicknovitski). -- [235](https://github.com/nginxinc/kubernetes-ingress/pull/235): Change the base image to Debian Stretch for Plus +- [235](https://github.com/nginx/kubernetes-ingress/pull/235): Change the base image to Debian Stretch for Plus controller. -- [234](https://github.com/nginxinc/kubernetes-ingress/pull/234): Update installation manifests and instructions. -- [233](https://github.com/nginxinc/kubernetes-ingress/pull/233): Add docker build options to Makefile. -- [231](https://github.com/nginxinc/kubernetes-ingress/pull/231): Prevent a possible failure of building Plus image. -- Documentation Fixes: [248](https://github.com/nginxinc/kubernetes-ingress/pull/248), thanks to - [zariye](https://github.com/zariye). [252](https://github.com/nginxinc/kubernetes-ingress/pull/252). - [270](https://github.com/nginxinc/kubernetes-ingress/pull/270). +- [234](https://github.com/nginx/kubernetes-ingress/pull/234): Update installation manifests and instructions. +- [233](https://github.com/nginx/kubernetes-ingress/pull/233): Add docker build options to Makefile. +- [231](https://github.com/nginx/kubernetes-ingress/pull/231): Prevent a possible failure of building Plus image. +- Documentation Fixes: [248](https://github.com/nginx/kubernetes-ingress/pull/248), thanks to + [zariye](https://github.com/zariye). [252](https://github.com/nginx/kubernetes-ingress/pull/252). + [270](https://github.com/nginx/kubernetes-ingress/pull/270). - Update NGINX version to 1.13.12. - Update NGINX Plus version to R15 P1. ## 1.1.1 -- [228](https://github.com/nginxinc/kubernetes-ingress/pull/228): Add worker-rlimit-nofile configmap key. Thanks to +- [228](https://github.com/nginx/kubernetes-ingress/pull/228): Add worker-rlimit-nofile configmap key. Thanks to [Aleksandr Lysenko](https://github.com/Sarga). -- [223](https://github.com/nginxinc/kubernetes-ingress/pull/223): Add worker-connections configmap key. Thanks to +- [223](https://github.com/nginx/kubernetes-ingress/pull/223): Add worker-connections configmap key. Thanks to [Aleksandr Lysenko](https://github.com/Sarga). - Update NGINX version to 1.13.8. ## 1.1.0 -- [221](https://github.com/nginxinc/kubernetes-ingress/pull/221): Add git commit info to the IC log. -- [220](https://github.com/nginxinc/kubernetes-ingress/pull/220): Update dependencies. -- [213](https://github.com/nginxinc/kubernetes-ingress/pull/213): Add main snippets to allow Main context customization. +- [221](https://github.com/nginx/kubernetes-ingress/pull/221): Add git commit info to the IC log. +- [220](https://github.com/nginx/kubernetes-ingress/pull/220): Update dependencies. +- [213](https://github.com/nginx/kubernetes-ingress/pull/213): Add main snippets to allow Main context customization. Thanks to [Dewen Kong](https://github.com/kongdewen). -- [211](https://github.com/nginxinc/kubernetes-ingress/pull/211): Minimize the number of configuration reloads when the +- [211](https://github.com/nginx/kubernetes-ingress/pull/211): Minimize the number of configuration reloads when the Ingress Controller starts; fix a problem with endpoints updates for Plus. -- [208](https://github.com/nginxinc/kubernetes-ingress/pull/208): Add worker-shutdown-timeout configmap key. Thanks to +- [208](https://github.com/nginx/kubernetes-ingress/pull/208): Add worker-shutdown-timeout configmap key. Thanks to [Aleksandr Lysenko](https://github.com/Sarga). -- [199](https://github.com/nginxinc/kubernetes-ingress/pull/199): Add support for Kubernetes ssl-redirect annotation. +- [199](https://github.com/nginx/kubernetes-ingress/pull/199): Add support for Kubernetes ssl-redirect annotation. Thanks to [Luke Seelenbinder](https://github.com/lseelenbinder). -- [194](https://github.com/nginxinc/kubernetes-ingress/pull/194) Add keepalive configmap key and annotation. -- [193](https://github.com/nginxinc/kubernetes-ingress/pull/193): Add worker-cpu-affinity configmap key. -- [192](https://github.com/nginxinc/kubernetes-ingress/pull/192): Add worker-processes configmap key. -- [186](https://github.com/nginxinc/kubernetes-ingress/pull/186): Fix hardcoded controller class. Thanks to [Serhii +- [194](https://github.com/nginx/kubernetes-ingress/pull/194) Add keepalive configmap key and annotation. +- [193](https://github.com/nginx/kubernetes-ingress/pull/193): Add worker-cpu-affinity configmap key. +- [192](https://github.com/nginx/kubernetes-ingress/pull/192): Add worker-processes configmap key. +- [186](https://github.com/nginx/kubernetes-ingress/pull/186): Fix hardcoded controller class. Thanks to [Serhii M](https://github.com/SiriusRed). -- [184](https://github.com/nginxinc/kubernetes-ingress/pull/184): Return a meaningful error when there is no cert and +- [184](https://github.com/nginx/kubernetes-ingress/pull/184): Return a meaningful error when there is no cert and key for the default server. - Update NGINX version to 1.13.7. - Makefile updates: golang container was updated to 1.9. ## 1.0.0 -- [175](https://github.com/nginxinc/kubernetes-ingress/pull/175): Add support for JWT for NGINX Plus. -- [171](https://github.com/nginxinc/kubernetes-ingress/pull/171): Allow NGINX to listen on non-standard ports. Thanks to +- [175](https://github.com/nginx/kubernetes-ingress/pull/175): Add support for JWT for NGINX Plus. +- [171](https://github.com/nginx/kubernetes-ingress/pull/171): Allow NGINX to listen on non-standard ports. Thanks to [Stanislav Seletskiy](https://github.com/seletskiy). -- [170](https://github.com/nginxinc/kubernetes-ingress/pull/170): Add the default server. **Note**: The Ingress +- [170](https://github.com/nginx/kubernetes-ingress/pull/170): Add the default server. **Note**: The Ingress Controller will fail to start if there are no cert and key for the default server. You can pass a TLS Secret for the default server as an argument to the Ingress Controller or add a cert and a key to the Docker image. -- [169](https://github.com/nginxinc/kubernetes-ingress/pull/169): Ignore Ingress resources with empty hostnames. -- [168](https://github.com/nginxinc/kubernetes-ingress/pull/168): Add the `nginx.org/lb-method` annotation. Thanks to +- [169](https://github.com/nginx/kubernetes-ingress/pull/169): Ignore Ingress resources with empty hostnames. +- [168](https://github.com/nginx/kubernetes-ingress/pull/168): Add the `nginx.org/lb-method` annotation. Thanks to [Sajal Kayan](https://github.com/sajal). -- [166](https://github.com/nginxinc/kubernetes-ingress/pull/166): Watch Secret resources for updates. **Note**: If a +- [166](https://github.com/nginx/kubernetes-ingress/pull/166): Watch Secret resources for updates. **Note**: If a Secret referenced by one or more Ingress resources becomes invalid or gets removed, the configuration for those Ingress resources will be disabled until there is a valid Secret. -- [160](https://github.com/nginxinc/kubernetes-ingress/pull/160): Add support for events. See the details - [here](https://github.com/nginxinc/kubernetes-ingress/pull/160). -- [157](https://github.com/nginxinc/kubernetes-ingress/pull/157): Add graceful termination - when the Ingress Controller +- [160](https://github.com/nginx/kubernetes-ingress/pull/160): Add support for events. See the details + [here](https://github.com/nginx/kubernetes-ingress/pull/160). +- [157](https://github.com/nginx/kubernetes-ingress/pull/157): Add graceful termination - when the Ingress Controller receives `SIGTERM`, it shutdowns itself as well as NGINX, using `nginx -s quit`. ## 0.9.0 -- [156](https://github.com/nginxinc/kubernetes-ingress/pull/156): Write a pem file with an SSL certificate and key +- [156](https://github.com/nginx/kubernetes-ingress/pull/156): Write a pem file with an SSL certificate and key atomically. -- [155](https://github.com/nginxinc/kubernetes-ingress/pull/155): Remove http2 annotation (http/2 can be enabled +- [155](https://github.com/nginx/kubernetes-ingress/pull/155): Remove http2 annotation (http/2 can be enabled globally in the ConfigMap). -- [154](https://github.com/nginxinc/kubernetes-ingress/pull/154): Merge NGINX and NGINX Plus Ingress Controller +- [154](https://github.com/nginx/kubernetes-ingress/pull/154): Merge NGINX and NGINX Plus Ingress Controller implementations. -- [151](https://github.com/nginxinc/kubernetes-ingress/pull/151): Use k8s.io/client-go. -- [146](https://github.com/nginxinc/kubernetes-ingress/pull/146): Fix health status. -- [141](https://github.com/nginxinc/kubernetes-ingress/pull/141): Set `worker_processes` to `auto` in NGINX +- [151](https://github.com/nginx/kubernetes-ingress/pull/151): Use k8s.io/client-go. +- [146](https://github.com/nginx/kubernetes-ingress/pull/146): Fix health status. +- [141](https://github.com/nginx/kubernetes-ingress/pull/141): Set `worker_processes` to `auto` in NGINX configuration. Thanks to [Andreas Krüger](https://github.com/woopstar). -- [140](https://github.com/nginxinc/kubernetes-ingress/pull/140): Fix an error message. Thanks to [Andreas +- [140](https://github.com/nginx/kubernetes-ingress/pull/140): Fix an error message. Thanks to [Andreas Krüger](https://github.com/woopstar). - Update NGINX to version 1.13.3. @@ -1289,81 +1289,81 @@ UPGRADE: ## 0.8.0 -- [117](https://github.com/nginxinc/kubernetes-ingress/pull/117): Add a customization option: location-snippets, +- [117](https://github.com/nginx/kubernetes-ingress/pull/117): Add a customization option: location-snippets, server-snippets and http-snippets. Thanks to [rchicoli](https://github.com/rchicoli). -- [116](https://github.com/nginxinc/kubernetes-ingress/pull/116): Add support for the 301 redirect to https based on the +- [116](https://github.com/nginx/kubernetes-ingress/pull/116): Add support for the 301 redirect to https based on the `http_x_forwarded_proto` header. Thanks to [Chris](https://github.com/cwhenderson20). - Update NGINX version to 1.11.13. - Makefile updates: gcloud docker push command; golang container was updated to 1.8. -- Documentation fixes: [113](https://github.com/nginxinc/kubernetes-ingress/pull/113). Thanks to [Linus +- Documentation fixes: [113](https://github.com/nginx/kubernetes-ingress/pull/113). Thanks to [Linus Lewandowski](https://github.com/LEW21). ## 0.7.0 -- [108](https://github.com/nginxinc/kubernetes-ingress/pull/108): Support for the `server_tokens` directive via the +- [108](https://github.com/nginx/kubernetes-ingress/pull/108): Support for the `server_tokens` directive via the annotation and in the configmap. Thanks to [David Radcliffe](https://github.com/dwradcliffe). -- [103](https://github.com/nginxinc/kubernetes-ingress/pull/103): Improve error reporting when NGINX fails to start. -- [100](https://github.com/nginxinc/kubernetes-ingress/pull/100): Add the health check location. Thanks to +- [103](https://github.com/nginx/kubernetes-ingress/pull/103): Improve error reporting when NGINX fails to start. +- [100](https://github.com/nginx/kubernetes-ingress/pull/100): Add the health check location. Thanks to [Julian](https://github.com/jmastr). -- [95](https://github.com/nginxinc/kubernetes-ingress/pull/95): Fix the runtime.TypeAssertionError issue, which +- [95](https://github.com/nginx/kubernetes-ingress/pull/95): Fix the runtime.TypeAssertionError issue, which sometimes occurred when deleting resources. Thanks to [Tang Le](https://github.com/tangle329). -- [93](https://github.com/nginxinc/kubernetes-ingress/pull/93): Fix overwriting of Secrets with the same name from +- [93](https://github.com/nginx/kubernetes-ingress/pull/93): Fix overwriting of Secrets with the same name from different namespaces. -- [92](https://github.com/nginxinc/kubernetes-ingress/pull/92/files): Add overwriting of the HSTS header. Previously, +- [92](https://github.com/nginx/kubernetes-ingress/pull/92/files): Add overwriting of the HSTS header. Previously, when HSTS was enabled, if a backend issued the HSTS header, the controller would add the second HSTS header. Now the controller overwrites the HSTS header, if a backend also issues it. -- [91](https://github.com/nginxinc/kubernetes-ingress/pull/91): Fix the issue with single service Ingress resources +- [91](https://github.com/nginx/kubernetes-ingress/pull/91): Fix the issue with single service Ingress resources without any Ingress rules: the controller didn't pick up any updates of the endpoints of the service of such an Ingress resource. Thanks to [Tang Le](https://github.com/tangle329). -- [88](https://github.com/nginxinc/kubernetes-ingress/pull/88): Support for the `proxy_hide_header` and the +- [88](https://github.com/nginx/kubernetes-ingress/pull/88): Support for the `proxy_hide_header` and the `proxy_pass_header` directives via annotations and in the configmap. Thanks to [Nico Schieder](https://github.com/thetechnick). -- [85](https://github.com/nginxinc/kubernetes-ingress/pull/85): Add the configmap settings to support perfect forward +- [85](https://github.com/nginx/kubernetes-ingress/pull/85): Add the configmap settings to support perfect forward secrecy. Thanks to [Nico Schieder](https://github.com/thetechnick). -- [84](https://github.com/nginxinc/kubernetes-ingress/pull/84): Secret retry: If a certificate Secret referenced in an +- [84](https://github.com/nginx/kubernetes-ingress/pull/84): Secret retry: If a certificate Secret referenced in an Ingress object is not found, the Ingress Controller will reject the Ingress object. but retries every 5s. Thanks to [Nico Schieder](https://github.com/thetechnick). -- [81](https://github.com/nginxinc/kubernetes-ingress/pull/81): Add configmap options to turn on the PROXY protocol. +- [81](https://github.com/nginx/kubernetes-ingress/pull/81): Add configmap options to turn on the PROXY protocol. Thanks to [Nico Schieder](https://github.com/thetechnick). - Update NGINX version to 1.11.8. -- Documentation fixes: [104](https://github.com/nginxinc/kubernetes-ingress/pull/104/files) and - [97](https://github.com/nginxinc/kubernetes-ingress/pull/97/files). Thanks to [Ruilin Huang](https://github.com/hrl) +- Documentation fixes: [104](https://github.com/nginx/kubernetes-ingress/pull/104/files) and + [97](https://github.com/nginx/kubernetes-ingress/pull/97/files). Thanks to [Ruilin Huang](https://github.com/hrl) and [Justin Garrison](https://github.com/rothgar). ## 0.6.0 -- [75](https://github.com/nginxinc/kubernetes-ingress/pull/75): Add the HSTS settings in the configmap and annotations. +- [75](https://github.com/nginx/kubernetes-ingress/pull/75): Add the HSTS settings in the configmap and annotations. Thanks to [Nico Schieder](https://github.com/thetechnick). -- [74](https://github.com/nginxinc/kubernetes-ingress/pull/74): Fix the issue of the `kubernetes.io/ingress.class` +- [74](https://github.com/nginx/kubernetes-ingress/pull/74): Fix the issue of the `kubernetes.io/ingress.class` annotation handling. Thanks to [Tang Le](https://github.com/tangle329). -- [70](https://github.com/nginxinc/kubernetes-ingress/pull/70): Add support for the alpine-based image for the NGINX +- [70](https://github.com/nginx/kubernetes-ingress/pull/70): Add support for the alpine-based image for the NGINX controller. -- [68](https://github.com/nginxinc/kubernetes-ingress/pull/68): Support for proxy-buffering settings in the configmap +- [68](https://github.com/nginx/kubernetes-ingress/pull/68): Support for proxy-buffering settings in the configmap and annotations. Thanks to [Mark Daniel Reidel](https://github.com/df-mreidel). -- [66](https://github.com/nginxinc/kubernetes-ingress/pull/66): Support for custom log-format in the configmap. Thanks +- [66](https://github.com/nginx/kubernetes-ingress/pull/66): Support for custom log-format in the configmap. Thanks to [Mark Daniel Reidel](https://github.com/df-mreidel). -- [65](https://github.com/nginxinc/kubernetes-ingress/pull/65): Add HTTP/2 as an option in the configmap and +- [65](https://github.com/nginx/kubernetes-ingress/pull/65): Add HTTP/2 as an option in the configmap and annotations. Thanks to [Nico Schieder](https://github.com/thetechnick). - The NGINX Plus controller image is now based on Ubuntu Xenial. ## 0.5.0 - Update NGINX version to 1.11.5. -- [64](https://github.com/nginxinc/kubernetes-ingress/pull/64): Add the `nginx.org/rewrites` annotation, which allows to +- [64](https://github.com/nginx/kubernetes-ingress/pull/64): Add the `nginx.org/rewrites` annotation, which allows to rewrite the URI of a request before sending it to the application. Thanks to [Julian](https://github.com/jmastr). -- [62](https://github.com/nginxinc/kubernetes-ingress/pull/62): Add the `nginx.org/ssl-services` annotation, which +- [62](https://github.com/nginx/kubernetes-ingress/pull/62): Add the `nginx.org/ssl-services` annotation, which allows load balancing of HTTPS applications. Thanks to [Julian](https://github.com/jmastr). ## 0.4.0 -- [54](https://github.com/nginxinc/kubernetes-ingress/pull/54): Previously, when specifying the port of a service in an +- [54](https://github.com/nginx/kubernetes-ingress/pull/54): Previously, when specifying the port of a service in an Ingress rule, you had to use the value of the target port of that port of the service, which was incorrect. Now you must use the port value or the name of the port of the service instead of the target port value. **Note**: Please make necessary changes to your Ingress resources, if ports of your services have different values of the port and the target port fields. -- [55](https://github.com/nginxinc/kubernetes-ingress/pull/55): Add support for the `kubernetes.io/ingress.class` +- [55](https://github.com/nginx/kubernetes-ingress/pull/55): Add support for the `kubernetes.io/ingress.class` annotation in Ingress resources. -- [58](https://github.com/nginxinc/kubernetes-ingress/pull/58): Add the version information to the controller. For each +- [58](https://github.com/nginx/kubernetes-ingress/pull/58): Add the version information to the controller. For each version of the NGINX controller, you can find a corresponding image on [DockerHub](https://hub.docker.com/r/nginxdemos/nginx-ingress/tags/) with a tag equal to the version. The latest version is available through the `latest` tag. diff --git a/CODEOWNERS b/CODEOWNERS index c9779a164e..dcf49e62ae 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ -* @nginxinc/kic -/site/ @nginxinc/kic @nginxinc/nginx-docs +* @nginx/kic +/site/ @nginx/kic @nginx/nginx-docs diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aa6882d465..edd32db70f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ considering contributing! ## Ask a Question -To ask a question please use [Github Discussions](https://github.com/nginxinc/kubernetes-ingress/discussions). +To ask a question please use [Github Discussions](https://github.com/nginx/kubernetes-ingress/discussions). You can also join our [Community Slack](https://community.nginx.org/joinslack) which has a wider NGINX audience. @@ -31,8 +31,8 @@ Please reserve GitHub issues for feature requests and bugs rather than general q Follow our [Installation Guide](https://docs.nginx.com/nginx-ingress-controller/installation/) to get NGINX Ingress Controller up and running. -Read the [documentation](https://github.com/nginxinc/kubernetes-ingress/tree/main/site) and -[configuration](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples) examples +Read the [documentation](https://github.com/nginx/kubernetes-ingress/tree/main/site) and +[configuration](https://github.com/nginx/kubernetes-ingress/tree/main/examples) examples ### Project Structure diff --git a/Makefile b/Makefile index 6eeced5ff5..6a0841c0f6 100644 --- a/Makefile +++ b/Makefile @@ -108,12 +108,12 @@ build: ## Build Ingress Controller binary @docker -v || (code=$$?; printf "\033[0;31mError\033[0m: there was a problem with Docker\n"; exit $$code) ifeq ($(strip $(TARGET)),local) @go version || (code=$$?; printf "\033[0;31mError\033[0m: unable to build locally, try using the parameter TARGET=container or TARGET=download\n"; exit $$code) - CGO_ENABLED=0 GOOS=$(strip $(GOOS)) GOARCH=$(strip $(ARCH)) go build -trimpath -ldflags "$(GO_LINKER_FLAGS)" -o nginx-ingress github.com/nginxinc/kubernetes-ingress/cmd/nginx-ingress + CGO_ENABLED=0 GOOS=$(strip $(GOOS)) GOARCH=$(strip $(ARCH)) go build -trimpath -ldflags "$(GO_LINKER_FLAGS)" -o nginx-ingress github.com/nginx/kubernetes-ingress/cmd/nginx-ingress else ifeq ($(strip $(TARGET)),download) @$(MAKE) download-binary-docker else ifeq ($(strip $(TARGET)),debug) @go version || (code=$$?; printf "\033[0;31mError\033[0m: unable to build locally, try using the parameter TARGET=container or TARGET=download\n"; exit $$code) - CGO_ENABLED=0 GOOS=$(strip $(GOOS)) GOARCH=$(strip $(ARCH)) go build -ldflags "$(DEBUG_GO_LINKER_FLAGS)" -gcflags "$(DEBUG_GO_GC_FLAGS)" -o nginx-ingress github.com/nginxinc/kubernetes-ingress/cmd/nginx-ingress + CGO_ENABLED=0 GOOS=$(strip $(GOOS)) GOARCH=$(strip $(ARCH)) go build -ldflags "$(DEBUG_GO_LINKER_FLAGS)" -gcflags "$(DEBUG_GO_GC_FLAGS)" -o nginx-ingress github.com/nginx/kubernetes-ingress/cmd/nginx-ingress endif .PHONY: download-binary-docker diff --git a/README.md b/README.md index 2d13c24e6b..8f52c44d7d 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -[![OpenSSFScorecard](https://api.securityscorecards.dev/projects/github.com/nginxinc/kubernetes-ingress/badge)](https://api.securityscorecards.dev/projects/github.com/nginxinc/kubernetes-ingress) -[![Regression](https://github.com/nginxinc/kubernetes-ingress/actions/workflows/regression.yml/badge.svg?event=schedule)](https://github.com/nginxinc/kubernetes-ingress/actions/workflows/regression.yml?query=event%3Aschedule) -[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fkubernetes-ingress.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fkubernetes-ingress?ref=badge_shield) +[![OpenSSFScorecard](https://api.securityscorecards.dev/projects/github.com/nginx/kubernetes-ingress/badge)](https://api.securityscorecards.dev/projects/github.com/nginx/kubernetes-ingress) +[![Regression](https://github.com/nginx/kubernetes-ingress/actions/workflows/regression.yml/badge.svg?event=schedule)](https://github.com/nginx/kubernetes-ingress/actions/workflows/regression.yml?query=event%3Aschedule) +[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Fkubernetes-ingress.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Fkubernetes-ingress?ref=badge_shield) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) -[![Go Report Card](https://goreportcard.com/badge/github.com/nginxinc/kubernetes-ingress)](https://goreportcard.com/report/github.com/nginxinc/kubernetes-ingress) -[![codecov](https://codecov.io/gh/nginxinc/kubernetes-ingress/branch/main/graph/badge.svg?token=snCn7Y0zC7)](https://codecov.io/gh/nginxinc/kubernetes-ingress) -[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/nginxinc/kubernetes-ingress?logo=github&sort=semver)](https://github.com/nginxinc/kubernetes-ingress/releases/latest) -![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/nginxinc/kubernetes-ingress?logo=go) +[![Go Report Card](https://goreportcard.com/badge/github.com/nginx/kubernetes-ingress)](https://goreportcard.com/report/github.com/nginx/kubernetes-ingress) +[![codecov](https://codecov.io/gh/nginx/kubernetes-ingress/branch/main/graph/badge.svg?token=snCn7Y0zC7)](https://codecov.io/gh/nginx/kubernetes-ingress) +[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/nginx/kubernetes-ingress?logo=github&sort=semver)](https://github.com/nginx/kubernetes-ingress/releases/latest) +![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/nginx/kubernetes-ingress?logo=go) [![Docker Pulls](https://img.shields.io/docker/pulls/nginx/nginx-ingress?logo=docker&logoColor=white)](https://hub.docker.com/r/nginx/nginx-ingress) ![Docker Image Size (latest semver)](https://img.shields.io/docker/image-size/nginx/nginx-ingress?logo=docker&logoColor=white&sort=semver) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/nginx-ingress)](https://artifacthub.io/packages/container/nginx-ingress/kubernetes-ingress) @@ -24,13 +24,13 @@ This repo provides an implementation of an Ingress Controller for NGINX and NGIN We value community input and would love to see you at the next community call. At these calls, we discuss PRs by community members as well as issues, discussions and feature requests. -**Microsoft Teams Link**: [NIC - GitHub Issues Triage](https://teams.microsoft.com/l/meetup-join/19%3ameeting_OTRhZjFhMDMtZTQwOC00NDA4LWJiOGItZjhhMmE5NzgyMDY0%40thread.v2/0?context=%7b%22Tid%22%3a%22dd3dfd2f-6a3b-40d1-9be0-bf8327d81c50%22%2c%22Oid%22%3a%22ea616cee-2e02-45f5-8e4c-c24967346491%22%7d) +**Microsoft Teams Link**: [NIC - GitHub Issues Triage](https://teams.microsoft.com/l/meetup-join/19%3ameeting_OTRhZjFhMDMtZTQwOC00NDA4LWJiOGItZjhhMmE5NzgyMDY0%40thread.v2/0?context=%7b%22Tid%22%3a%22dd3dfd2f-6a3b-40d1-9be0-bf8327d81c50%22%2c%22Oid%22%3a%22ea616cee-2e02-45f5-8e4c-c24967346491%22%7d) **Meeting ID:** `298 140 979 789` **Passcode:** `jpx5TM` -**Slack**: Join our channel `#nginx-ingress-controller` on the [NGINX Community Slack](https://nginxcommunity.slack.com/channels/nginx-ingress-controller) for updates and discussions. +**Slack**: Join our channel `#nginx-ingress-controller` on the [NGINX Community Slack](https://nginxcommunity.slack.com/channels/nginx-ingress-controller) for updates and discussions. **When**: 15:00 GMT / [Convert to your timezone](https://dateful.com/convert/gmt?t=15), every other Monday. | **Community Call Dates** | @@ -105,32 +105,32 @@ In the case of NGINX, the Ingress Controller is deployed in a pod along with the > **Note** > > All documentation should only be used with the latest stable release, indicated on [the releases -> page](https://github.com/nginxinc/kubernetes-ingress/releases) of the GitHub repository. +> page](https://github.com/nginx/kubernetes-ingress/releases) of the GitHub repository. 1. Install NGINX Ingress Controller using the [Helm chart](https://docs.nginx.com/nginx-ingress-controller/installation/installing-nic/installation-with-helm/) or the Kubernetes [manifests](https://docs.nginx.com/nginx-ingress-controller/installation/installing-nic/installation-with-manifests/). 1. Configure load balancing for a simple web application: - Use the Ingress resource. See the [Cafe - example](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples/ingress-resources/complete-example). + example](https://github.com/nginx/kubernetes-ingress/tree/main/examples/ingress-resources/complete-example). - Or the VirtualServer resource. See the [Basic - configuration](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples/custom-resources/basic-configuration) + configuration](https://github.com/nginx/kubernetes-ingress/tree/main/examples/custom-resources/basic-configuration) example. -1. See additional configuration [examples](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples). +1. See additional configuration [examples](https://github.com/nginx/kubernetes-ingress/tree/main/examples). 1. Learn more about all available configuration and customization in the [docs](https://docs.nginx.com/nginx-ingress-controller/). ## NGINX Ingress Controller Releases We publish NGINX Ingress Controller releases on GitHub. See our [releases -page](https://github.com/nginxinc/kubernetes-ingress/releases). +page](https://github.com/nginx/kubernetes-ingress/releases). -The latest stable release is [4.0.0](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v4.0.0). For production +The latest stable release is [4.0.0](https://github.com/nginx/kubernetes-ingress/releases/tag/v4.0.0). For production use, we recommend that you choose the latest stable release. The edge version is useful for experimenting with new features that are not yet published in a stable release. To use it, choose the *edge* version built from the [latest -commit](https://github.com/nginxinc/kubernetes-ingress/commits/main) from the main branch. +commit](https://github.com/nginx/kubernetes-ingress/commits/main) from the main branch. To use NGINX Ingress Controller, you need to have access to: @@ -145,8 +145,8 @@ your links to the correct versions: | Version | Description | Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples | | ------- | ----------- | --------------- | -------------------- | ---------------------------------------| -------------------------- | -| Latest stable release | For production use | Use the 4.0.0 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-ingress-controller-image/). | Use the 4.0.0 images 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/build-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v4.0.0/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v4.0.0/charts/nginx-ingress). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). | -| Edge/Nightly | For testing and experimenting | Use the edge or nightly images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/main/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/main/charts/nginx-ingress). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/main/site/content). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples). | +| Latest stable release | For production use | Use the 4.0.0 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-ingress-controller-image/). | Use the 4.0.0 images 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/build-nginx-ingress-controller/). | [Manifests](https://github.com/nginx/kubernetes-ingress/tree/v4.0.0/deployments). [Helm chart](https://github.com/nginx/kubernetes-ingress/tree/v4.0.0/charts/nginx-ingress). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). | +| Edge/Nightly | For testing and experimenting | Use the edge or nightly images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Manifests](https://github.com/nginx/kubernetes-ingress/tree/main/deployments). [Helm chart](https://github.com/nginx/kubernetes-ingress/tree/main/charts/nginx-ingress). | [Documentation](https://github.com/nginx/kubernetes-ingress/tree/main/site/content). [Examples](https://github.com/nginx/kubernetes-ingress/tree/main/examples). | ## SBOM (Software Bill of Materials) @@ -160,7 +160,7 @@ The SBOMs for the binaries are available in the releases page. The SBOMs are gen ### Docker Images The SBOMs for the Docker images are available in the [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub -Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public +Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) repositories. The SBOMs are generated using [syft](https://github.com/anchore/syft) and stored as an attestation in the image manifest. diff --git a/build/Dockerfile b/build/Dockerfile index 744a4e1d2a..a6797fa12e 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -14,8 +14,8 @@ ARG PACKAGE_REPO=pkgs.nginx.com FROM ghcr.io/nginxinc/dependencies/nginx-ot:nginx-1.27.3@sha256:a09090e9f424f206a79a816d37321db2eed349ae3bc20d16bc4cbba32eedfc17 AS opentracing-lib FROM ghcr.io/nginxinc/dependencies/nginx-ot:nginx-1.27.3-alpine@sha256:339c91471fa9159987aa45ab81f00f147d49709819e207ccc0bc4d434ece2db9 AS alpine-opentracing-lib FROM ghcr.io/nginxinc/dependencies/nginx-ubi-ppc64le:nginx-1.27.3@sha256:4cda07664f09f16d780d1e803b9748c31489ea21c463bbcca50d9dcf26081a6f AS ubi-ppc64le -FROM ghcr.io/nginxinc/alpine-fips:0.2.3-alpine3.17@sha256:67b69b49aff96e185be841e2b2ff2d8236551ea5c18002bffa4344798d803fd8 AS alpine-fips-3.17 -FROM ghcr.io/nginxinc/alpine-fips:0.2.3-alpine3.20@sha256:4c29e5c50b122354d9d4ba6b97cdf64647468e788b965fc0240ead541653454a AS alpine-fips-3.20 +FROM ghcr.io/nginx/alpine-fips:0.2.3-alpine3.17@sha256:67b69b49aff96e185be841e2b2ff2d8236551ea5c18002bffa4344798d803fd8 AS alpine-fips-3.17 +FROM ghcr.io/nginx/alpine-fips:0.2.3-alpine3.20@sha256:4c29e5c50b122354d9d4ba6b97cdf64647468e788b965fc0240ead541653454a AS alpine-fips-3.20 FROM redhat/ubi9-minimal:9.5@sha256:daa61d6103e98bccf40d7a69a0d4f8786ec390e2204fd94f7cc49053e9949360 AS ubi-minimal FROM golang:1.23-alpine@sha256:13aaa4b92fd4dc81683816b4b62041442e9f685deeb848897ce78c5e2fb03af7 AS golang-builder @@ -58,14 +58,14 @@ ADD --link --chown=101:0 https://cs.nginx.com/static/files/nginx-plus-8.repo ngi ADD --link --chown=101:0 https://cs.nginx.com/static/files/plus-9.repo nginx-plus-9.repo ADD --link --chown=101:0 https://cs.nginx.com/static/files/app-protect-8.repo app-protect-8.repo ADD --link --chown=101:0 https://cs.nginx.com/static/files/app-protect-9.repo app-protect-9.repo -ADD --link --chown=101:0 https://raw.githubusercontent.com/nginxinc/k8s-common/main/files/nap-waf-v5-ubi-8.repo app-protect-v5-8.repo -ADD --link --chown=101:0 https://raw.githubusercontent.com/nginxinc/k8s-common/main/files/nap-waf-v5-ubi-9.repo app-protect-v5-9.repo +ADD --link --chown=101:0 https://raw.githubusercontent.com/nginx/k8s-common/main/files/nap-waf-v5-ubi-8.repo app-protect-v5-8.repo +ADD --link --chown=101:0 https://raw.githubusercontent.com/nginx/k8s-common/main/files/nap-waf-v5-ubi-9.repo app-protect-v5-9.repo ADD --link --chown=101:0 https://cs.nginx.com/static/files/app-protect-dos-9.repo app-protect-dos-9.repo -ADD --link --chown=101:0 https://raw.githubusercontent.com/nginxinc/k8s-common/main/files/plus-debian-12.repo debian-plus-12.sources -ADD --link --chown=101:0 https://raw.githubusercontent.com/nginxinc/k8s-common/main/files/nap-waf-debian-12.repo nap-waf-12.sources -ADD --link --chown=101:0 https://raw.githubusercontent.com/nginxinc/k8s-common/main/files/nap-dos-debian-12.repo nap-dos-12.sources -ADD --link --chown=101:0 https://raw.githubusercontent.com/nginxinc/k8s-common/main/files/nap-waf-v5-debian-12.repo nap-waf-v5-12.sources -ADD --link --chown=101:0 https://raw.githubusercontent.com/nginxinc/k8s-common/main/files/agent-debian-12.repo debian-agent-12.sources +ADD --link --chown=101:0 https://raw.githubusercontent.com/nginx/k8s-common/main/files/plus-debian-12.repo debian-plus-12.sources +ADD --link --chown=101:0 https://raw.githubusercontent.com/nginx/k8s-common/main/files/nap-waf-debian-12.repo nap-waf-12.sources +ADD --link --chown=101:0 https://raw.githubusercontent.com/nginx/k8s-common/main/files/nap-dos-debian-12.repo nap-dos-12.sources +ADD --link --chown=101:0 https://raw.githubusercontent.com/nginx/k8s-common/main/files/nap-waf-v5-debian-12.repo nap-waf-v5-12.sources +ADD --link --chown=101:0 https://raw.githubusercontent.com/nginx/k8s-common/main/files/agent-debian-12.repo debian-agent-12.sources ADD --link --chown=101:0 https://cs.nginx.com/static/files/nginx-agent.repo nginx-agent.repo RUN --mount=from=busybox:musl,src=/bin/,dst=/bin/ printf "%s\n" "Acquire::https::pkgs.nginx.com::User-Agent k8s-ic-$IC_VERSION${BUILD_OS##debian-plus}-apt;" >> 90pkgs-nginx \ @@ -77,7 +77,7 @@ RUN --mount=from=busybox:musl,src=/bin/,dst=/bin/ printf "%s\n" "Acquire::https: && sed -i -e "y/0/1/" -e "s;pkgs.nginx.com;${PACKAGE_REPO};g" nginx-agent.repo app-protect-v5-?.repo \ && echo HTTP_USER_AGENT="k8s-ic-$IC_VERSION${BUILD_OS##alpine-plus}-apk" > user_agent -ADD --link --chown=101:0 --chmod=0755 https://raw.githubusercontent.com/nginxinc/k8s-common/main/files/patch-os.sh patch-os.sh +ADD --link --chown=101:0 --chmod=0755 https://raw.githubusercontent.com/nginx/k8s-common/main/files/patch-os.sh patch-os.sh ADD --link --chown=101:0 --chmod=0755 build/scripts/common.sh common.sh ADD --link --chown=101:0 --chmod=0755 build/scripts/nap-waf.sh nap-waf.sh ADD --link --chown=101:0 --chmod=0755 build/scripts/nap-dos.sh nap-dos.sh @@ -564,13 +564,13 @@ FROM golang-builder AS builder ARG IC_VERSION ARG TARGETARCH -WORKDIR /go/src/github.com/nginxinc/kubernetes-ingress/ +WORKDIR /go/src/github.com/nginx/kubernetes-ingress/ RUN apk add --no-cache git libcap -RUN --mount=type=bind,target=/go/src/github.com/nginxinc/kubernetes-ingress/ --mount=type=cache,target=/root/.cache/go-build \ +RUN --mount=type=bind,target=/go/src/github.com/nginx/kubernetes-ingress/ --mount=type=cache,target=/root/.cache/go-build \ go mod download -RUN --mount=type=bind,target=/go/src/github.com/nginxinc/kubernetes-ingress/ --mount=type=cache,target=/root/.cache/go-build \ +RUN --mount=type=bind,target=/go/src/github.com/nginx/kubernetes-ingress/ --mount=type=cache,target=/root/.cache/go-build \ CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -trimpath -ldflags "-s -w -X main.version=${IC_VERSION}" \ - -o /nginx-ingress github.com/nginxinc/kubernetes-ingress/cmd/nginx-ingress \ + -o /nginx-ingress github.com/nginx/kubernetes-ingress/cmd/nginx-ingress \ && setcap 'cap_net_bind_service=+ep' /nginx-ingress && setcap -v 'cap_net_bind_service=+ep' /nginx-ingress @@ -578,12 +578,12 @@ RUN --mount=type=bind,target=/go/src/github.com/nginxinc/kubernetes-ingress/ --m FROM golang-builder AS debug-builder ARG TARGETARCH -WORKDIR /go/src/github.com/nginxinc/kubernetes-ingress/ +WORKDIR /go/src/github.com/nginx/kubernetes-ingress/ RUN apk add --no-cache git -RUN --mount=type=bind,target=/go/src/github.com/nginxinc/kubernetes-ingress/ --mount=type=cache,target=/root/.cache/go-build \ +RUN --mount=type=bind,target=/go/src/github.com/nginx/kubernetes-ingress/ --mount=type=cache,target=/root/.cache/go-build \ go mod download -RUN --mount=type=bind,target=/go/src/github.com/nginxinc/kubernetes-ingress/ --mount=type=cache,target=/root/.cache/go-build \ - CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -gcflags "all=-N -l" -o /nginx-ingress github.com/nginxinc/kubernetes-ingress/cmd/nginx-ingress +RUN --mount=type=bind,target=/go/src/github.com/nginx/kubernetes-ingress/ --mount=type=cache,target=/root/.cache/go-build \ + CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -gcflags "all=-N -l" -o /nginx-ingress github.com/nginx/kubernetes-ingress/cmd/nginx-ingress RUN CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/go-delve/delve/cmd/dlv@latest diff --git a/charts/nginx-ingress/Chart.yaml b/charts/nginx-ingress/Chart.yaml index c7c1bfbe8e..05824da320 100644 --- a/charts/nginx-ingress/Chart.yaml +++ b/charts/nginx-ingress/Chart.yaml @@ -5,13 +5,13 @@ appVersion: 4.1.0 kubeVersion: ">= 1.23.0-0" type: application description: NGINX Ingress Controller -icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v4.0.0/charts/nginx-ingress/chart-icon.png -home: https://github.com/nginxinc/kubernetes-ingress +icon: https://raw.githubusercontent.com/nginx/kubernetes-ingress/v4.0.0/charts/nginx-ingress/chart-icon.png +home: https://github.com/nginx/kubernetes-ingress sources: - - https://github.com/nginxinc/kubernetes-ingress/tree/v4.0.0/charts/nginx-ingress + - https://github.com/nginx/kubernetes-ingress/tree/v4.0.0/charts/nginx-ingress keywords: - ingress - nginx maintainers: - - name: nginxinc + - name: nginx email: kubernetes@nginx.com diff --git a/charts/nginx-ingress/templates/NOTES.txt b/charts/nginx-ingress/templates/NOTES.txt index c9a2739771..1fcca30c24 100644 --- a/charts/nginx-ingress/templates/NOTES.txt +++ b/charts/nginx-ingress/templates/NOTES.txt @@ -7,7 +7,7 @@ Installation and upgrade instructions: https://docs.nginx.com/nginx-ingress-cont {{ if .Release.IsUpgrade -}} If you are upgrading from a version of the chart that uses older Custom Resource Definitions (CRD) it is necessary to manually upgrade the CRDs as this is not managed by Helm. To update to the latest version of the CRDs: - $ kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{ .Chart.AppVersion }}/deploy/crds.yaml + $ kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{ .Chart.AppVersion }}/deploy/crds.yaml More details on upgrading the CRDs: https://docs.nginx.com/nginx-ingress-controller/installation/installing-nic/installation-with-helm/#upgrading-the-crds {{- end -}} diff --git a/cmd/nginx-ingress/flags.go b/cmd/nginx-ingress/flags.go index 0804ac796c..3471c7b855 100644 --- a/cmd/nginx-ingress/flags.go +++ b/cmd/nginx-ingress/flags.go @@ -9,12 +9,12 @@ import ( "regexp" "strings" - internalValidation "github.com/nginxinc/kubernetes-ingress/internal/validation" + internalValidation "github.com/nginx/kubernetes-ingress/internal/validation" api_v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/validation" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" ) const ( diff --git a/cmd/nginx-ingress/main.go b/cmd/nginx-ingress/main.go index 850920eee5..d91d868dfb 100644 --- a/cmd/nginx-ingress/main.go +++ b/cmd/nginx-ingress/main.go @@ -16,21 +16,21 @@ import ( "syscall" "time" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/healthcheck" - "github.com/nginxinc/kubernetes-ingress/internal/k8s" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - license_reporting "github.com/nginxinc/kubernetes-ingress/internal/license_reporting" - "github.com/nginxinc/kubernetes-ingress/internal/metrics" - "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - cr_validation "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - conf_scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" - "github.com/nginxinc/nginx-plus-go-client/v2/client" - nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector" + "github.com/nginx/kubernetes-ingress/internal/configs" + "github.com/nginx/kubernetes-ingress/internal/configs/version1" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/healthcheck" + "github.com/nginx/kubernetes-ingress/internal/k8s" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + license_reporting "github.com/nginx/kubernetes-ingress/internal/license_reporting" + "github.com/nginx/kubernetes-ingress/internal/metrics" + "github.com/nginx/kubernetes-ingress/internal/metrics/collectors" + "github.com/nginx/kubernetes-ingress/internal/nginx" + cr_validation "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/validation" + k8s_nginx "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + conf_scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + "github.com/nginx/nginx-plus-go-client/v2/client" + nginxCollector "github.com/nginx/nginx-prometheus-exporter/collector" "github.com/prometheus/client_golang/prometheus" api_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -45,9 +45,9 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/tools/record" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" ) // Injected during build diff --git a/cmd/nginx-ingress/main_test.go b/cmd/nginx-ingress/main_test.go index 8e62435911..c4de491e69 100644 --- a/cmd/nginx-ingress/main_test.go +++ b/cmd/nginx-ingress/main_test.go @@ -8,9 +8,9 @@ import ( "regexp" "testing" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" pkgversion "k8s.io/apimachinery/pkg/version" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/kubernetes/fake" diff --git a/examples/custom-resources/jwks/README.md b/examples/custom-resources/jwks/README.md index e8300bee18..f26bd81c88 100644 --- a/examples/custom-resources/jwks/README.md +++ b/examples/custom-resources/jwks/README.md @@ -2,7 +2,7 @@ In this example we deploy a web application, configure load balancing with a VirtualServer, and apply a JWT policy. Instead of using a local secret to verify the client request such as in the -[jwt](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples/custom-resources/jwt) example, we will define an +[jwt](https://github.com/nginx/kubernetes-ingress/tree/main/examples/custom-resources/jwt) example, we will define an external Identity Provider (IdP) using the `JwksURI` field. We will be using a deployment of [KeyCloak](https://www.keycloak.org/) to work as our IdP in this example. In this diff --git a/go.mod b/go.mod index 44961ea43e..f3bd3780ea 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nginxinc/kubernetes-ingress +module github.com/nginx/kubernetes-ingress go 1.23.4 @@ -12,8 +12,8 @@ require ( github.com/google/go-cmp v0.6.0 github.com/gruntwork-io/terratest v0.48.1 github.com/jinzhu/copier v0.4.0 - github.com/nginxinc/nginx-plus-go-client/v2 v2.1.0 - github.com/nginxinc/nginx-prometheus-exporter v1.4.0 + github.com/nginx/nginx-plus-go-client/v2 v2.2.0 + github.com/nginx/nginx-prometheus-exporter v1.4.1 github.com/nginxinc/nginx-service-mesh v1.7.0 github.com/nginxinc/telemetry-exporter v0.1.2 github.com/prometheus/client_golang v1.20.5 @@ -149,7 +149,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/pquerna/otp v1.4.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.60.1 // indirect + github.com/prometheus/common v0.61.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/rogpeppe/go-internal v1.13.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect @@ -178,13 +178,13 @@ require ( go.opentelemetry.io/proto/otlp v1.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.31.0 // indirect + golang.org/x/crypto v0.32.0 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/net v0.33.0 // indirect - golang.org/x/oauth2 v0.24.0 // indirect + golang.org/x/net v0.34.0 // indirect + golang.org/x/oauth2 v0.25.0 // indirect golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect + golang.org/x/sys v0.29.0 // indirect + golang.org/x/term v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.8.0 // indirect golang.org/x/tools v0.28.0 // indirect diff --git a/go.sum b/go.sum index 3cf2a82071..6202b805c8 100644 --- a/go.sum +++ b/go.sum @@ -311,10 +311,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nginxinc/nginx-plus-go-client/v2 v2.1.0 h1:1ViGtowDeR6339+6ik5rqyyCbxo22M4FxdLuEFdrghI= -github.com/nginxinc/nginx-plus-go-client/v2 v2.1.0/go.mod h1:/ohb6n086OtbLkOHbC+LWkyMG2MwLRnycSGe7+kl2CM= -github.com/nginxinc/nginx-prometheus-exporter v1.4.0 h1:/k4tsYJkNGufzQx4UPbWOOZzifxXKJl9iCklbvXib+Q= -github.com/nginxinc/nginx-prometheus-exporter v1.4.0/go.mod h1:WV8mTXldpz+TUvLwtgadgTgT74+ff1NoHr9ZQnSIYq8= +github.com/nginx/nginx-plus-go-client/v2 v2.2.0 h1:qwhx4fF/pq+h72/nE+o+XSH5mZmDU/R8fwim6VcZ8cM= +github.com/nginx/nginx-plus-go-client/v2 v2.2.0/go.mod h1:U7G5pqucUS1V4Uecs1xCsJ9knSsfwqhwu8ZEjoCYnmk= +github.com/nginx/nginx-prometheus-exporter v1.4.1 h1:sqA5VYSs4Rx8pX/NIE37yZR0gNlH1WYVZHONe38a93k= +github.com/nginx/nginx-prometheus-exporter v1.4.1/go.mod h1:TEU3FUxQKBvVgRkPyMuq9kclmUp/x0/ocr3K/8F7At8= github.com/nginxinc/nginx-service-mesh v1.7.0 h1:oxKr+Jdbxkos10VTy5xF2UHCcmfIhqWNlsOK/zPnZDM= github.com/nginxinc/nginx-service-mesh v1.7.0/go.mod h1:8tREM3kSEUGyk8JT8hdCf/9ol2kEo7hLR8b+m5Yd8Fs= github.com/nginxinc/telemetry-exporter v0.1.2 h1:97vUGhQYgQ2KEsXKCBmr5gqfuujJCKPHwdg5HKoANUs= @@ -339,8 +339,8 @@ github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+ github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc= -github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw= +github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= +github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= @@ -456,8 +456,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -478,10 +478,10 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= -golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70= +golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -505,16 +505,16 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= diff --git a/hack/changelog-template.txt b/hack/changelog-template.txt index cadedd12a7..2b6411ba5a 100644 --- a/hack/changelog-template.txt +++ b/hack/changelog-template.txt @@ -16,7 +16,7 @@ - For NGINX, use the %%IC_VERSION%% images from our [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name=%%IC_VERSION%%), -[GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), +[GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress). - For NGINX Plus, use the %%IC_VERSION%% images from the F5 Container registry or build your own image using the %%IC_VERSION%% source code - For Helm, use version %%HELM_CHART_VERSION%% of the chart. diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 7c146d0a1f..6e7cc9f40f 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -29,7 +29,7 @@ fi source "${CODEGEN_PKG}/kube_codegen.sh" -THIS_PKG="github.com/nginxinc/kubernetes-ingress" +THIS_PKG="github.com/nginx/kubernetes-ingress" kube::codegen::gen_helpers \ --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \ diff --git a/internal/certmanager/cm_controller.go b/internal/certmanager/cm_controller.go index 384b378513..ae1e5b5c09 100644 --- a/internal/certmanager/cm_controller.go +++ b/internal/certmanager/cm_controller.go @@ -37,11 +37,11 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - vsinformers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions" - listers_v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + k8s_nginx "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + vsinformers "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions" + listers_v1 "github.com/nginx/kubernetes-ingress/pkg/client/listers/configuration/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/internal/certmanager/cm_controller_test.go b/internal/certmanager/cm_controller_test.go index 3533b8d24a..2d0cde941d 100644 --- a/internal/certmanager/cm_controller_test.go +++ b/internal/certmanager/cm_controller_test.go @@ -25,7 +25,7 @@ import ( cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned" controllerpkg "github.com/cert-manager/cert-manager/pkg/controller" - testpkg "github.com/nginxinc/kubernetes-ingress/internal/certmanager/test_files" + testpkg "github.com/nginx/kubernetes-ingress/internal/certmanager/test_files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -33,8 +33,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" - vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + vsapi "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + k8s_nginx "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" ) func Test_controller_Register(t *testing.T) { diff --git a/internal/certmanager/helper.go b/internal/certmanager/helper.go index d6a8e39103..7f076cd254 100644 --- a/internal/certmanager/helper.go +++ b/internal/certmanager/helper.go @@ -28,7 +28,7 @@ import ( cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + vsapi "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" ) var ( diff --git a/internal/certmanager/helper_test.go b/internal/certmanager/helper_test.go index 2de36747cd..4824e28852 100644 --- a/internal/certmanager/helper_test.go +++ b/internal/certmanager/helper_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + vsapi "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" ) func Test_translateVsSpec(t *testing.T) { diff --git a/internal/certmanager/sync.go b/internal/certmanager/sync.go index 5732a1be2d..9b9bb76129 100644 --- a/internal/certmanager/sync.go +++ b/internal/certmanager/sync.go @@ -36,8 +36,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/record" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + vsapi "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" ) const ( diff --git a/internal/certmanager/sync_test.go b/internal/certmanager/sync_test.go index 0fb827ad29..db75b0df85 100644 --- a/internal/certmanager/sync_test.go +++ b/internal/certmanager/sync_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/types" coretesting "k8s.io/client-go/testing" - testpkg "github.com/nginxinc/kubernetes-ingress/internal/certmanager/test_files" - vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + testpkg "github.com/nginx/kubernetes-ingress/internal/certmanager/test_files" + vsapi "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" ) func TestSync(t *testing.T) { diff --git a/internal/certmanager/test_files/context_builder.go b/internal/certmanager/test_files/context_builder.go index 461a3e17a3..4407249251 100644 --- a/internal/certmanager/test_files/context_builder.go +++ b/internal/certmanager/test_files/context_builder.go @@ -38,9 +38,9 @@ import ( cmfake "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/fake" informers "github.com/cert-manager/cert-manager/pkg/client/informers/externalversions" "github.com/cert-manager/cert-manager/pkg/util" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - vsfake "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/fake" - vsinformers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions" + k8s_nginx "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + vsfake "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/fake" + vsinformers "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions" ) // Builder is a structure used to construct new Contexts for use during tests. diff --git a/internal/configs/annotations.go b/internal/configs/annotations.go index 964ac89318..8718dd151e 100644 --- a/internal/configs/annotations.go +++ b/internal/configs/annotations.go @@ -5,7 +5,7 @@ import ( "fmt" "slices" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" ) // JWTKeyAnnotation is the annotation where the Secret with a JWK is specified. diff --git a/internal/configs/config_params.go b/internal/configs/config_params.go index 6d427074cf..6d192a1838 100644 --- a/internal/configs/config_params.go +++ b/internal/configs/config_params.go @@ -3,8 +3,8 @@ package configs import ( "context" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/nginx" ) // ConfigParams holds NGINX configuration parameters that affect the main NGINX config diff --git a/internal/configs/configmaps.go b/internal/configs/configmaps.go index beb53abb06..38bc215788 100644 --- a/internal/configs/configmaps.go +++ b/internal/configs/configmaps.go @@ -10,9 +10,9 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - "github.com/nginxinc/kubernetes-ingress/internal/validation" + "github.com/nginx/kubernetes-ingress/internal/configs/version1" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + "github.com/nginx/kubernetes-ingress/internal/validation" ) const ( diff --git a/internal/configs/configurator.go b/internal/configs/configurator.go index f9150eeecd..0f449f7db9 100644 --- a/internal/configs/configurator.go +++ b/internal/configs/configurator.go @@ -7,27 +7,27 @@ import ( "os" "strings" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - "github.com/nginxinc/nginx-prometheus-exporter/collector" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginx/nginx-prometheus-exporter/collector" "github.com/spiffe/go-spiffe/v2/workloadapi" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" api_v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs/version1" + "github.com/nginx/kubernetes-ingress/internal/nginx" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - latCollector "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" + latCollector "github.com/nginx/kubernetes-ingress/internal/metrics/collectors" ) const ( diff --git a/internal/configs/configurator_bench_test.go b/internal/configs/configurator_bench_test.go index fde3016b1d..e06e15b345 100644 --- a/internal/configs/configurator_bench_test.go +++ b/internal/configs/configurator_bench_test.go @@ -6,10 +6,10 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs/version1" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/nginx" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" ) func createTestConfiguratorBench() (*Configurator, error) { diff --git a/internal/configs/configurator_test.go b/internal/configs/configurator_test.go index 2103ee10bb..fa734a1cc1 100644 --- a/internal/configs/configurator_test.go +++ b/internal/configs/configurator_test.go @@ -14,12 +14,12 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginx/kubernetes-ingress/internal/configs/version1" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginx/kubernetes-ingress/internal/nginx" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" api_v1 "k8s.io/api/core/v1" ) @@ -1964,7 +1964,7 @@ func createTransportServerExWithHostNoTLSPassthrough() TransportServerEx { var ( // customTestMainTemplate represents a custom Main template passed via ConfigMap customTestMainTemplate = `# TEST NEW MAIN TEMPLATE -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version1.MainConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version1.MainConfig*/ -}} worker_processes {{.WorkerProcesses}}; {{- if .WorkerRlimitNofile}} worker_rlimit_nofile {{.WorkerRlimitNofile}};{{end}} @@ -2333,7 +2333,7 @@ mgmt { // customTestIngressTemplate represents a custom Ingress template passed via ConfigMap customTestIngressTemplate = `# TEST NEW CUSTOM INGRESS TEMPLATE -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version1.IngressNginxConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version1.IngressNginxConfig*/ -}} # configuration for {{.Ingress.Namespace}}/{{.Ingress.Name}} {{- range $upstream := .Upstreams}} upstream {{$upstream.Name}} { @@ -2608,7 +2608,7 @@ server { // customTestVStemplate represents the custom VirtualServer template passed via ConfigMap customTestVStemplate = `# TEST CUSTOM VIRTUALSERVER TEMPLATE -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version2.VirtualServerConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version2.VirtualServerConfig*/ -}} {{ range $u := .Upstreams }} upstream {{ $u.Name }} { zone {{ $u.Name }} {{ if ne $u.UpstreamZoneSize "0" }}{{ $u.UpstreamZoneSize }}{{ else }}512k{{ end }}; @@ -3327,7 +3327,7 @@ server { // customTestTStemplate represents a custom TransportServer template passed via ConfigMap customTestTStemplate = `# TEST CUSTOM TRANSPORTSERVER TEMPLATE -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version2.TransportServerConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version2.TransportServerConfig*/ -}} {{- range $u := .Upstreams }} upstream {{ $u.Name }} { zone {{ $u.Name }} 512k; diff --git a/internal/configs/dos_test.go b/internal/configs/dos_test.go index 1ae17339a8..4fe9b4c1ef 100644 --- a/internal/configs/dos_test.go +++ b/internal/configs/dos_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/configs/ingress.go b/internal/configs/ingress.go index a7429272a8..0b185a7819 100644 --- a/internal/configs/ingress.go +++ b/internal/configs/ingress.go @@ -6,17 +6,17 @@ import ( "strconv" "strings" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + nl "github.com/nginx/kubernetes-ingress/internal/logger" api_v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" + "github.com/nginx/kubernetes-ingress/internal/configs/version1" ) const emptyHost = "" diff --git a/internal/configs/ingress_test.go b/internal/configs/ingress_test.go index 9881b753b0..9d8e1750a7 100644 --- a/internal/configs/ingress_test.go +++ b/internal/configs/ingress_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginx/kubernetes-ingress/internal/configs/version1" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/configs/parsing_helpers.go b/internal/configs/parsing_helpers.go index 5c31a5b1d8..17c5050903 100644 --- a/internal/configs/parsing_helpers.go +++ b/internal/configs/parsing_helpers.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/configs/parsing_helpers_test.go b/internal/configs/parsing_helpers_test.go index bfe61a65f8..6d4c7ecff6 100644 --- a/internal/configs/parsing_helpers_test.go +++ b/internal/configs/parsing_helpers_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/configs/transportserver.go b/internal/configs/transportserver.go index 7dabd46dfa..4bfa33a5d1 100644 --- a/internal/configs/transportserver.go +++ b/internal/configs/transportserver.go @@ -7,9 +7,9 @@ import ( api_v1 "k8s.io/api/core/v1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" ) const nginxNonExistingUnixSocket = "unix:/var/lib/nginx/non-existing-unix-socket.sock" diff --git a/internal/configs/transportserver_test.go b/internal/configs/transportserver_test.go index c0abb19b66..6b34d0f990 100644 --- a/internal/configs/transportserver_test.go +++ b/internal/configs/transportserver_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" api_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/configs/version1/config.go b/internal/configs/version1/config.go index 2302f55ae9..b9663304cd 100644 --- a/internal/configs/version1/config.go +++ b/internal/configs/version1/config.go @@ -1,8 +1,8 @@ package version1 import ( - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/nginx" ) // UpstreamLabels describes the Prometheus labels for an NGINX upstream. diff --git a/internal/configs/version1/nginx-plus.ingress.tmpl b/internal/configs/version1/nginx-plus.ingress.tmpl index 4f9fdbf6bb..d887810d67 100644 --- a/internal/configs/version1/nginx-plus.ingress.tmpl +++ b/internal/configs/version1/nginx-plus.ingress.tmpl @@ -1,4 +1,4 @@ -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version1.IngressNginxConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version1.IngressNginxConfig*/ -}} # configuration for {{.Ingress.Namespace}}/{{.Ingress.Name}} {{- range $upstream := .Upstreams}} upstream {{$upstream.Name}} { diff --git a/internal/configs/version1/nginx-plus.tmpl b/internal/configs/version1/nginx-plus.tmpl index b03471eea0..cc8b264358 100644 --- a/internal/configs/version1/nginx-plus.tmpl +++ b/internal/configs/version1/nginx-plus.tmpl @@ -1,4 +1,4 @@ -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version1.MainConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version1.MainConfig*/ -}} worker_processes {{.WorkerProcesses}}; {{- if .WorkerRlimitNofile}} worker_rlimit_nofile {{.WorkerRlimitNofile}};{{end}} diff --git a/internal/configs/version1/nginx.ingress.tmpl b/internal/configs/version1/nginx.ingress.tmpl index d018698a59..1d7ca8cd87 100644 --- a/internal/configs/version1/nginx.ingress.tmpl +++ b/internal/configs/version1/nginx.ingress.tmpl @@ -1,4 +1,4 @@ -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version1.IngressNginxConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version1.IngressNginxConfig*/ -}} # configuration for {{.Ingress.Namespace}}/{{.Ingress.Name}} {{- range $upstream := .Upstreams}} upstream {{$upstream.Name}} { diff --git a/internal/configs/version1/nginx.tmpl b/internal/configs/version1/nginx.tmpl index 04677d943f..e58df6549d 100644 --- a/internal/configs/version1/nginx.tmpl +++ b/internal/configs/version1/nginx.tmpl @@ -1,4 +1,4 @@ -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version1.MainConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version1.MainConfig*/ -}} worker_processes {{.WorkerProcesses}}; {{- if .WorkerRlimitNofile}} worker_rlimit_nofile {{.WorkerRlimitNofile}};{{end}} diff --git a/internal/configs/version1/template_executor_test.go b/internal/configs/version1/template_executor_test.go index f6a0bd5b5e..dc99fcfae7 100644 --- a/internal/configs/version1/template_executor_test.go +++ b/internal/configs/version1/template_executor_test.go @@ -111,7 +111,7 @@ func newTestTemplateExecutor(t *testing.T) *TemplateExecutor { // custom Main Template represents a main-template passed via ConfigMap var customMainTemplate = `# TEST NEW MAIN TEMPLATE -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version1.MainConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version1.MainConfig*/ -}} worker_processes {{.WorkerProcesses}}; {{- if .WorkerRlimitNofile}} worker_rlimit_nofile {{.WorkerRlimitNofile}};{{end}} @@ -480,7 +480,7 @@ mgmt { // custom Ingress Template represents an ingress-template passed via ConfigMap var customIngressTemplate = `# TEST NEW CUSTOM INGRESS TEMPLATE -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version1.IngressNginxConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version1.IngressNginxConfig*/ -}} # configuration for {{.Ingress.Namespace}}/{{.Ingress.Name}} {{- range $upstream := .Upstreams}} upstream {{$upstream.Name}} { diff --git a/internal/configs/version1/template_helper.go b/internal/configs/version1/template_helper.go index 75a99af450..ba0e673c6e 100644 --- a/internal/configs/version1/template_helper.go +++ b/internal/configs/version1/template_helper.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "github.com/nginxinc/kubernetes-ingress/internal/configs/commonhelpers" + "github.com/nginx/kubernetes-ingress/internal/configs/commonhelpers" ) func split(s string, delim string) []string { diff --git a/internal/configs/version1/template_test.go b/internal/configs/version1/template_test.go index 440bd4b91b..c60c4c333a 100644 --- a/internal/configs/version1/template_test.go +++ b/internal/configs/version1/template_test.go @@ -9,7 +9,7 @@ import ( "text/template" "github.com/gkampitakis/go-snaps/snaps" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" + "github.com/nginx/kubernetes-ingress/internal/nginx" ) var fakeManager = nginx.NewFakeManager("/etc/nginx") diff --git a/internal/configs/version2/nginx-plus.transportserver.tmpl b/internal/configs/version2/nginx-plus.transportserver.tmpl index 3d37d3dfa9..a24ab8237b 100644 --- a/internal/configs/version2/nginx-plus.transportserver.tmpl +++ b/internal/configs/version2/nginx-plus.transportserver.tmpl @@ -1,4 +1,4 @@ -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version2.TransportServerConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version2.TransportServerConfig*/ -}} {{- range $u := .Upstreams }} upstream {{ $u.Name }} { zone {{ $u.Name }} 512k; diff --git a/internal/configs/version2/nginx-plus.virtualserver.tmpl b/internal/configs/version2/nginx-plus.virtualserver.tmpl index 06c9347328..a3adbb7955 100644 --- a/internal/configs/version2/nginx-plus.virtualserver.tmpl +++ b/internal/configs/version2/nginx-plus.virtualserver.tmpl @@ -1,4 +1,4 @@ -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version2.VirtualServerConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version2.VirtualServerConfig*/ -}} {{ range $u := .Upstreams }} upstream {{ $u.Name }} { zone {{ $u.Name }} {{ if ne $u.UpstreamZoneSize "0" }}{{ $u.UpstreamZoneSize }}{{ else }}512k{{ end }}; diff --git a/internal/configs/version2/nginx.transportserver.tmpl b/internal/configs/version2/nginx.transportserver.tmpl index 7715fff38a..f017207455 100644 --- a/internal/configs/version2/nginx.transportserver.tmpl +++ b/internal/configs/version2/nginx.transportserver.tmpl @@ -1,4 +1,4 @@ -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version2.TransportServerConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version2.TransportServerConfig*/ -}} {{- range $u := .Upstreams }} upstream {{ $u.Name }} { zone {{ $u.Name }} 512k; diff --git a/internal/configs/version2/nginx.virtualserver.tmpl b/internal/configs/version2/nginx.virtualserver.tmpl index d1153170db..765bf7c5b3 100644 --- a/internal/configs/version2/nginx.virtualserver.tmpl +++ b/internal/configs/version2/nginx.virtualserver.tmpl @@ -1,4 +1,4 @@ -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version2.VirtualServerConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version2.VirtualServerConfig*/ -}} {{ range $u := .Upstreams }} upstream {{ $u.Name }} { {{- if ne $u.UpstreamZoneSize "0" }}zone {{ $u.Name }} {{ $u.UpstreamZoneSize }};{{ end }} diff --git a/internal/configs/version2/template_executor_test.go b/internal/configs/version2/template_executor_test.go index 6a2c5953b9..9362d241e4 100644 --- a/internal/configs/version2/template_executor_test.go +++ b/internal/configs/version2/template_executor_test.go @@ -104,7 +104,7 @@ func newTestTemplateExecutor(t *testing.T) *TemplateExecutor { // custom VStemplate represents the virtualserver template passed via ConfigMap var customTestVStemplate = `# TEST CUSTOM VIRTUALSERVER TEMPLATE -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version2.VirtualServerConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version2.VirtualServerConfig*/ -}} {{ range $u := .Upstreams }} upstream {{ $u.Name }} { zone {{ $u.Name }} {{ if ne $u.UpstreamZoneSize "0" }}{{ $u.UpstreamZoneSize }}{{ else }}512k{{ end }}; @@ -823,7 +823,7 @@ server { // custom TStemplate represents the transportserver template passed via ConfigMap var customTestTStemplate = `# TEST CUSTOM TRANSPORTSERVER TEMPLATE -{{- /*gotype: github.com/nginxinc/kubernetes-ingress/internal/configs/version2.TransportServerConfig*/ -}} +{{- /*gotype: github.com/nginx/kubernetes-ingress/internal/configs/version2.TransportServerConfig*/ -}} {{- range $u := .Upstreams }} upstream {{ $u.Name }} { zone {{ $u.Name }} 512k; diff --git a/internal/configs/version2/template_helper.go b/internal/configs/version2/template_helper.go index 8dec8347ab..667f158e94 100644 --- a/internal/configs/version2/template_helper.go +++ b/internal/configs/version2/template_helper.go @@ -6,7 +6,7 @@ import ( "strings" "text/template" - "github.com/nginxinc/kubernetes-ingress/internal/configs/commonhelpers" + "github.com/nginx/kubernetes-ingress/internal/configs/commonhelpers" ) type protocol int diff --git a/internal/configs/virtualserver.go b/internal/configs/virtualserver.go index 9518765e7b..64a6adbb3a 100644 --- a/internal/configs/virtualserver.go +++ b/internal/configs/virtualserver.go @@ -12,11 +12,11 @@ import ( "strconv" "strings" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + "github.com/nginx/kubernetes-ingress/internal/nginx" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" api_v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/labels" diff --git a/internal/configs/virtualserver_test.go b/internal/configs/virtualserver_test.go index c833d9fe9a..a5f3c5b005 100644 --- a/internal/configs/virtualserver_test.go +++ b/internal/configs/virtualserver_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginx/kubernetes-ingress/internal/nginx" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" api_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/externaldns/controller.go b/internal/externaldns/controller.go index c82292fc67..141aed430f 100644 --- a/internal/externaldns/controller.go +++ b/internal/externaldns/controller.go @@ -6,12 +6,12 @@ import ( "sync" "time" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - extdns_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - listersV1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" - extdnslisters "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + extdns_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" + k8s_nginx "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + listersV1 "github.com/nginx/kubernetes-ingress/pkg/client/listers/configuration/v1" + extdnslisters "github.com/nginx/kubernetes-ingress/pkg/client/listers/externaldns/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -20,7 +20,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - k8s_nginx_informers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions" + k8s_nginx_informers "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions" ) const ( diff --git a/internal/externaldns/sync.go b/internal/externaldns/sync.go index 092ea49f1c..3024b8bd3f 100644 --- a/internal/externaldns/sync.go +++ b/internal/externaldns/sync.go @@ -6,11 +6,11 @@ import ( "fmt" "github.com/google/go-cmp/cmp" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - extdnsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - clientset "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - extdnslisters "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + vsapi "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + extdnsapi "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" + clientset "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + extdnslisters "github.com/nginx/kubernetes-ingress/pkg/client/listers/externaldns/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" validators "k8s.io/apimachinery/pkg/util/validation" diff --git a/internal/externaldns/sync_test.go b/internal/externaldns/sync_test.go index 0d85e26a02..0946550202 100644 --- a/internal/externaldns/sync_test.go +++ b/internal/externaldns/sync_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - extdnsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - extdnsclient "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1" + vsapi "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + extdnsapi "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" + extdnsclient "github.com/nginx/kubernetes-ingress/pkg/client/listers/externaldns/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/healthcheck/healthcheck.go b/internal/healthcheck/healthcheck.go index d3953da693..bf289fcae4 100644 --- a/internal/healthcheck/healthcheck.go +++ b/internal/healthcheck/healthcheck.go @@ -13,12 +13,12 @@ import ( "strings" "time" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" v1 "k8s.io/api/core/v1" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - "github.com/nginxinc/nginx-plus-go-client/v2/client" + "github.com/nginx/kubernetes-ingress/internal/configs" + "github.com/nginx/nginx-plus-go-client/v2/client" "k8s.io/utils/strings/slices" ) diff --git a/internal/healthcheck/healthcheck_test.go b/internal/healthcheck/healthcheck_test.go index f72af9388c..a3a8efb2cd 100644 --- a/internal/healthcheck/healthcheck_test.go +++ b/internal/healthcheck/healthcheck_test.go @@ -10,12 +10,12 @@ import ( "net/http/httptest" "testing" - nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" + nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/healthcheck" - "github.com/nginxinc/nginx-plus-go-client/v2/client" + "github.com/nginx/kubernetes-ingress/internal/healthcheck" + "github.com/nginx/nginx-plus-go-client/v2/client" ) // testHandler creates http handler for testing HealthServer. diff --git a/internal/k8s/appprotect/app_protect_configuration.go b/internal/k8s/appprotect/app_protect_configuration.go index c1778a9e1d..587b4aca0a 100644 --- a/internal/k8s/appprotect/app_protect_configuration.go +++ b/internal/k8s/appprotect/app_protect_configuration.go @@ -7,9 +7,9 @@ import ( "sort" "time" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" + "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/validation" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon" + "github.com/nginx/kubernetes-ingress/internal/k8s/appprotectcommon" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/k8s/appprotect/app_protect_configuration_test.go b/internal/k8s/appprotect/app_protect_configuration_test.go index 9d99d9c35e..7328924482 100644 --- a/internal/k8s/appprotect/app_protect_configuration_test.go +++ b/internal/k8s/appprotect/app_protect_configuration_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" + nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" diff --git a/internal/k8s/appprotect_dos.go b/internal/k8s/appprotect_dos.go index 40ad8a2b03..96f0c1d7e6 100644 --- a/internal/k8s/appprotect_dos.go +++ b/internal/k8s/appprotect_dos.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectdos" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginx/kubernetes-ingress/internal/k8s/appprotectdos" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" api_v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/client-go/tools/cache" diff --git a/internal/k8s/appprotect_waf.go b/internal/k8s/appprotect_waf.go index 7de80f7280..adfd8ad893 100644 --- a/internal/k8s/appprotect_waf.go +++ b/internal/k8s/appprotect_waf.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotect" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs" + "github.com/nginx/kubernetes-ingress/internal/k8s/appprotect" + "github.com/nginx/kubernetes-ingress/internal/k8s/appprotectcommon" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" api_v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/internal/k8s/appprotect_waf_test.go b/internal/k8s/appprotect_waf_test.go index a73ea006e6..5dae9a5b12 100644 --- a/internal/k8s/appprotect_waf_test.go +++ b/internal/k8s/appprotect_waf_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotect" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/k8s/appprotect" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/k8s/appprotectdos/app_protect_dos_configuration.go b/internal/k8s/appprotectdos/app_protect_dos_configuration.go index f01a671a97..5a30bf387d 100644 --- a/internal/k8s/appprotectdos/app_protect_dos_configuration.go +++ b/internal/k8s/appprotectdos/app_protect_dos_configuration.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/validation" + "github.com/nginx/kubernetes-ingress/internal/configs" + "github.com/nginx/kubernetes-ingress/internal/k8s/appprotectcommon" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/validation" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/k8s/appprotectdos/app_protect_dos_configuration_test.go b/internal/k8s/appprotectdos/app_protect_dos_configuration_test.go index 8b66934763..9b2e995cc1 100644 --- a/internal/k8s/appprotectdos/app_protect_dos_configuration_test.go +++ b/internal/k8s/appprotectdos/app_protect_dos_configuration_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginx/kubernetes-ingress/internal/configs" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/k8s/configmap.go b/internal/k8s/configmap.go index 8d7e86a419..39c0b0878f 100644 --- a/internal/k8s/configmap.go +++ b/internal/k8s/configmap.go @@ -3,7 +3,7 @@ package k8s import ( "reflect" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/client-go/tools/cache" diff --git a/internal/k8s/configuration.go b/internal/k8s/configuration.go index 139bf3f7a4..a09cd89f25 100644 --- a/internal/k8s/configuration.go +++ b/internal/k8s/configuration.go @@ -7,9 +7,9 @@ import ( "strings" "sync" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" + "github.com/nginx/kubernetes-ingress/internal/configs" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/validation" networking "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/k8s/configuration_test.go b/internal/k8s/configuration_test.go index b8d0289f09..611e60fb6f 100644 --- a/internal/k8s/configuration_test.go +++ b/internal/k8s/configuration_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - nic_logger "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" + nic_logger "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/validation" networking "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/k8s/controller.go b/internal/k8s/controller.go index 8e7ef8c8ef..0feca96146 100644 --- a/internal/k8s/controller.go +++ b/internal/k8s/controller.go @@ -27,15 +27,15 @@ import ( "sync" "time" - "github.com/nginxinc/kubernetes-ingress/internal/telemetry" + "github.com/nginx/kubernetes-ingress/internal/telemetry" "golang.org/x/exp/maps" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotect" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectdos" + "github.com/nginx/kubernetes-ingress/internal/k8s/appprotect" + "github.com/nginx/kubernetes-ingress/internal/k8s/appprotectdos" "k8s.io/client-go/informers" "k8s.io/client-go/rest" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" "github.com/nginxinc/nginx-service-mesh/pkg/spiffe" "github.com/spiffe/go-spiffe/v2/workloadapi" @@ -48,22 +48,22 @@ import ( "k8s.io/client-go/tools/leaderelection" "k8s.io/client-go/tools/record" - cm_controller "github.com/nginxinc/kubernetes-ingress/internal/certmanager" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - ed_controller "github.com/nginxinc/kubernetes-ingress/internal/externaldns" - "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" + cm_controller "github.com/nginx/kubernetes-ingress/internal/certmanager" + "github.com/nginx/kubernetes-ingress/internal/configs" + ed_controller "github.com/nginx/kubernetes-ingress/internal/externaldns" + "github.com/nginx/kubernetes-ingress/internal/metrics/collectors" api_v1 "k8s.io/api/core/v1" discovery_v1 "k8s.io/api/discovery/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - k8s_nginx_informers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/validation" + k8s_nginx "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + k8s_nginx_informers "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" @@ -979,7 +979,7 @@ func (lbc *LoadBalancerController) updateAllConfigs() { // If we don't add Secrets, there is a chance that during the IC start // syncing an Ingress or other resource that references a Secret will happen before that Secret was synced. // As a result, the IC will generate configuration for that resource assuming that the Secret is missing and -// it will report warnings. (See https://github.com/nginxinc/kubernetes-ingress/issues/1448 ) +// it will report warnings. (See https://github.com/nginx/kubernetes-ingress/issues/1448 ) func (lbc *LoadBalancerController) preSyncSecrets() { for _, ni := range lbc.namespacedInformers { if !ni.isSecretsEnabledNamespace { diff --git a/internal/k8s/controller_test.go b/internal/k8s/controller_test.go index 777a195b41..c76a230ee2 100644 --- a/internal/k8s/controller_test.go +++ b/internal/k8s/controller_test.go @@ -10,19 +10,19 @@ import ( "testing" "time" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - "github.com/nginxinc/kubernetes-ingress/internal/telemetry" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + "github.com/nginx/kubernetes-ingress/internal/telemetry" discovery_v1 "k8s.io/api/discovery/v1" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs" + "github.com/nginx/kubernetes-ingress/internal/configs/version1" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginx/kubernetes-ingress/internal/metrics/collectors" + "github.com/nginx/kubernetes-ingress/internal/nginx" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" api_v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/k8s/endpoint_slice.go b/internal/k8s/endpoint_slice.go index 60ba79eebc..42bd2dbbb6 100644 --- a/internal/k8s/endpoint_slice.go +++ b/internal/k8s/endpoint_slice.go @@ -3,7 +3,7 @@ package k8s import ( "reflect" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" discovery_v1 "k8s.io/api/discovery/v1" "k8s.io/client-go/tools/cache" ) diff --git a/internal/k8s/global_configuration.go b/internal/k8s/global_configuration.go index fb71023b04..746173f722 100644 --- a/internal/k8s/global_configuration.go +++ b/internal/k8s/global_configuration.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" api_v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/client-go/tools/cache" diff --git a/internal/k8s/handlers.go b/internal/k8s/handlers.go index cc40b0fd8d..3bcfcc24ae 100644 --- a/internal/k8s/handlers.go +++ b/internal/k8s/handlers.go @@ -7,13 +7,13 @@ import ( "github.com/jinzhu/copier" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + nl "github.com/nginx/kubernetes-ingress/internal/logger" v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" "k8s.io/client-go/tools/cache" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/k8s/handlers_test.go b/internal/k8s/handlers_test.go index 2861c33606..7dd2ea35e4 100644 --- a/internal/k8s/handlers_test.go +++ b/internal/k8s/handlers_test.go @@ -6,8 +6,8 @@ import ( "log/slog" "testing" - nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" + nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/k8s/ingress_link.go b/internal/k8s/ingress_link.go index fbfe3df76b..881a40491e 100644 --- a/internal/k8s/ingress_link.go +++ b/internal/k8s/ingress_link.go @@ -1,7 +1,7 @@ package k8s import ( - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/fields" diff --git a/internal/k8s/leader.go b/internal/k8s/leader.go index 81f5faae8b..a8c211792f 100644 --- a/internal/k8s/leader.go +++ b/internal/k8s/leader.go @@ -6,9 +6,9 @@ import ( "os" "time" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/validation" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/k8s/namespace.go b/internal/k8s/namespace.go index 69516ad7d3..176fb253a6 100644 --- a/internal/k8s/namespace.go +++ b/internal/k8s/namespace.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" api_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" diff --git a/internal/k8s/policy.go b/internal/k8s/policy.go index fd2d71e0b3..cd74e2c32e 100644 --- a/internal/k8s/policy.go +++ b/internal/k8s/policy.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/validation" api_v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/internal/k8s/reference_checkers.go b/internal/k8s/reference_checkers.go index c4241d032f..97c522691a 100644 --- a/internal/k8s/reference_checkers.go +++ b/internal/k8s/reference_checkers.go @@ -3,8 +3,8 @@ package k8s import ( "strings" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" networking "k8s.io/api/networking/v1" ) diff --git a/internal/k8s/reference_checkers_test.go b/internal/k8s/reference_checkers_test.go index 0556f9c815..04135a080e 100644 --- a/internal/k8s/reference_checkers_test.go +++ b/internal/k8s/reference_checkers_test.go @@ -3,8 +3,8 @@ package k8s import ( "testing" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" networking "k8s.io/api/networking/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/k8s/service.go b/internal/k8s/service.go index 97d9e46cb8..3a63275746 100644 --- a/internal/k8s/service.go +++ b/internal/k8s/service.go @@ -4,7 +4,7 @@ import ( "reflect" "sort" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/internal/k8s/status.go b/internal/k8s/status.go index b166acf141..a9c8c49b1b 100644 --- a/internal/k8s/status.go +++ b/internal/k8s/status.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + k8s_nginx "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" api_v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/k8s/status_test.go b/internal/k8s/status_test.go index 6df2770ade..a3911a6b85 100644 --- a/internal/k8s/status_test.go +++ b/internal/k8s/status_test.go @@ -9,10 +9,10 @@ import ( "time" "github.com/google/go-cmp/cmp" - nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - fake_v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/fake" + nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + fake_v1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/fake" v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/k8s/task_queue.go b/internal/k8s/task_queue.go index 768abef54c..dbdc3dccd2 100644 --- a/internal/k8s/task_queue.go +++ b/internal/k8s/task_queue.go @@ -5,12 +5,12 @@ import ( "log/slog" "time" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotect" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectdos" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/k8s/appprotect" + "github.com/nginx/kubernetes-ingress/internal/k8s/appprotectdos" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" v1 "k8s.io/api/core/v1" discovery_v1 "k8s.io/api/discovery/v1" networking "k8s.io/api/networking/v1" diff --git a/internal/k8s/transport_server.go b/internal/k8s/transport_server.go index 97e033ca8b..09061f7699 100644 --- a/internal/k8s/transport_server.go +++ b/internal/k8s/transport_server.go @@ -6,10 +6,10 @@ import ( "reflect" "time" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" api_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" diff --git a/internal/k8s/validation.go b/internal/k8s/validation.go index b7324f8bc7..74ad80fb5b 100644 --- a/internal/k8s/validation.go +++ b/internal/k8s/validation.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/dlclark/regexp2" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - ap_validation "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" + "github.com/nginx/kubernetes-ingress/internal/configs" + ap_validation "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/validation" networking "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" diff --git a/internal/license_reporting/license_reporting.go b/internal/license_reporting/license_reporting.go index 2626272d80..bc2dcbbfd7 100644 --- a/internal/license_reporting/license_reporting.go +++ b/internal/license_reporting/license_reporting.go @@ -9,10 +9,10 @@ import ( "path/filepath" "time" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - "github.com/nginxinc/nginx-plus-go-client/v2/client" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + "github.com/nginx/nginx-plus-go-client/v2/client" - clusterInfo "github.com/nginxinc/kubernetes-ingress/internal/common_cluster_info" + clusterInfo "github.com/nginx/kubernetes-ingress/internal/common_cluster_info" api_v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" diff --git a/internal/license_reporting/license_reporting_test.go b/internal/license_reporting/license_reporting_test.go index 90170fdb46..ff9e80c495 100644 --- a/internal/license_reporting/license_reporting_test.go +++ b/internal/license_reporting/license_reporting_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" - "github.com/nginxinc/nginx-plus-go-client/v2/client" + nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" + "github.com/nginx/nginx-plus-go-client/v2/client" v1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/internal/logger/glog/handler.go b/internal/logger/glog/handler.go index d5fa0e0459..76a9d8f0d5 100644 --- a/internal/logger/glog/handler.go +++ b/internal/logger/glog/handler.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" ) // Handler holds all the parameters for the handler diff --git a/internal/logger/glog/handler_test.go b/internal/logger/glog/handler_test.go index 08bf50e19a..d168ee5ebb 100644 --- a/internal/logger/glog/handler_test.go +++ b/internal/logger/glog/handler_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" ) func TestGlogFormat(t *testing.T) { diff --git a/internal/logger/logger.go b/internal/logger/logger.go index 2d89b7bed9..00047b8cc8 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -8,8 +8,8 @@ import ( "runtime" "time" - "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" + "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" ) type ctxLogger struct{} diff --git a/internal/metrics/collectors/latency.go b/internal/metrics/collectors/latency.go index 66fb55bc02..4975a14dbf 100644 --- a/internal/metrics/collectors/latency.go +++ b/internal/metrics/collectors/latency.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" "github.com/prometheus/client_golang/prometheus" ) @@ -190,8 +190,8 @@ func (l *LatencyMetricsCollector) RecordLatency(syslogMsg string) { // Upstream for gRPC service is not implemented yet. // This is a temp solution to avoid spamming error logs. // Ref: - // https://github.com/nginxinc/kubernetes-ingress/issues/5010 - // https://github.com/nginxinc/kubernetes-ingress/issues/6124 + // https://github.com/nginx/kubernetes-ingress/issues/5010 + // https://github.com/nginx/kubernetes-ingress/issues/6124 if lm.Upstream == "-" { nl.Debugf(l.logger, "latency metrics for gRPC upstreams: %v", lm) return diff --git a/internal/metrics/collectors/processes.go b/internal/metrics/collectors/processes.go index b08a338ba4..21763f0fe8 100644 --- a/internal/metrics/collectors/processes.go +++ b/internal/metrics/collectors/processes.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/metrics/listener.go b/internal/metrics/listener.go index 9a78ad11d9..b5dc8e471f 100644 --- a/internal/metrics/listener.go +++ b/internal/metrics/listener.go @@ -10,13 +10,13 @@ import ( "strconv" "time" - prometheusClient "github.com/nginxinc/nginx-prometheus-exporter/client" - nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector" + prometheusClient "github.com/nginx/nginx-prometheus-exporter/client" + nginxCollector "github.com/nginx/nginx-prometheus-exporter/collector" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" v1 "k8s.io/api/core/v1" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" ) // NewNginxMetricsClient creates an NginxClient to fetch stats from NGINX over an unix socket diff --git a/internal/metrics/syslog_listener.go b/internal/metrics/syslog_listener.go index 50fc9a3f61..aa38255f5c 100644 --- a/internal/metrics/syslog_listener.go +++ b/internal/metrics/syslog_listener.go @@ -6,8 +6,8 @@ import ( "log/slog" "net" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + "github.com/nginx/kubernetes-ingress/internal/metrics/collectors" ) // SyslogListener is an interface for syslog metrics listener diff --git a/internal/nginx/fake_manager.go b/internal/nginx/fake_manager.go index aa87fc4f40..99b26b28a9 100644 --- a/internal/nginx/fake_manager.go +++ b/internal/nginx/fake_manager.go @@ -6,10 +6,10 @@ import ( "os" "path" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" - "github.com/nginxinc/nginx-plus-go-client/v2/client" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" + "github.com/nginx/nginx-plus-go-client/v2/client" ) // FakeManager provides a fake implementation of the Manager interface. diff --git a/internal/nginx/manager.go b/internal/nginx/manager.go index 005f91b0dc..33d2af8533 100644 --- a/internal/nginx/manager.go +++ b/internal/nginx/manager.go @@ -14,11 +14,11 @@ import ( "strings" "time" - license_reporting "github.com/nginxinc/kubernetes-ingress/internal/license_reporting" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" + license_reporting "github.com/nginx/kubernetes-ingress/internal/license_reporting" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + "github.com/nginx/kubernetes-ingress/internal/metrics/collectors" - "github.com/nginxinc/nginx-plus-go-client/v2/client" + "github.com/nginx/nginx-plus-go-client/v2/client" ) const ( diff --git a/internal/nginx/manager_test.go b/internal/nginx/manager_test.go index aca17c4343..43938eb235 100644 --- a/internal/nginx/manager_test.go +++ b/internal/nginx/manager_test.go @@ -3,7 +3,7 @@ package nginx import ( "testing" - "github.com/nginxinc/nginx-plus-go-client/v2/client" + "github.com/nginx/nginx-plus-go-client/v2/client" ) // Helper functions to create pointers diff --git a/internal/nginx/utils.go b/internal/nginx/utils.go index 7130c6429d..156576e359 100644 --- a/internal/nginx/utils.go +++ b/internal/nginx/utils.go @@ -8,7 +8,7 @@ import ( "os/exec" "path" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" ) func shellOut(l *slog.Logger, cmd string) (err error) { diff --git a/internal/nginx/verify.go b/internal/nginx/verify.go index a24d808c94..07df392b39 100644 --- a/internal/nginx/verify.go +++ b/internal/nginx/verify.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" ) // verifyClient is a client for verifying the config version. diff --git a/internal/nginx/verify_test.go b/internal/nginx/verify_test.go index a399c77f7a..c566417f18 100644 --- a/internal/nginx/verify_test.go +++ b/internal/nginx/verify_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" + nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" ) type Transport struct{} diff --git a/internal/nginx/version_test.go b/internal/nginx/version_test.go index a9eb7d7f52..2205078c39 100644 --- a/internal/nginx/version_test.go +++ b/internal/nginx/version_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" + "github.com/nginx/kubernetes-ingress/internal/nginx" ) func TestNginxVersionParsing(t *testing.T) { diff --git a/internal/telemetry/cluster.go b/internal/telemetry/cluster.go index d85f874010..2edb1c9648 100644 --- a/internal/telemetry/cluster.go +++ b/internal/telemetry/cluster.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - clusterInfo "github.com/nginxinc/kubernetes-ingress/internal/common_cluster_info" + clusterInfo "github.com/nginx/kubernetes-ingress/internal/common_cluster_info" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/telemetry/cluster_test.go b/internal/telemetry/cluster_test.go index 788730fc0f..1237cca91b 100644 --- a/internal/telemetry/cluster_test.go +++ b/internal/telemetry/cluster_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/telemetry" + "github.com/nginx/kubernetes-ingress/internal/telemetry" appsV1 "k8s.io/api/apps/v1" apiCoreV1 "k8s.io/api/core/v1" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/telemetry/collector.go b/internal/telemetry/collector.go index 071c8c43e4..40b9b13c80 100644 --- a/internal/telemetry/collector.go +++ b/internal/telemetry/collector.go @@ -7,14 +7,14 @@ import ( "runtime" "time" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + nl "github.com/nginx/kubernetes-ingress/internal/logger" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" - "github.com/nginxinc/kubernetes-ingress/internal/configs" + "github.com/nginx/kubernetes-ingress/internal/configs" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" diff --git a/internal/telemetry/collector_test.go b/internal/telemetry/collector_test.go index be4ec305b1..dba0e143e6 100644 --- a/internal/telemetry/collector_test.go +++ b/internal/telemetry/collector_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" + "github.com/nginx/kubernetes-ingress/internal/configs" + "github.com/nginx/kubernetes-ingress/internal/configs/version1" + "github.com/nginx/kubernetes-ingress/internal/configs/version2" + "github.com/nginx/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginx/kubernetes-ingress/internal/nginx" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/internal/telemetry" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/telemetry" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" coreV1 "k8s.io/api/core/v1" networkingV1 "k8s.io/api/networking/v1" diff --git a/pkg/apis/configuration/v1/register.go b/pkg/apis/configuration/v1/register.go index 67adf8ae68..8837ed5603 100644 --- a/pkg/apis/configuration/v1/register.go +++ b/pkg/apis/configuration/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration" + "github.com/nginx/kubernetes-ingress/pkg/apis/configuration" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apis/configuration/validation/appprotect.go b/pkg/apis/configuration/validation/appprotect.go index 1830454745..e908ccc15d 100644 --- a/pkg/apis/configuration/validation/appprotect.go +++ b/pkg/apis/configuration/validation/appprotect.go @@ -5,7 +5,7 @@ import ( "log/slog" "strings" - nl "github.com/nginxinc/kubernetes-ingress/internal/logger" + nl "github.com/nginx/kubernetes-ingress/internal/logger" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/apis/configuration/validation/appprotect_test.go b/pkg/apis/configuration/validation/appprotect_test.go index 00addecef5..072a0b56f4 100644 --- a/pkg/apis/configuration/validation/appprotect_test.go +++ b/pkg/apis/configuration/validation/appprotect_test.go @@ -5,8 +5,8 @@ import ( "log/slog" "testing" - nic_glog "github.com/nginxinc/kubernetes-ingress/internal/logger/glog" - "github.com/nginxinc/kubernetes-ingress/internal/logger/levels" + nic_glog "github.com/nginx/kubernetes-ingress/internal/logger/glog" + "github.com/nginx/kubernetes-ingress/internal/logger/levels" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/apis/configuration/validation/common.go b/pkg/apis/configuration/validation/common.go index d93837c58a..4acada6f4e 100644 --- a/pkg/apis/configuration/validation/common.go +++ b/pkg/apis/configuration/validation/common.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/nginxinc/kubernetes-ingress/internal/configs" + "github.com/nginx/kubernetes-ingress/internal/configs" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/configuration/validation/globalconfiguration.go b/pkg/apis/configuration/validation/globalconfiguration.go index f020252d19..ce88820f7c 100644 --- a/pkg/apis/configuration/validation/globalconfiguration.go +++ b/pkg/apis/configuration/validation/globalconfiguration.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/configuration/validation/globalconfiguration_test.go b/pkg/apis/configuration/validation/globalconfiguration_test.go index 04bc764ae2..9f8ea721e0 100644 --- a/pkg/apis/configuration/validation/globalconfiguration_test.go +++ b/pkg/apis/configuration/validation/globalconfiguration_test.go @@ -5,7 +5,7 @@ import ( "github.com/google/go-cmp/cmp" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/configuration/validation/policy.go b/pkg/apis/configuration/validation/policy.go index 14ad6a2be0..9c7a72ad30 100644 --- a/pkg/apis/configuration/validation/policy.go +++ b/pkg/apis/configuration/validation/policy.go @@ -9,7 +9,7 @@ import ( "strings" "unicode" - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/configuration/validation/policy_test.go b/pkg/apis/configuration/validation/policy_test.go index e5971883c2..542bfaba24 100644 --- a/pkg/apis/configuration/validation/policy_test.go +++ b/pkg/apis/configuration/validation/policy_test.go @@ -3,7 +3,7 @@ package validation import ( "testing" - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/configuration/validation/transportserver.go b/pkg/apis/configuration/validation/transportserver.go index 9812e1a5d9..06a3f842e5 100644 --- a/pkg/apis/configuration/validation/transportserver.go +++ b/pkg/apis/configuration/validation/transportserver.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/configuration/validation/transportserver_test.go b/pkg/apis/configuration/validation/transportserver_test.go index 9e7b163c36..0555e6e30d 100644 --- a/pkg/apis/configuration/validation/transportserver_test.go +++ b/pkg/apis/configuration/validation/transportserver_test.go @@ -3,7 +3,7 @@ package validation import ( "testing" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/configuration/validation/virtualserver.go b/pkg/apis/configuration/validation/virtualserver.go index 77d0a89aa1..aa13c5061c 100644 --- a/pkg/apis/configuration/validation/virtualserver.go +++ b/pkg/apis/configuration/validation/virtualserver.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/dlclark/regexp2" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginx/kubernetes-ingress/internal/configs" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/configuration/validation/virtualserver_test.go b/pkg/apis/configuration/validation/virtualserver_test.go index 4753479d80..381ccad42a 100644 --- a/pkg/apis/configuration/validation/virtualserver_test.go +++ b/pkg/apis/configuration/validation/virtualserver_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/dos/v1beta1/register.go b/pkg/apis/dos/v1beta1/register.go index d527b6a37f..1a9183c3f2 100644 --- a/pkg/apis/dos/v1beta1/register.go +++ b/pkg/apis/dos/v1beta1/register.go @@ -1,7 +1,7 @@ package v1beta1 import ( - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apis/dos/validation/dos.go b/pkg/apis/dos/validation/dos.go index 523bc5e264..d38fc3bd98 100644 --- a/pkg/apis/dos/validation/dos.go +++ b/pkg/apis/dos/validation/dos.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - internalValidation "github.com/nginxinc/kubernetes-ingress/internal/validation" - validation2 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + internalValidation "github.com/nginx/kubernetes-ingress/internal/validation" + validation2 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/validation" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/dos/validation/dos_test.go b/pkg/apis/dos/validation/dos_test.go index 6fa90a6766..f5bd6ebcb7 100644 --- a/pkg/apis/dos/validation/dos_test.go +++ b/pkg/apis/dos/validation/dos_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/apis/externaldns/v1/register.go b/pkg/apis/externaldns/v1/register.go index ed304ca203..cc743f03aa 100644 --- a/pkg/apis/externaldns/v1/register.go +++ b/pkg/apis/externaldns/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns" + "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apis/externaldns/validation/externaldns.go b/pkg/apis/externaldns/validation/externaldns.go index fa0e7db0eb..96fa061b2d 100644 --- a/pkg/apis/externaldns/validation/externaldns.go +++ b/pkg/apis/externaldns/validation/externaldns.go @@ -7,7 +7,7 @@ import ( "golang.org/x/exp/slices" - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/externaldns/validation/externaldns_test.go b/pkg/apis/externaldns/validation/externaldns_test.go index 85db15c6b6..7fd6cd9b66 100644 --- a/pkg/apis/externaldns/validation/externaldns_test.go +++ b/pkg/apis/externaldns/validation/externaldns_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/validation" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" + "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/validation" ) func TestValidateDNSEndpoint(t *testing.T) { diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index 866a2003ec..bd7eeb9a3f 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -6,9 +6,9 @@ import ( fmt "fmt" http "net/http" - k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" - appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" + k8sv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" + appprotectdosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" + externaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index 6ce8759b48..befdc54de4 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -3,13 +3,13 @@ package fake import ( - clientset "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" - fakek8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1/fake" - appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" - fakeappprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1/fake" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" - fakeexternaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1/fake" + clientset "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + k8sv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" + fakek8sv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1/fake" + appprotectdosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" + fakeappprotectdosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1/fake" + externaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" + fakeexternaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 8541344f57..b3f9b55743 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -3,9 +3,9 @@ package fake import ( - k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" + k8sv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + appprotectdosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" + externaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 81c9900742..5f183ab972 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -3,9 +3,9 @@ package scheme import ( - k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" + k8sv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + appprotectdosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" + externaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/configuration_client.go b/pkg/client/clientset/versioned/typed/configuration/v1/configuration_client.go index c7a051c4ea..f7b9bfbece 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/configuration_client.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/configuration_client.go @@ -5,8 +5,8 @@ package v1 import ( http "net/http" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_configuration_client.go b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_configuration_client.go index cf34677b22..3f23f8bb36 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_configuration_client.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_configuration_client.go @@ -3,7 +3,7 @@ package fake import ( - v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_globalconfiguration.go b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_globalconfiguration.go index 22988ef7f9..1c76d70f21 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_globalconfiguration.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_globalconfiguration.go @@ -3,8 +3,8 @@ package fake import ( - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_policy.go b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_policy.go index 56c7a0fc8e..8e6dc46e04 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_policy.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_policy.go @@ -3,8 +3,8 @@ package fake import ( - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_transportserver.go b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_transportserver.go index acca8d0875..0d48b9055c 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_transportserver.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_transportserver.go @@ -3,8 +3,8 @@ package fake import ( - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserver.go b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserver.go index 4af83f84ea..7840c02036 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserver.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserver.go @@ -3,8 +3,8 @@ package fake import ( - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserverroute.go b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserverroute.go index 9a26af1b58..1d48d42653 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserverroute.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserverroute.go @@ -3,8 +3,8 @@ package fake import ( - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/globalconfiguration.go b/pkg/client/clientset/versioned/typed/configuration/v1/globalconfiguration.go index 4688374fd5..99cb2cc5ce 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/globalconfiguration.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/globalconfiguration.go @@ -5,8 +5,8 @@ package v1 import ( context "context" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/policy.go b/pkg/client/clientset/versioned/typed/configuration/v1/policy.go index 85753d8075..b7286222b2 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/policy.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/policy.go @@ -5,8 +5,8 @@ package v1 import ( context "context" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/transportserver.go b/pkg/client/clientset/versioned/typed/configuration/v1/transportserver.go index 3b2eb81f3a..c15f004aea 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/transportserver.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/transportserver.go @@ -5,8 +5,8 @@ package v1 import ( context "context" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/virtualserver.go b/pkg/client/clientset/versioned/typed/configuration/v1/virtualserver.go index 6935c84a98..9ea800aaa4 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/virtualserver.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/virtualserver.go @@ -5,8 +5,8 @@ package v1 import ( context "context" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/virtualserverroute.go b/pkg/client/clientset/versioned/typed/configuration/v1/virtualserverroute.go index cdd8471960..ddc06128a8 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/virtualserverroute.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/virtualserverroute.go @@ -5,8 +5,8 @@ package v1 import ( context "context" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/dos/v1beta1/dos_client.go b/pkg/client/clientset/versioned/typed/dos/v1beta1/dos_client.go index f1ebd8bc6a..6f44cba20c 100644 --- a/pkg/client/clientset/versioned/typed/dos/v1beta1/dos_client.go +++ b/pkg/client/clientset/versioned/typed/dos/v1beta1/dos_client.go @@ -5,8 +5,8 @@ package v1beta1 import ( http "net/http" - dosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + dosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" + scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/dos/v1beta1/dosprotectedresource.go b/pkg/client/clientset/versioned/typed/dos/v1beta1/dosprotectedresource.go index eca3ac7028..5b72c8ec47 100644 --- a/pkg/client/clientset/versioned/typed/dos/v1beta1/dosprotectedresource.go +++ b/pkg/client/clientset/versioned/typed/dos/v1beta1/dosprotectedresource.go @@ -5,8 +5,8 @@ package v1beta1 import ( context "context" - dosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + dosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" + scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dos_client.go b/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dos_client.go index 8bdcd39ea7..09b7e10d94 100644 --- a/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dos_client.go +++ b/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dos_client.go @@ -3,7 +3,7 @@ package fake import ( - v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" + v1beta1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dosprotectedresource.go b/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dosprotectedresource.go index d48eb044cf..21070e4087 100644 --- a/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dosprotectedresource.go +++ b/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dosprotectedresource.go @@ -3,8 +3,8 @@ package fake import ( - v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" - dosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" + v1beta1 "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" + dosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/client/clientset/versioned/typed/externaldns/v1/dnsendpoint.go b/pkg/client/clientset/versioned/typed/externaldns/v1/dnsendpoint.go index 09b716c0e9..2ba16bbfcc 100644 --- a/pkg/client/clientset/versioned/typed/externaldns/v1/dnsendpoint.go +++ b/pkg/client/clientset/versioned/typed/externaldns/v1/dnsendpoint.go @@ -5,8 +5,8 @@ package v1 import ( context "context" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + externaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" + scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/externaldns/v1/externaldns_client.go b/pkg/client/clientset/versioned/typed/externaldns/v1/externaldns_client.go index 3598bb3e5e..423173fc4a 100644 --- a/pkg/client/clientset/versioned/typed/externaldns/v1/externaldns_client.go +++ b/pkg/client/clientset/versioned/typed/externaldns/v1/externaldns_client.go @@ -5,8 +5,8 @@ package v1 import ( http "net/http" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + externaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" + scheme "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_dnsendpoint.go b/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_dnsendpoint.go index d52922255c..cc5bca9f8f 100644 --- a/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_dnsendpoint.go +++ b/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_dnsendpoint.go @@ -3,8 +3,8 @@ package fake import ( - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" + externaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" gentype "k8s.io/client-go/gentype" ) diff --git a/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_externaldns_client.go b/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_externaldns_client.go index cdd0115c2a..d2105afeb2 100644 --- a/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_externaldns_client.go +++ b/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_externaldns_client.go @@ -3,7 +3,7 @@ package fake import ( - v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" + v1 "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/informers/externalversions/configuration/interface.go b/pkg/client/informers/externalversions/configuration/interface.go index 0ce17ea432..70ca0356b4 100644 --- a/pkg/client/informers/externalversions/configuration/interface.go +++ b/pkg/client/informers/externalversions/configuration/interface.go @@ -3,8 +3,8 @@ package configuration import ( - v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/configuration/v1" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/configuration/v1" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/configuration/v1/globalconfiguration.go b/pkg/client/informers/externalversions/configuration/v1/globalconfiguration.go index 18800e0397..c798eaa5cd 100644 --- a/pkg/client/informers/externalversions/configuration/v1/globalconfiguration.go +++ b/pkg/client/informers/externalversions/configuration/v1/globalconfiguration.go @@ -6,10 +6,10 @@ import ( context "context" time "time" - apisconfigurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" + apisconfigurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + versioned "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/client/listers/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/configuration/v1/interface.go b/pkg/client/informers/externalversions/configuration/v1/interface.go index 84651665ea..98355fee8f 100644 --- a/pkg/client/informers/externalversions/configuration/v1/interface.go +++ b/pkg/client/informers/externalversions/configuration/v1/interface.go @@ -3,7 +3,7 @@ package v1 import ( - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/configuration/v1/policy.go b/pkg/client/informers/externalversions/configuration/v1/policy.go index 35fbea6622..c956b32e42 100644 --- a/pkg/client/informers/externalversions/configuration/v1/policy.go +++ b/pkg/client/informers/externalversions/configuration/v1/policy.go @@ -6,10 +6,10 @@ import ( context "context" time "time" - apisconfigurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" + apisconfigurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + versioned "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/client/listers/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/configuration/v1/transportserver.go b/pkg/client/informers/externalversions/configuration/v1/transportserver.go index 016932c39c..48b4e70068 100644 --- a/pkg/client/informers/externalversions/configuration/v1/transportserver.go +++ b/pkg/client/informers/externalversions/configuration/v1/transportserver.go @@ -6,10 +6,10 @@ import ( context "context" time "time" - apisconfigurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" + apisconfigurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + versioned "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/client/listers/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/configuration/v1/virtualserver.go b/pkg/client/informers/externalversions/configuration/v1/virtualserver.go index a6da4ebfe3..3aab157329 100644 --- a/pkg/client/informers/externalversions/configuration/v1/virtualserver.go +++ b/pkg/client/informers/externalversions/configuration/v1/virtualserver.go @@ -6,10 +6,10 @@ import ( context "context" time "time" - apisconfigurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" + apisconfigurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + versioned "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/client/listers/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/configuration/v1/virtualserverroute.go b/pkg/client/informers/externalversions/configuration/v1/virtualserverroute.go index 7222fca76f..ed484865ed 100644 --- a/pkg/client/informers/externalversions/configuration/v1/virtualserverroute.go +++ b/pkg/client/informers/externalversions/configuration/v1/virtualserverroute.go @@ -6,10 +6,10 @@ import ( context "context" time "time" - apisconfigurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" + apisconfigurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + versioned "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/client/listers/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/dos/interface.go b/pkg/client/informers/externalversions/dos/interface.go index ac812cda74..da6b8ba3b2 100644 --- a/pkg/client/informers/externalversions/dos/interface.go +++ b/pkg/client/informers/externalversions/dos/interface.go @@ -3,8 +3,8 @@ package dos import ( - v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/dos/v1beta1" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1beta1 "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/dos/v1beta1" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/dos/v1beta1/dosprotectedresource.go b/pkg/client/informers/externalversions/dos/v1beta1/dosprotectedresource.go index 3253677b48..d3b293305a 100644 --- a/pkg/client/informers/externalversions/dos/v1beta1/dosprotectedresource.go +++ b/pkg/client/informers/externalversions/dos/v1beta1/dosprotectedresource.go @@ -6,10 +6,10 @@ import ( context "context" time "time" - apisdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" - dosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/dos/v1beta1" + apisdosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" + versioned "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + dosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/client/listers/dos/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/dos/v1beta1/interface.go b/pkg/client/informers/externalversions/dos/v1beta1/interface.go index 774aefee0d..80d8ff6963 100644 --- a/pkg/client/informers/externalversions/dos/v1beta1/interface.go +++ b/pkg/client/informers/externalversions/dos/v1beta1/interface.go @@ -3,7 +3,7 @@ package v1beta1 import ( - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/externaldns/interface.go b/pkg/client/informers/externalversions/externaldns/interface.go index 947e6b788a..eac60eaff8 100644 --- a/pkg/client/informers/externalversions/externaldns/interface.go +++ b/pkg/client/informers/externalversions/externaldns/interface.go @@ -3,8 +3,8 @@ package externaldns import ( - v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/externaldns/v1" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/externaldns/v1" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/externaldns/v1/dnsendpoint.go b/pkg/client/informers/externalversions/externaldns/v1/dnsendpoint.go index cca2ebe98f..66d888a226 100644 --- a/pkg/client/informers/externalversions/externaldns/v1/dnsendpoint.go +++ b/pkg/client/informers/externalversions/externaldns/v1/dnsendpoint.go @@ -6,10 +6,10 @@ import ( context "context" time "time" - apisexternaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1" + apisexternaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" + versioned "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + externaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/client/listers/externaldns/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/externaldns/v1/interface.go b/pkg/client/informers/externalversions/externaldns/v1/interface.go index 747d4431af..69e47cd4ca 100644 --- a/pkg/client/informers/externalversions/externaldns/v1/interface.go +++ b/pkg/client/informers/externalversions/externaldns/v1/interface.go @@ -3,7 +3,7 @@ package v1 import ( - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index 225ab95dbc..d7880e5b62 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -7,11 +7,11 @@ import ( sync "sync" time "time" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - configuration "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/configuration" - dos "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/dos" - externaldns "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/externaldns" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + versioned "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" + configuration "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/configuration" + dos "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/dos" + externaldns "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/externaldns" + internalinterfaces "github.com/nginx/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 0662c7bd8d..558006478f 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -5,9 +5,9 @@ package externalversions import ( fmt "fmt" - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" + v1beta1 "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" + v1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 4bb7c08ee3..5234507162 100644 --- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -5,7 +5,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + versioned "github.com/nginx/kubernetes-ingress/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/configuration/v1/globalconfiguration.go b/pkg/client/listers/configuration/v1/globalconfiguration.go index 678db5657f..cb15215790 100644 --- a/pkg/client/listers/configuration/v1/globalconfiguration.go +++ b/pkg/client/listers/configuration/v1/globalconfiguration.go @@ -3,7 +3,7 @@ package v1 import ( - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/configuration/v1/policy.go b/pkg/client/listers/configuration/v1/policy.go index 5d783ee837..7aae1285f6 100644 --- a/pkg/client/listers/configuration/v1/policy.go +++ b/pkg/client/listers/configuration/v1/policy.go @@ -3,7 +3,7 @@ package v1 import ( - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/configuration/v1/transportserver.go b/pkg/client/listers/configuration/v1/transportserver.go index de18b04de9..4bd9164c37 100644 --- a/pkg/client/listers/configuration/v1/transportserver.go +++ b/pkg/client/listers/configuration/v1/transportserver.go @@ -3,7 +3,7 @@ package v1 import ( - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/configuration/v1/virtualserver.go b/pkg/client/listers/configuration/v1/virtualserver.go index 6dc289db52..294794a3a4 100644 --- a/pkg/client/listers/configuration/v1/virtualserver.go +++ b/pkg/client/listers/configuration/v1/virtualserver.go @@ -3,7 +3,7 @@ package v1 import ( - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/configuration/v1/virtualserverroute.go b/pkg/client/listers/configuration/v1/virtualserverroute.go index 675593a7f9..1cd4bfc11f 100644 --- a/pkg/client/listers/configuration/v1/virtualserverroute.go +++ b/pkg/client/listers/configuration/v1/virtualserverroute.go @@ -3,7 +3,7 @@ package v1 import ( - configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + configurationv1 "github.com/nginx/kubernetes-ingress/pkg/apis/configuration/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/dos/v1beta1/dosprotectedresource.go b/pkg/client/listers/dos/v1beta1/dosprotectedresource.go index 94a113f5a7..9fffd41bdc 100644 --- a/pkg/client/listers/dos/v1beta1/dosprotectedresource.go +++ b/pkg/client/listers/dos/v1beta1/dosprotectedresource.go @@ -3,7 +3,7 @@ package v1beta1 import ( - dosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + dosv1beta1 "github.com/nginx/kubernetes-ingress/pkg/apis/dos/v1beta1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/externaldns/v1/dnsendpoint.go b/pkg/client/listers/externaldns/v1/dnsendpoint.go index 7c71cf930a..499072a77c 100644 --- a/pkg/client/listers/externaldns/v1/dnsendpoint.go +++ b/pkg/client/listers/externaldns/v1/dnsendpoint.go @@ -3,7 +3,7 @@ package v1 import ( - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" + externaldnsv1 "github.com/nginx/kubernetes-ingress/pkg/apis/externaldns/v1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" diff --git a/site/README.md b/site/README.md index 033f0033e1..fb47bfc005 100644 --- a/site/README.md +++ b/site/README.md @@ -2,7 +2,7 @@ This directory contains all of the user documentation for NGINX Ingress Controller, as well as the requirements for building and publishing the documentation. -We write our documentation in Markdown. We build it with [Hugo](https://gohugo.io) and our custom [NGINX Hugo theme](https://github.com/nginxinc/nginx-hugo-theme). We set up previews and deployments using our [docs-actions](https://github.com/nginxinc/docs-actions?tab=readme-ov-file#docs-actions) workflow. +We write our documentation in Markdown. We build it with [Hugo](https://gohugo.io) and our custom [NGINX Hugo theme](https://github.com/nginxinc/nginx-hugo-theme). We set up previews and deployments using our [docs-actions](https://github.com/nginx/docs-actions?tab=readme-ov-file#docs-actions) workflow. ## Setup diff --git a/site/config/_default/config.toml b/site/config/_default/config.toml index 49d4fc4ad1..de748a7f23 100644 --- a/site/config/_default/config.toml +++ b/site/config/_default/config.toml @@ -51,7 +51,7 @@ pygmentsUseClasses = true useSectionPageLists = "true" RSSLink = "/index.xml" author = "NGINX Inc." # add your company name - github = "nginxinc" # add your github profile name + github = "nginx" # add your github profile name twitter = "@nginx" # add your twitter profile #email = "" noindex_kinds = [ diff --git a/site/content/community.md b/site/content/community.md index 595f256263..d3dccda6ef 100644 --- a/site/content/community.md +++ b/site/content/community.md @@ -11,12 +11,12 @@ There are a few ways to get involved with the F5 NGINX Ingress Controller commun - Our [Slack channel #nginx-ingress-controller](https://nginxcommunity.slack.com/channels/nginx-ingress-controller), is the go-to place to start asking questions and sharing your thoughts. -- Our [GitHub issues page](https://github.com/nginxinc/kubernetes-ingress/issues) or [GitHub discussions page](https://github.com/nginxinc/kubernetes-ingress/discussions) offers more space for an asynchronous technical discussion. +- Our [GitHub issues page](https://github.com/nginx/kubernetes-ingress/issues) or [GitHub discussions page](https://github.com/nginx/kubernetes-ingress/discussions) offers more space for an asynchronous technical discussion. # Contribute -Please see our [contributing guide](https://github.com/nginxinc/kubernetes-ingress/blob/main/CONTRIBUTING.md) to get involved with code or documentation. +Please see our [contributing guide](https://github.com/nginx/kubernetes-ingress/blob/main/CONTRIBUTING.md) to get involved with code or documentation. # License -[Apache License, Version 2.0](https://github.com/nginxinc/kubernetes-ingress/blob/main/LICENSE) +[Apache License, Version 2.0](https://github.com/nginx/kubernetes-ingress/blob/main/LICENSE) diff --git a/site/content/configuration/access-control.md b/site/content/configuration/access-control.md index 2ff06fabc3..fade2941c3 100644 --- a/site/content/configuration/access-control.md +++ b/site/content/configuration/access-control.md @@ -33,7 +33,7 @@ IC_HTTP_PORT= Create the file _webapp.yaml_ with the following contents: -{{< ghcode "https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/refs/heads/main/examples/custom-resources/access-control/webapp.yaml" >}} +{{< ghcode "https://raw.githubusercontent.com/nginx/kubernetes-ingress/refs/heads/main/examples/custom-resources/access-control/webapp.yaml" >}} Apply it using `kubectl`: @@ -47,7 +47,7 @@ kubectl apply -f webapp.yaml Create a file named _access-control-policy-deny.yaml_. The highlighted _deny_ field will be used by the example application, and should be changed to the subnet of your machine. -{{< ghcode "https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/refs/heads/main/examples/custom-resources/access-control/access-control-policy-deny.yaml" "hl_lines=7-8" >}} +{{< ghcode "https://raw.githubusercontent.com/nginx/kubernetes-ingress/refs/heads/main/examples/custom-resources/access-control/access-control-policy-deny.yaml" "hl_lines=7-8" >}} Apply the policy: @@ -61,7 +61,7 @@ kubectl apply -f access-control-policy-deny.yaml Create a file named _virtual-server.yaml_ for the VirtualServer resource. The _policies_ field references the access control Policy created in the previous section. -{{< ghcode "https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/refs/heads/main/examples/custom-resources/access-control/virtual-server.yaml" "hl_lines=7-8" >}} +{{< ghcode "https://raw.githubusercontent.com/nginx/kubernetes-ingress/refs/heads/main/examples/custom-resources/access-control/virtual-server.yaml" "hl_lines=7-8" >}} Apply the policy: @@ -95,7 +95,7 @@ The *403* response is expected, successfully blocking your machine. Update the Policy with the file _access-control-policy-allow.yaml_, setting the _allow_ field to the subnet of your machine. -{{< ghcode "https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/refs/heads/main/examples/custom-resources/access-control/access-control-policy-allow.yaml" "hl_lines=7-8" >}} +{{< ghcode "https://raw.githubusercontent.com/nginx/kubernetes-ingress/refs/heads/main/examples/custom-resources/access-control/access-control-policy-allow.yaml" "hl_lines=7-8" >}} Apply the Policy: diff --git a/site/content/configuration/configuration-examples.md b/site/content/configuration/configuration-examples.md index de8c9dfa8d..0a0e6e3bbc 100644 --- a/site/content/configuration/configuration-examples.md +++ b/site/content/configuration/configuration-examples.md @@ -7,7 +7,7 @@ toc: true weight: 400 --- -Our [GitHub repo](https://github.com/nginxinc/kubernetes-ingress) includes a number of configuration examples: +Our [GitHub repo](https://github.com/nginx/kubernetes-ingress) includes a number of configuration examples: -- [*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources) show how to advanced NGINX features by using VirtualServer, VirtualServerRoute, TransportServer and Policy Custom Resources. -- [*Examples of Ingress Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources) show how to use advanced NGINX features in Ingress resources with annotations. +- [*Examples of Custom Resources*](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources) show how to advanced NGINX features by using VirtualServer, VirtualServerRoute, TransportServer and Policy Custom Resources. +- [*Examples of Ingress Resources*](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources) show how to use advanced NGINX features in Ingress resources with annotations. diff --git a/site/content/configuration/global-configuration/configmap-resource.md b/site/content/configuration/global-configuration/configmap-resource.md index 2faee1a82d..9a93b2b3d4 100644 --- a/site/content/configuration/global-configuration/configmap-resource.md +++ b/site/content/configuration/global-configuration/configmap-resource.md @@ -95,10 +95,10 @@ For more information, view the [VirtualServer and VirtualServerRoute resources]( |*server-names-hash-max-size* | Sets the value of the [server_names_hash_max_size](https://nginx.org/en/docs/http/ngx_http_core_module.html#server_names_hash_max_size) directive. | *1024* | | |*map-hash-bucket-size* | Sets the value of the [map_hash_bucket_size](http://nginx.org/en/docs/http/ngx_http_map_module.html#map_hash_bucket_size) directive.| *256* | | |*map-hash-max-size* | Sets the value of the [map_hash_max_size](http://nginx.org/en/docs/http/ngx_http_map_module.html#map_hash_max_size) directive. | *2048* | | -|*resolver-addresses* | Sets the value of the [resolver](https://nginx.org/en/docs/http/ngx_http_core_module.html#resolver) addresses. Note: If you use a DNS name (for example, *kube-dns.kube-system.svc.cluster.local* ) as a resolver address, NGINX Plus will resolve it using the system resolver during the start and on every configuration reload. If the name cannot be resolved or the DNS server doesn't respond, NGINX Plus will fail to start or reload. To avoid this, we recommend using IP addresses as resolver addresses instead of DNS names. Supported in NGINX Plus only. | N/A | [Support for Type ExternalName Services](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services). | -|*resolver-ipv6* | Enables IPv6 resolution in the resolver. Supported in NGINX Plus only. | *True* | [Support for Type ExternalName Services](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services). | -|*resolver-valid* | Sets the time NGINX caches the resolved DNS records. Supported in NGINX Plus only. | TTL value of a DNS record | [Support for Type ExternalName Services](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services). | -|*resolver-timeout* | Sets the [resolver_timeout](https://nginx.org/en/docs/http/ngx_http_core_module.html#resolver_timeout) for name resolution. Supported in NGINX Plus only. | *30s* | [Support for Type ExternalName Services](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services). | +|*resolver-addresses* | Sets the value of the [resolver](https://nginx.org/en/docs/http/ngx_http_core_module.html#resolver) addresses. Note: If you use a DNS name (for example, *kube-dns.kube-system.svc.cluster.local* ) as a resolver address, NGINX Plus will resolve it using the system resolver during the start and on every configuration reload. If the name cannot be resolved or the DNS server doesn't respond, NGINX Plus will fail to start or reload. To avoid this, we recommend using IP addresses as resolver addresses instead of DNS names. Supported in NGINX Plus only. | N/A | [Support for Type ExternalName Services](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services). | +|*resolver-ipv6* | Enables IPv6 resolution in the resolver. Supported in NGINX Plus only. | *True* | [Support for Type ExternalName Services](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services). | +|*resolver-valid* | Sets the time NGINX caches the resolved DNS records. Supported in NGINX Plus only. | TTL value of a DNS record | [Support for Type ExternalName Services](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services). | +|*resolver-timeout* | Sets the [resolver_timeout](https://nginx.org/en/docs/http/ngx_http_core_module.html#resolver_timeout) for name resolution. Supported in NGINX Plus only. | *30s* | [Support for Type ExternalName Services](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services). | |*keepalive-timeout* | Sets the value of the [keepalive_timeout](https://nginx.org/en/docs/http/ngx_http_core_module.html#keepalive_timeout) directive. | *75s* | | |*keepalive-requests* | Sets the value of the [keepalive_requests](https://nginx.org/en/docs/http/ngx_http_core_module.html#keepalive_requests) directive. | *1000* | | |*variables-hash-bucket-size* | Sets the value of the [variables_hash_bucket_size](https://nginx.org/en/docs/http/ngx_http_core_module.html#variables_hash_bucket_size) directive. | *256* | | @@ -117,9 +117,9 @@ For more information, view the [VirtualServer and VirtualServerRoute resources]( | ``/dev/stdout main`` | ``syslog:server=localhost:514`` | |*access-log-off* | Disables the [access log](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log). | *False* | | |*default-server-access-log-off* | Disables the [access log](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log) for the default server. If access log is disabled globally (*access-log-off: "True"*), then the default server access log is always disabled. | *False* | | -|*log-format* | Sets the custom [log format](https://nginx.org/en/docs/http/ngx_http_log_module.html#log_format) for HTTP and HTTPS traffic. For convenience, it is possible to define the log format across multiple lines (each line separated by *\n*). In that case, the Ingress Controller will replace every *\n* character with a space character. All *'* characters must be escaped. | See the [template file](https://github.com/nginxinc/kubernetes-ingress/blob/v{{< nic-version >}}/internal/configs/version1/nginx.tmpl) for the access log. | [Custom Log Format](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/shared-examples/custom-log-format). | +|*log-format* | Sets the custom [log format](https://nginx.org/en/docs/http/ngx_http_log_module.html#log_format) for HTTP and HTTPS traffic. For convenience, it is possible to define the log format across multiple lines (each line separated by *\n*). In that case, the Ingress Controller will replace every *\n* character with a space character. All *'* characters must be escaped. | See the [template file](https://github.com/nginx/kubernetes-ingress/blob/v{{< nic-version >}}/internal/configs/version1/nginx.tmpl) for the access log. | [Custom Log Format](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/shared-examples/custom-log-format). | |*log-format-escaping* | Sets the characters escaping for the variables of the log format. Supported values: *json* (JSON escaping), *default* (the default escaping) *none* (disables escaping). | *default* | | -|*stream-log-format* | Sets the custom [log format](https://nginx.org/en/docs/stream/ngx_stream_log_module.html#log_format) for TCP, UDP, and TLS Passthrough traffic. For convenience, it is possible to define the log format across multiple lines (each line separated by *\n*). In that case, the Ingress Controller will replace every *\n* character with a space character. All *'* characters must be escaped. | See the [template file](https://github.com/nginxinc/kubernetes-ingress/blob/v{{< nic-version >}}/internal/configs/version1/nginx.tmpl). | | +|*stream-log-format* | Sets the custom [log format](https://nginx.org/en/docs/stream/ngx_stream_log_module.html#log_format) for TCP, UDP, and TLS Passthrough traffic. For convenience, it is possible to define the log format across multiple lines (each line separated by *\n*). In that case, the Ingress Controller will replace every *\n* character with a space character. All *'* characters must be escaped. | See the [template file](https://github.com/nginx/kubernetes-ingress/blob/v{{< nic-version >}}/internal/configs/version1/nginx.tmpl). | | |*stream-log-format-escaping* | Sets the characters escaping for the variables of the stream log format. Supported values: *json* (JSON escaping), *default* (the default escaping) *none* (disables escaping). | *default* | | {{}} @@ -141,7 +141,7 @@ For more information, view the [VirtualServer and VirtualServerRoute resources]( {{}} |ConfigMap Key | Description | Default | Example | | ---| ---| ---| --- | -|*redirect-to-https* | Sets the 301 redirect rule based on the value of the *http_x_forwarded_proto* header on the server block to force incoming traffic to be over HTTPS. Useful when terminating SSL in a load balancer in front of the Ingress Controller — see [115](https://github.com/nginxinc/kubernetes-ingress/issues/115) | *False* | | +|*redirect-to-https* | Sets the 301 redirect rule based on the value of the *http_x_forwarded_proto* header on the server block to force incoming traffic to be over HTTPS. Useful when terminating SSL in a load balancer in front of the Ingress Controller — see [115](https://github.com/nginx/kubernetes-ingress/issues/115) | *False* | | |*ssl-redirect* | Sets an unconditional 301 redirect rule for all incoming HTTP traffic to force incoming traffic over HTTPS. | *True* | | |*hsts* | Enables [HTTP Strict Transport Security (HSTS)](https://www.nginx.com/blog/http-strict-transport-security-hsts-and-nginx/) : the HSTS header is added to the responses from backends. The *preload* directive is included in the header. | *False* | | |*hsts-max-age* | Sets the value of the *max-age* directive of the HSTS header. | *2592000* (1 month) | | @@ -161,7 +161,7 @@ For more information, view the [VirtualServer and VirtualServerRoute resources]( |ConfigMap Key | Description | Default | Example | | ---| ---| ---| --- | |*http2* | Enables HTTP/2 in servers with SSL enabled. | *False* | | -|*proxy-protocol* | Enables PROXY Protocol for incoming connections. | *False* | [Proxy Protocol](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/shared-examples/proxy-protocol). | +|*proxy-protocol* | Enables PROXY Protocol for incoming connections. | *False* | [Proxy Protocol](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/shared-examples/proxy-protocol). | {{}} --- @@ -189,7 +189,7 @@ For more information, view the [VirtualServer and VirtualServerRoute resources]( |*http-snippets* | Sets a custom snippet in http context. | N/A | | |*location-snippets* | Sets a custom snippet in location context. | N/A | | |*server-snippets* | Sets a custom snippet in server context. | N/A | | -|*stream-snippets* | Sets a custom snippet in stream context. | N/A | [Support for TCP/UDP Load Balancing](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/tcp-udp). | +|*stream-snippets* | Sets a custom snippet in stream context. | N/A | [Support for TCP/UDP Load Balancing](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/tcp-udp). | |*main-template* | Sets the main NGINX configuration template. | By default the template is read from the file in the container. | [Custom Templates](/nginx-ingress-controller/configuration/global-configuration/custom-templates). | |*ingress-template* | Sets the NGINX configuration template for an Ingress resource. | By default the template is read from the file on the container. | [Custom Templates](/nginx-ingress-controller/configuration/global-configuration/custom-templates). | |*virtualserver-template* | Sets the NGINX configuration template for an VirtualServer resource. | By default the template is read from the file on the container. | [Custom Templates](/nginx-ingress-controller/configuration/global-configuration/custom-templates). | diff --git a/site/content/configuration/global-configuration/custom-templates.md b/site/content/configuration/global-configuration/custom-templates.md index 35a390fcb1..589ce59517 100644 --- a/site/content/configuration/global-configuration/custom-templates.md +++ b/site/content/configuration/global-configuration/custom-templates.md @@ -8,4 +8,4 @@ weight: 500 --- -F5 NGINX Ingress Controller uses templates to generate NGINX configuration for Ingress resources, VirtualServer resources and the main NGINX configuration file. You can customize the templates and apply them via the ConfigMap. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/shared-examples/custom-templates). +F5 NGINX Ingress Controller uses templates to generate NGINX configuration for Ingress resources, VirtualServer resources and the main NGINX configuration file. You can customize the templates and apply them via the ConfigMap. See the [corresponding example](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/shared-examples/custom-templates). diff --git a/site/content/configuration/global-configuration/globalconfiguration-resource.md b/site/content/configuration/global-configuration/globalconfiguration-resource.md index 352b2b4f78..605ab301fd 100644 --- a/site/content/configuration/global-configuration/globalconfiguration-resource.md +++ b/site/content/configuration/global-configuration/globalconfiguration-resource.md @@ -9,7 +9,7 @@ weight: 200 This page explains how to use the GlobalConfiguration resource to define the global configuration parameters of F5 NGINX Ingress Controller. -The resource supports configuring listeners for TCP and UDP load balancing, and is implemented as a [Custom resource](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/). +The resource supports configuring listeners for TCP and UDP load balancing, and is implemented as a [Custom resource](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/). Listeners are required by [TransportServer resources]({{< relref "/configuration/transportserver-resource.md" >}}) and can be used to [configure custom listeners for VirtualServers]({{< relref "tutorials/virtual-server-with-custom-listener-ports.md" >}}). @@ -180,4 +180,4 @@ The events section includes a Warning event with the AddedOrUpdatedWithError rea ## Using IPV4 and IPV6 Addresses with GlobalConfiguration -You can customize the IPv4 and IPv6 Address listeners in the global configuration and apply them to your VirtualServer resources. See the corresponding example [here](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/custom-ip-listeners/virtualserver/) +You can customize the IPv4 and IPv6 Address listeners in the global configuration and apply them to your VirtualServer resources. See the corresponding example [here](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/custom-ip-listeners/virtualserver/) diff --git a/site/content/configuration/host-and-listener-collisions.md b/site/content/configuration/host-and-listener-collisions.md index 33ceb5deba..3b578dfdff 100644 --- a/site/content/configuration/host-and-listener-collisions.md +++ b/site/content/configuration/host-and-listener-collisions.md @@ -88,7 +88,7 @@ Events: Similarly, if `cafe-ingress` was created first, it will win `cafe.example.com` and NGINX Ingress Controller will reject `cafe-virtual-server`. -{{< note >}} You can configure multiple hosts for Ingress resources, and its possible that an Ingress resource can be the winner for some of its hosts and a loser for the others. +{{< note >}} You can configure multiple hosts for Ingress resources, and its possible that an Ingress resource can be the winner for some of its hosts and a loser for the others. For example, if `cafe-ingress` had an additional rule host rule for `pub.example.com`, NGINX Ingress Controller would not reject the Ingress. Instead, it would allow `cafe-ingress` to handle `pub.example.com`. {{< /note >}} @@ -96,11 +96,11 @@ For example, if `cafe-ingress` had an additional rule host rule for `pub.example ### Merging configuration for the same host -It is possible to merge configuration for multiple Ingress resources for the same host. One common use case for this approach is distributing resources across multiple namespaces. +It is possible to merge configuration for multiple Ingress resources for the same host. One common use case for this approach is distributing resources across multiple namespaces. The [Cross-namespace configuration]({{< relref "configuration/ingress-resources/cross-namespace-configuration.md">}}) topic has more information. -It is *not* possible to merge the configurations for multiple VirtualServer resources for the same host. However, you can split the VirtualServers into multiple VirtualServerRoute resources, which a single VirtualServer can then reference. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/cross-namespace-configuration) on GitHub. +It is *not* possible to merge the configurations for multiple VirtualServer resources for the same host. However, you can split the VirtualServers into multiple VirtualServerRoute resources, which a single VirtualServer can then reference. See the [corresponding example](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/cross-namespace-configuration) on GitHub. It is *not* possible to merge configuration for multiple TransportServer resources. diff --git a/site/content/configuration/ingress-resources/advanced-configuration-with-annotations.md b/site/content/configuration/ingress-resources/advanced-configuration-with-annotations.md index 46d02dffd2..205269003c 100644 --- a/site/content/configuration/ingress-resources/advanced-configuration-with-annotations.md +++ b/site/content/configuration/ingress-resources/advanced-configuration-with-annotations.md @@ -9,7 +9,7 @@ weight: 200 This topic explains how to enable advanced features in F5 NGINX Ingress Controller with Annotations. -The Ingress resource can use basic NGINX features such as host or path-based routing and TLS termination. Advanced features like rewriting the request URI or inserting additional response headers can be enabled with Annotations. +The Ingress resource can use basic NGINX features such as host or path-based routing and TLS termination. Advanced features like rewriting the request URI or inserting additional response headers can be enabled with Annotations. Outside of advanced features, Annotations are necessary for customizing NGINX behavior such as setting the value of connection timeouts. @@ -110,7 +110,7 @@ The table below summarizes the available annotations. | *nginx.org/proxy-buffer-size* | *proxy-buffer-size* | Sets the value of the [proxy_buffer_size](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffer_size) and [grpc_buffer_size](https://nginx.org/en/docs/http/ngx_http_grpc_module.html#grpc_buffer_size) directives. | Depends on the platform. | | | *nginx.org/proxy-max-temp-file-size* | *proxy-max-temp-file-size* | Sets the value of the [proxy_max_temp_file_size](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_max_temp_file_size) directive. | *1024m* | | | *nginx.org/server-tokens* | *server-tokens* | Enables or disables the [server_tokens](https://nginx.org/en/docs/http/ngx_http_core_module.html#server_tokens) directive. Additionally, with the NGINX Plus, you can specify a custom string value, including the empty string value, which disables the emission of the “Server” field. | *True* | | -| *nginx.org/path-regex* | N/A | Enables regular expression modifiers for Ingress path parameter. This translates to the NGINX [location](https://nginx.org/en/docs/http/ngx_http_core_module.html#location) directive. You can specify one of these values: "case_sensitive", "case_insensitive", or "exact". The annotation is applied to the entire Ingress resource and its paths. While using Master and Minion Ingresses i.e. Mergeable Ingresses, this annotation can be specified on Minion types. The `path-regex` annotation specified on Master is ignored, and has no effect on paths defined on Minions. | N/A | [path-regex](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/path-regex) | +| *nginx.org/path-regex* | N/A | Enables regular expression modifiers for Ingress path parameter. This translates to the NGINX [location](https://nginx.org/en/docs/http/ngx_http_core_module.html#location) directive. You can specify one of these values: "case_sensitive", "case_insensitive", or "exact". The annotation is applied to the entire Ingress resource and its paths. While using Master and Minion Ingresses i.e. Mergeable Ingresses, this annotation can be specified on Minion types. The `path-regex` annotation specified on Master is ignored, and has no effect on paths defined on Minions. | N/A | [path-regex](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/path-regex) | {{}} ### Request URI/Header Manipulation @@ -120,8 +120,8 @@ The table below summarizes the available annotations. | ---| ---| ---| ---| --- | | *nginx.org/proxy-hide-headers* | *proxy-hide-headers* | Sets the value of one or more [proxy_hide_header](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_hide_header) directives. Example: ``"nginx.org/proxy-hide-headers": "header-a,header-b"* | N/A | | | *nginx.org/proxy-pass-headers* | *proxy-pass-headers* | Sets the value of one or more [proxy_pass_header](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass_header) directives. Example: ``"nginx.org/proxy-pass-headers": "header-a,header-b"* | N/A | | -| *nginx.org/rewrites* | N/A | Configures URI rewriting using [proxy_pass](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass) directive. | N/A | [rewrites](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/rewrites) | -|*nginx.org/proxy-set-headers* | N/A | Enables customization of proxy headers and values using the [proxy_set_header](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_set_header) directive. Example: ``"nginx.org/proxy-set-headers": "header-a: valueA,header-b: valueB,header-c: valueC"`` | N/A | [Proxy Set Headers](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/proxy-set-headers). | +| *nginx.org/rewrites* | N/A | Configures URI rewriting using [proxy_pass](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass) directive. | N/A | [rewrites](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/rewrites) | +|*nginx.org/proxy-set-headers* | N/A | Enables customization of proxy headers and values using the [proxy_set_header](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_set_header) directive. Example: ``"nginx.org/proxy-set-headers": "header-a: valueA,header-b: valueB,header-c: valueC"`` | N/A | [Proxy Set Headers](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/proxy-set-headers). | {{}} ### Auth and SSL/TLS @@ -129,7 +129,7 @@ The table below summarizes the available annotations. {{}} |Annotation | ConfigMap Key | Description | Default | Example | | ---| ---| ---| ---| --- | -| *nginx.org/redirect-to-https* | *redirect-to-https* | Sets the 301 redirect rule based on the value of the ``http_x_forwarded_proto* header on the server block to force incoming traffic to be over HTTPS. Useful when terminating SSL in a load balancer in front of NGINX Ingress Controller — see [115](https://github.com/nginxinc/kubernetes-ingress/issues/115) | *False* | | +| *nginx.org/redirect-to-https* | *redirect-to-https* | Sets the 301 redirect rule based on the value of the ``http_x_forwarded_proto* header on the server block to force incoming traffic to be over HTTPS. Useful when terminating SSL in a load balancer in front of NGINX Ingress Controller — see [115](https://github.com/nginx/kubernetes-ingress/issues/115) | *False* | | | *ingress.kubernetes.io/ssl-redirect* | *ssl-redirect* | Sets an unconditional 301 redirect rule for all incoming HTTP traffic to force incoming traffic over HTTPS. | *True* | | | *nginx.org/hsts* | *hsts* | Enables [HTTP Strict Transport Security (HSTS)](https://www.nginx.com/blog/http-strict-transport-security-hsts-and-nginx/)\ : the HSTS header is added to the responses from backends. The ``preload* directive is included in the header. | *False* | | | *nginx.org/hsts-max-age* | *hsts-max-age* | Sets the value of the ``max-age* directive of the HSTS header. | *2592000* (1 month) | | @@ -137,10 +137,10 @@ The table below summarizes the available annotations. | *nginx.org/hsts-behind-proxy* | *hsts-behind-proxy* | Enables HSTS based on the value of the ``http_x_forwarded_proto* request header. Should only be used when TLS termination is configured in a load balancer (proxy) in front of NGINX Ingress Controller. Note: to control redirection from HTTP to HTTPS configure the ``nginx.org/redirect-to-https* annotation. | *False* | | | *nginx.org/basic-auth-secret* | N/A | Specifies a Secret resource with a user list for HTTP Basic authentication. | N/A | | | *nginx.org/basic-auth-realm* | N/A | Specifies a realm. | N/A | | -| *nginx.com/jwt-key* | N/A | Specifies a Secret resource with keys for validating JSON Web Tokens (JWTs). | N/A | [Support for JSON Web Tokens (JWTs)](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/jwt). | -| *nginx.com/jwt-realm* | N/A | Specifies a realm. | N/A | [Support for JSON Web Tokens (JWTs)](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/jwt). | -| *nginx.com/jwt-token* | N/A | Specifies a variable that contains a JSON Web Token. | By default, a JWT is expected in the ``Authorization* header as a Bearer Token. | [Support for JSON Web Tokens (JWTs)](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/jwt). | -| *nginx.com/jwt-login-url* | N/A | Specifies a URL to which a client is redirected in case of an invalid or missing JWT. | N/A | [Support for JSON Web Tokens (JWTs)](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/jwt). | +| *nginx.com/jwt-key* | N/A | Specifies a Secret resource with keys for validating JSON Web Tokens (JWTs). | N/A | [Support for JSON Web Tokens (JWTs)](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/jwt). | +| *nginx.com/jwt-realm* | N/A | Specifies a realm. | N/A | [Support for JSON Web Tokens (JWTs)](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/jwt). | +| *nginx.com/jwt-token* | N/A | Specifies a variable that contains a JSON Web Token. | By default, a JWT is expected in the ``Authorization* header as a Bearer Token. | [Support for JSON Web Tokens (JWTs)](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/jwt). | +| *nginx.com/jwt-login-url* | N/A | Specifies a URL to which a client is redirected in case of an invalid or missing JWT. | N/A | [Support for JSON Web Tokens (JWTs)](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/jwt). | {{}} ### Listeners @@ -158,19 +158,19 @@ The table below summarizes the available annotations. |Annotation | ConfigMap Key | Description | Default | Example | | ---| ---| ---| ---| --- | | *nginx.org/lb-method* | *lb-method* | Sets the [load balancing method](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/#choosing-a-load-balancing-method). To use the round-robin method, specify ``"round_robin"``. | *"random two least_conn"* | | -| *nginx.org/ssl-services* | N/A | Enables HTTPS or gRPC over SSL when connecting to the endpoints of services. | N/A | [ssl-services](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/ssl-services) | -| *nginx.org/grpc-services* | N/A | Enables gRPC for services. Note: requires HTTP/2 (see ``http2* ConfigMap key); only works for Ingresses with TLS termination enabled. | N/A | [grpc-services](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/grpc-services) | -| *nginx.org/websocket-services* | N/A | Enables WebSocket for services. | N/A | [websocket](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/websocket) | +| *nginx.org/ssl-services* | N/A | Enables HTTPS or gRPC over SSL when connecting to the endpoints of services. | N/A | [ssl-services](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/ssl-services) | +| *nginx.org/grpc-services* | N/A | Enables gRPC for services. Note: requires HTTP/2 (see ``http2* ConfigMap key); only works for Ingresses with TLS termination enabled. | N/A | [grpc-services](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/grpc-services) | +| *nginx.org/websocket-services* | N/A | Enables WebSocket for services. | N/A | [websocket](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/websocket) | | *nginx.org/max-fails* | *max-fails* | Sets the value of the [max_fails](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#max_fails) parameter of the ``server* directive. | *1* | | | *nginx.org/max-conns* | N\A | Sets the value of the [max_conns](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#max_conns) parameter of the ``server* directive. | *0* | | | *nginx.org/upstream-zone-size* | *upstream-zone-size* | Sets the size of the shared memory [zone](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#zone) for upstreams. For NGINX, the special value 0 disables the shared memory zones. For NGINX Plus, shared memory zones are required and cannot be disabled. The special value 0 will be ignored. | *256K* | | | *nginx.org/fail-timeout* | *fail-timeout* | Sets the value of the [fail_timeout](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#fail_timeout) parameter of the ``server* directive. | *10s* | | -| *nginx.com/sticky-cookie-services* | N/A | Configures session persistence. | N/A | [session-persistence](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/session-persistence) | +| *nginx.com/sticky-cookie-services* | N/A | Configures session persistence. | N/A | [session-persistence](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/session-persistence) | | *nginx.org/keepalive* | *keepalive* | Sets the value of the [keepalive](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive) directive. Note that ``proxy_set_header Connection "";* is added to the generated configuration when the value > 0. | *0* | | -| *nginx.com/health-checks* | N/A | Enables active health checks. | *False* | [health-checks](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/health-checks) | -| *nginx.com/health-checks-mandatory* | N/A | Configures active health checks as mandatory. | *False* | [health-checks](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/health-checks) | -| *nginx.com/health-checks-mandatory-queue* | N/A | When active health checks are mandatory, creates a queue where incoming requests are temporarily stored while NGINX Plus is checking the health of the endpoints after a configuration reload. | *0* | [health-checks](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/health-checks) | -| *nginx.com/slow-start* | N/A | Sets the upstream server [slow-start period](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/#server-slow-start). By default, slow-start is activated after a server becomes [available](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-health-check/#passive-health-checks) or [healthy](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-health-check/#active-health-checks). To enable slow-start for newly-added servers, configure [mandatory active health checks](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/health-checks). | *"0s"* | | +| *nginx.com/health-checks* | N/A | Enables active health checks. | *False* | [health-checks](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/health-checks) | +| *nginx.com/health-checks-mandatory* | N/A | Configures active health checks as mandatory. | *False* | [health-checks](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/health-checks) | +| *nginx.com/health-checks-mandatory-queue* | N/A | When active health checks are mandatory, creates a queue where incoming requests are temporarily stored while NGINX Plus is checking the health of the endpoints after a configuration reload. | *0* | [health-checks](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/health-checks) | +| *nginx.com/slow-start* | N/A | Sets the upstream server [slow-start period](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/#server-slow-start). By default, slow-start is activated after a server becomes [available](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-health-check/#passive-health-checks) or [healthy](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-health-check/#active-health-checks). To enable slow-start for newly-added servers, configure [mandatory active health checks](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/health-checks). | *"0s"* | | | *nginx.org/use-cluster-ip* | N/A | Enables using the Cluster IP and port of the service instead of the default behavior of using the IP and port of the pods. When this field is enabled, the fields that configure NGINX behavior related to multiple upstream servers (like ``lb-method* and ``next-upstream``) will have no effect, as NGINX Ingress Controller will configure NGINX with only one upstream server that will match the service Cluster IP. | *False* | | {{}} @@ -207,11 +207,11 @@ The table below summarizes the available annotations. {{}} |Annotation | ConfigMap Key | Description | Default | Example | | ---| ---| ---| ---| --- | -| *appprotect.f5.com/app-protect-policy* | N/A | The name of the App Protect Policy for the Ingress Resource. Format is ``namespace/name``. If no namespace is specified, the same namespace of the Ingress Resource is used. If not specified but ``appprotect.f5.com/app-protect-enable* is true, a default policy id applied. If the referenced policy resource does not exist, or policy is invalid, this annotation will be ignored, and the default policy will be applied. | N/A | [app-protect-waf](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-waf) | -| *appprotect.f5.com/app-protect-enable* | N/A | Enable App Protect for the Ingress Resource. | *False* | [app-protect-waf](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-waf) | -| *appprotect.f5.com/app-protect-security-log-enable* | N/A | Enable the [security log](/nginx-app-protect/troubleshooting/#app-protect-logging-overview) for App Protect. | *False* | [app-protect-waf](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-waf) | -| *appprotect.f5.com/app-protect-security-log* | N/A | The App Protect log configuration for the Ingress Resource. Format is ``namespace/name``. If no namespace is specified, the same namespace as the Ingress Resource is used. If not specified the default is used which is: filter: ``illegal``, format: ``default``. Multiple configurations can be specified in a comma separated list. Both log configurations and destinations list (see below) must be of equal length. Configs and destinations are paired by the list indices. | N/A | [app-protect-waf](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-waf) | -| *appprotect.f5.com/app-protect-security-log-destination* | N/A | The destination of the security log. For more information check the [DESTINATION argument](/nginx-app-protect/troubleshooting/#app-protect-logging-overview). Multiple destinations can be specified in a comma-separated list. Both log configurations and destinations list (see above) must be of equal length. Configs and destinations are paired by the list indices. | *syslog:server=localhost:514* | [app-protect-waf](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-waf) | +| *appprotect.f5.com/app-protect-policy* | N/A | The name of the App Protect Policy for the Ingress Resource. Format is ``namespace/name``. If no namespace is specified, the same namespace of the Ingress Resource is used. If not specified but ``appprotect.f5.com/app-protect-enable* is true, a default policy id applied. If the referenced policy resource does not exist, or policy is invalid, this annotation will be ignored, and the default policy will be applied. | N/A | [app-protect-waf](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-waf) | +| *appprotect.f5.com/app-protect-enable* | N/A | Enable App Protect for the Ingress Resource. | *False* | [app-protect-waf](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-waf) | +| *appprotect.f5.com/app-protect-security-log-enable* | N/A | Enable the [security log](/nginx-app-protect/troubleshooting/#app-protect-logging-overview) for App Protect. | *False* | [app-protect-waf](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-waf) | +| *appprotect.f5.com/app-protect-security-log* | N/A | The App Protect log configuration for the Ingress Resource. Format is ``namespace/name``. If no namespace is specified, the same namespace as the Ingress Resource is used. If not specified the default is used which is: filter: ``illegal``, format: ``default``. Multiple configurations can be specified in a comma separated list. Both log configurations and destinations list (see below) must be of equal length. Configs and destinations are paired by the list indices. | N/A | [app-protect-waf](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-waf) | +| *appprotect.f5.com/app-protect-security-log-destination* | N/A | The destination of the security log. For more information check the [DESTINATION argument](/nginx-app-protect/troubleshooting/#app-protect-logging-overview). Multiple destinations can be specified in a comma-separated list. Both log configurations and destinations list (see above) must be of equal length. Configs and destinations are paired by the list indices. | *syslog:server=localhost:514* | [app-protect-waf](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-waf) | {{}} ### App Protect DoS @@ -221,5 +221,5 @@ The table below summarizes the available annotations. {{}} |Annotation | ConfigMap Key | Description | Default | Example | | ---| ---| ---| ---| --- | -| *appprotectdos.f5.com/app-protect-dos-resource* | N/A | Enable App Protect DoS for the Ingress Resource by specifying a [DosProtectedResource]({{< relref "installation/integrations/app-protect-dos/dos-protected.md" >}}). | N/A | [app-protect-dos](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-dos) | +| *appprotectdos.f5.com/app-protect-dos-resource* | N/A | Enable App Protect DoS for the Ingress Resource by specifying a [DosProtectedResource]({{< relref "installation/integrations/app-protect-dos/dos-protected.md" >}}). | N/A | [app-protect-dos](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-dos) | {{}} diff --git a/site/content/configuration/ingress-resources/basic-configuration.md b/site/content/configuration/ingress-resources/basic-configuration.md index 2eef418b98..8de3b0886c 100644 --- a/site/content/configuration/ingress-resources/basic-configuration.md +++ b/site/content/configuration/ingress-resources/basic-configuration.md @@ -53,7 +53,7 @@ Here is a breakdown of what this Ingress resource definition means: To learn more about the Ingress resource, view [the official Kubernetes documentation for Ingress resources](https://kubernetes.io/docs/concepts/services-networking/ingress/). -{{< note >}} For complete instructions on deploying Ingress and Secret resources in the cluster, see the [complete example](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/complete-example) in the GitHub repository. {{< /note >}} +{{< note >}} For complete instructions on deploying Ingress and Secret resources in the cluster, see the [complete example](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/complete-example) in the GitHub repository. {{< /note >}} ## New features available in Kubernetes 1.18 @@ -116,10 +116,10 @@ NGINX Ingress Controller imposes the following restrictions on Ingress resources ## Advanced configuration -NGINX Ingress Controller generates NGINX configuration by executing a template file that contains the configuration options. These options are set with the Ingress resource and NGINX Ingress Controller's ConfigMap. The Ingress resource only allows you to use basic NGINX features: host and path-based routing and TLS termination. +NGINX Ingress Controller generates NGINX configuration by executing a template file that contains the configuration options. These options are set with the Ingress resource and NGINX Ingress Controller's ConfigMap. The Ingress resource only allows you to use basic NGINX features: host and path-based routing and TLS termination. Advanced features like rewriting the request URI or inserting additional response headers are available through annotations. View the [Advanced configuration with Annotations]({{< relref "configuration/ingress-resources/advanced-configuration-with-annotations.md" >}}) topic for more information. -Advanced NGINX users who require more control over the generated NGINX configurations can use snippets to insert raw NGINX config. View the [Advanced configuration with Snippets]({{< relref "configuration/ingress-resources/advanced-configuration-with-snippets" >}}) topic for more information. +Advanced NGINX users who require more control over the generated NGINX configurations can use snippets to insert raw NGINX config. View the [Advanced configuration with Snippets]({{< relref "configuration/ingress-resources/advanced-configuration-with-snippets" >}}) topic for more information. Additionally, it is possible to customize the template, described in the [Custom templates]({{< relref "/configuration/global-configuration/custom-templates.md" >}}) topic. diff --git a/site/content/configuration/ingress-resources/cross-namespace-configuration.md b/site/content/configuration/ingress-resources/cross-namespace-configuration.md index d292f1b43c..3e92b64035 100644 --- a/site/content/configuration/ingress-resources/cross-namespace-configuration.md +++ b/site/content/configuration/ingress-resources/cross-namespace-configuration.md @@ -9,6 +9,6 @@ weight: 500 This topic explains how to spread Ingress configuration across different namespaces in F5 NGINX Ingress Controller. -You can spread the Ingress configuration for a common host across multiple Ingress resources using Mergeable Ingress resources. Such resources can belong to the *same* or *different* namespaces. This enables easier management when using a large number of paths. See the [Mergeable Ingress Resources](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/mergeable-ingress-types) example in our GitHub repo. +You can spread the Ingress configuration for a common host across multiple Ingress resources using Mergeable Ingress resources. Such resources can belong to the *same* or *different* namespaces. This enables easier management when using a large number of paths. See the [Mergeable Ingress Resources](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/mergeable-ingress-types) example in our GitHub repo. -As an alternative to Mergeable Ingress resources, you can use [VirtualServer and VirtualServerRoute resources](/nginx-ingress-controller/configuration/virtualserver-and-virtualserverroute-resources/) for cross-namespace configuration. See the [Cross-Namespace Configuration](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/cross-namespace-configuration) example in our GitHub repo. +As an alternative to Mergeable Ingress resources, you can use [VirtualServer and VirtualServerRoute resources](/nginx-ingress-controller/configuration/virtualserver-and-virtualserverroute-resources/) for cross-namespace configuration. See the [Cross-Namespace Configuration](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/cross-namespace-configuration) example in our GitHub repo. diff --git a/site/content/configuration/ingress-resources/custom-annotations.md b/site/content/configuration/ingress-resources/custom-annotations.md index 229a0d3a52..8bbd136b0b 100644 --- a/site/content/configuration/ingress-resources/custom-annotations.md +++ b/site/content/configuration/ingress-resources/custom-annotations.md @@ -21,7 +21,7 @@ Custom annotations allow you to add an annotation for an NGINX feature that is n ## Usage -The Ingress Controller generates NGINX configuration for Ingress resources by executing a configuration template. See [NGINX template](https://github.com/nginxinc/kubernetes-ingress/blob/v{{< nic-version >}}/internal/configs/version1/nginx.ingress.tmpl) or [NGINX Plus template](https://github.com/nginxinc/kubernetes-ingress/blob/v{{< nic-version >}}/internal/configs/version1/nginx-plus.ingress.tmpl). +The Ingress Controller generates NGINX configuration for Ingress resources by executing a configuration template. See [NGINX template](https://github.com/nginx/kubernetes-ingress/blob/v{{< nic-version >}}/internal/configs/version1/nginx.ingress.tmpl) or [NGINX Plus template](https://github.com/nginx/kubernetes-ingress/blob/v{{< nic-version >}}/internal/configs/version1/nginx-plus.ingress.tmpl). To support custom annotations, the template has access to the information about the Ingress resource - its *name*, *namespace* and *annotations*. It is possible to check if a particular annotation present in the Ingress resource and conditionally insert NGINX configuration directives at multiple NGINX contexts - `http`, `server`, `location` or `upstream`. Additionally, you can get the value that is set to the annotation. @@ -143,4 +143,4 @@ deny all; ## Example -See the [custom annotations example](https://github.com/nginxinc/kubernetes-ingress/blob/v{{< nic-version >}}/examples/ingress-resources/custom-annotations). +See the [custom annotations example](https://github.com/nginx/kubernetes-ingress/blob/v{{< nic-version >}}/examples/ingress-resources/custom-annotations). diff --git a/site/content/configuration/policy-resource.md b/site/content/configuration/policy-resource.md index 72fcece970..4c764194be 100644 --- a/site/content/configuration/policy-resource.md +++ b/site/content/configuration/policy-resource.md @@ -9,7 +9,7 @@ The Policy resource allows you to configure features like access control and rat The resource is implemented as a [Custom Resource](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/). -This document is the reference documentation for the Policy resource. An example of a Policy for access control is available in our [GitHub repository](https://github.com/nginxinc/kubernetes-ingress/blob/v{{< nic-version >}}/examples/custom-resources/access-control). +This document is the reference documentation for the Policy resource. An example of a Policy for access control is available in our [GitHub repository](https://github.com/nginx/kubernetes-ingress/blob/v{{< nic-version >}}/examples/custom-resources/access-control). ## Prerequisites @@ -111,7 +111,7 @@ rateLimit: zoneSize: 10M key: ${binary_remote_addr} ``` -{{< note >}} +{{< note >}} The feature is implemented using the NGINX [ngx_http_limit_req_module](https://nginx.org/en/docs/http/ngx_http_limit_req_module.html). @@ -466,7 +466,7 @@ data: 2. Adding the `crlFileName` field to your IngressMTLS policy spec with the name of the CRL file. -{{< note >}} +{{< note >}} This configuration option should only be used when using a CRL that is larger than 1MiB. @@ -593,14 +593,14 @@ NGINX Plus will pass the ID of an authenticated user to the backend in the HTTP {{< note >}} -The feature is implemented using the [reference implementation](https://github.com/nginxinc/nginx-openid-connect/) of NGINX Plus as a relying party for OpenID Connect authentication. +The feature is implemented using the [reference implementation](https://github.com/nginx/nginx-openid-connect/) of NGINX Plus as a relying party for OpenID Connect authentication. {{< /note >}} #### Prerequisites In order to use OIDC, you need to enable [zone synchronization](https://docs.nginx.com/nginx/admin-guide/high-availability/zone_sync/). If you don't set up zone synchronization, NGINX Plus will fail to reload. -You also need to configure a resolver, which NGINX Plus will use to resolve the IDP authorization endpoint. You can find an example configuration [in our GitHub repository](https://github.com/nginxinc/kubernetes-ingress/blob/v{{< nic-version >}}/examples/custom-resources/oidc#step-7---configure-nginx-plus-zone-synchronization-and-resolver). +You also need to configure a resolver, which NGINX Plus will use to resolve the IDP authorization endpoint. You can find an example configuration [in our GitHub repository](https://github.com/nginx/kubernetes-ingress/blob/v{{< nic-version >}}/examples/custom-resources/oidc#step-7---configure-nginx-plus-zone-synchronization-and-resolver). {{< warning >}} diff --git a/site/content/configuration/security.md b/site/content/configuration/security.md index 5e4c7ea74c..c3e1567a32 100644 --- a/site/content/configuration/security.md +++ b/site/content/configuration/security.md @@ -7,20 +7,20 @@ toc: true weight: 300 --- -F5 NGINX Ingress Controller follows Kubernetes best practices: this page outlines configuration specific to NGINX Ingress Controller you may require, including links to examples in the [GitHub repository](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples). +F5 NGINX Ingress Controller follows Kubernetes best practices: this page outlines configuration specific to NGINX Ingress Controller you may require, including links to examples in the [GitHub repository](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples). -For general guidance, we recommend the official Kubernetes documentation for [Securing a Cluster](https://kubernetes.io/docs/tasks/administer-cluster/securing-a-cluster/). +For general guidance, we recommend the official Kubernetes documentation for [Securing a Cluster](https://kubernetes.io/docs/tasks/administer-cluster/securing-a-cluster/). ## Kubernetes recommendations ### RBAC and Service Accounts -Kubernetes uses [RBAC](https://kubernetes.io/docs/reference/access-authn-authz/rbac/) to control the resources and operations available to different types of users. +Kubernetes uses [RBAC](https://kubernetes.io/docs/reference/access-authn-authz/rbac/) to control the resources and operations available to different types of users. NGINX Ingress Controller requires RBAC to configure a [ServiceUser](https://kubernetes.io/docs/concepts/security/service-accounts/#default-service-accounts), and provides least privilege access in its standard deployment configurations: -- [Helm](https://github.com/nginxinc/kubernetes-ingress/blob/v{{< nic-version >}}/deployments/rbac/rbac.yaml) -- [Manifests](https://github.com/nginxinc/kubernetes-ingress/blob/v{{< nic-version >}}/deployments/rbac/rbac.yaml) +- [Helm](https://github.com/nginx/kubernetes-ingress/blob/v{{< nic-version >}}/deployments/rbac/rbac.yaml) +- [Manifests](https://github.com/nginx/kubernetes-ingress/blob/v{{< nic-version >}}/deployments/rbac/rbac.yaml) By default, the ServiceAccount has access to all Secret resources in the cluster. @@ -94,9 +94,9 @@ Snippets are disabled by default. To use snippets, set the [**enable-snippets**] Snippets are **always** enabled for ConfigMap. {{< /caution >}} -For more information, read the following: +For more information, read the following: -- [Advanced configuration using Snippets]({{< relref "/configuration/ingress-resources/advanced-configuration-with-snippets.md" >}}) +- [Advanced configuration using Snippets]({{< relref "/configuration/ingress-resources/advanced-configuration-with-snippets.md" >}}) - [Using Snippets with VirtualServer/VirtualServerRoute]({{< relref "configuration/virtualserver-and-virtualserverroute-resources.md#using-snippets" >}}) - [Using Snippets with TransportServer]({{< relref "/configuration/transportserver-resource.md#using-snippets" >}}) - [ConfigMap snippets and custom templates]({{< relref "configuration/global-configuration/configmap-resource.md#snippets-and-custom-templates" >}}) diff --git a/site/content/configuration/transportserver-resource.md b/site/content/configuration/transportserver-resource.md index 3be578fca1..bdf794f561 100644 --- a/site/content/configuration/transportserver-resource.md +++ b/site/content/configuration/transportserver-resource.md @@ -5,11 +5,11 @@ weight: 600 docs: DOCS-598 --- -This document is reference material for the TransportServer resource used by F5 NGINX Ingress Controller. +This document is reference material for the TransportServer resource used by F5 NGINX Ingress Controller. The TransportServer resource allows you to configure TCP, UDP, and TLS Passthrough load balancing. The resource is implemented as a [Custom Resource](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/). -The GitHub repository has [examples of the resources](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources) for specific use cases. +The GitHub repository has [examples of the resources](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources) for specific use cases. ## Prerequisites @@ -337,7 +337,7 @@ spec: port: 80 ``` -{{< note >}} To configure snippets in the `stream` context, use `stream-snippets` ConfigMap key. {{< /note >}} +{{< note >}} To configure snippets in the `stream` context, use `stream-snippets` ConfigMap key. {{< /note >}} For additional information, view the [Advanced configuration with Snippets]({{< relref "configuration/ingress-resources/advanced-configuration-with-snippets.md" >}}) topic. diff --git a/site/content/configuration/virtualserver-and-virtualserverroute-resources.md b/site/content/configuration/virtualserver-and-virtualserverroute-resources.md index f7695fb3a3..ee42602cd3 100644 --- a/site/content/configuration/virtualserver-and-virtualserverroute-resources.md +++ b/site/content/configuration/virtualserver-and-virtualserverroute-resources.md @@ -5,13 +5,13 @@ weight: 700 docs: DOCS-599 --- -This document is reference material for the VirtualServer and VirtualServerRoute resources used by F5 NGINX Ingress Controller. +This document is reference material for the VirtualServer and VirtualServerRoute resources used by F5 NGINX Ingress Controller. VirtualServer and VirtualServerRoute resources are load balancing configurations recommended as an alternative to the Ingress resource. They enable use cases not supported with the Ingress resource, such as traffic splitting and advanced content-based routing. The resources are implemented as [Custom Resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/). -The GitHub repository has [examples of the resources](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources) for specific use cases. +The GitHub repository has [examples of the resources](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources) for specific use cases. --- @@ -348,7 +348,7 @@ tls: |Field | Description | Type | Required | | ---| ---| ---| --- | |``name`` | The name of the upstream. Must be a valid DNS label as defined in RFC 1035. For example, ``hello`` and ``upstream-123`` are valid. The name must be unique among all upstreams of the resource. | ``string`` | Yes | -|``service`` | The name of a [service](https://kubernetes.io/docs/concepts/services-networking/service/). The service must belong to the same namespace as the resource. If the service doesn't exist, NGINX will assume the service has zero endpoints and return a ``502`` response for requests for this upstream. For NGINX Plus only, services of type [ExternalName](https://kubernetes.io/docs/concepts/services-networking/service/#externalname) are also supported (check the [prerequisites](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services#prerequisites) ). | ``string`` | Yes | +|``service`` | The name of a [service](https://kubernetes.io/docs/concepts/services-networking/service/). The service must belong to the same namespace as the resource. If the service doesn't exist, NGINX will assume the service has zero endpoints and return a ``502`` response for requests for this upstream. For NGINX Plus only, services of type [ExternalName](https://kubernetes.io/docs/concepts/services-networking/service/#externalname) are also supported (check the [prerequisites](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services#prerequisites) ). | ``string`` | Yes | |``subselector`` | Selects the pods within the service using label keys and values. By default, all pods of the service are selected. Note: the specified labels are expected to be present in the pods when they are created. If the pod labels are updated, NGINX Ingress Controller will not see that change until the number of the pods is changed. | ``map[string]string`` | No | |``use-cluster-ip`` | Enables using the Cluster IP and port of the service instead of the default behavior of using the IP and port of the pods. When this field is enabled, the fields that configure NGINX behavior related to multiple upstream servers (like ``lb-method`` and ``next-upstream``) will have no effect, as NGINX Ingress Controller will configure NGINX with only one upstream server that will match the service Cluster IP. | ``boolean`` | No | |``port`` | The port of the service. If the service doesn't define that port, NGINX will assume the service has zero endpoints and return a ``502`` response for requests for this upstream. The port must fall into the range ``1..65535``. | ``uint16`` | Yes | @@ -657,7 +657,7 @@ proxy: |``upstream`` | The name of the upstream which the requests will be proxied to. The upstream with that name must be defined in the resource. | ``string`` | Yes | |``requestHeaders`` | The request headers modifications. | [action.Proxy.RequestHeaders](#actionproxyrequestheaders) | No | |``responseHeaders`` | The response headers modifications. | [action.Proxy.ResponseHeaders](#actionproxyresponseheaders) | No | -|``rewritePath`` | The rewritten URI. If the route path is a regular expression -- starts with `~` -- the `rewritePath` can include capture groups with ``$1-9``. For example `$1` for the first group, and so on. For more information, check the [rewrite](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/rewrites) example. | ``string`` | No | +|``rewritePath`` | The rewritten URI. If the route path is a regular expression -- starts with `~` -- the `rewritePath` can include capture groups with ``$1-9``. For example `$1` for the first group, and so on. For more information, check the [rewrite](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/rewrites) example. | ``string`` | No | {{}} ### Action.Proxy.RequestHeaders @@ -733,7 +733,7 @@ always: true \* -- Supported NGINX variables: `$request_uri`, `$request_method`, `$request_body`, `$scheme`, `$http_`, `$args`, `$arg_`, `$cookie_`, `$host`, `$request_time`, `$request_length`, `$nginx_version`, `$pid`, `$connection`, `$remote_addr`, `$remote_port`, `$time_iso8601`, `$time_local`, `$server_addr`, `$server_port`, `$server_name`, `$server_protocol`, `$connections_active`, `$connections_reading`, `$connections_writing`, `$connections_waiting`, `$ssl_cipher`, `$ssl_ciphers`, `$ssl_client_cert`, `$ssl_client_escaped_cert`, `$ssl_client_fingerprint`, `$ssl_client_i_dn`, `$ssl_client_i_dn_legacy`, `$ssl_client_raw_cert`, `$ssl_client_s_dn`, `$ssl_client_s_dn_legacy`, `$ssl_client_serial`, `$ssl_client_v_end`, `$ssl_client_v_remain`, `$ssl_client_v_start`, `$ssl_client_verify`, `$ssl_curves`, `$ssl_early_data`, `$ssl_protocol`, `$ssl_server_name`, `$ssl_session_id`, `$ssl_session_reused`, `$jwt_claim_` (NGINX Plus only) and `$jwt_header_` (NGINX Plus only). -{{< note >}} If `always` is false, the response header is added only if the response status code is any of `200`, `201`, `204`, `206`, `301`, `302`, `303`, `304`, `307` or `308`. {{< /note >}} +{{< note >}} If `always` is false, the response header is added only if the response status code is any of `200`, `201`, `204`, `206`, `301`, `302`, `303`, `304`, `307` or `308`. {{< /note >}} ### Split @@ -810,7 +810,7 @@ action: |``splits`` | The splits configuration for traffic splitting. Must include at least 2 splits. | [[]split](#split) | No | {{}} -{{< note >}} A match must include exactly one of the following: `action` or `splits`. {{< /note >}} +{{< note >}} A match must include exactly one of the following: `action` or `splits`. {{< /note >}} ### Condition @@ -826,7 +826,7 @@ The condition defines a condition in a match. |``value`` | The value to match the condition against. How to define a value is shown below the table. | ``string`` | Yes | {{}} -{{< note >}} a condition must include exactly one of the following: `header`, `cookie`, `argument` or `variable`. {{< /note >}} +{{< note >}} a condition must include exactly one of the following: `header`, `cookie`, `argument` or `variable`. {{< /note >}} Supported NGINX variables: `$args`, `$http2`, `$https`, `$remote_addr`, `$remote_port`, `$query_string`, `$request`, `$request_body`, `$request_uri`, `$request_method`, `$scheme`. Find the documentation for each variable [here](https://nginx.org/en/docs/varindex.html). @@ -840,7 +840,7 @@ The value supports two kinds of matching: - `!~^yes` -- negation of the previous regular expression that succeeds for strings like `YES`, `Yes123`, `noyes`. (The negation mechanism is not part of the PCRE syntax). - `~*no$` -- a case-insensitive regular expression that matches any string that ends with `no`. For example: `no`, `123no`, `123NO`. -{{< note >}} A value must not include any unescaped double quotes (`"`) and must not end with an unescaped backslash (`\`). For example, the following are invalid values: `some"value`, `somevalue\`. {{< /note >}} +{{< note >}} A value must not include any unescaped double quotes (`"`) and must not end with an unescaped backslash (`\`). For example, the following are invalid values: `some"value`, `somevalue\`. {{< /note >}} ### ErrorPage diff --git a/site/content/includes/installation/create-custom-resources.md b/site/content/includes/installation/create-custom-resources.md index fcd2d34078..54079aea06 100644 --- a/site/content/includes/installation/create-custom-resources.md +++ b/site/content/includes/installation/create-custom-resources.md @@ -23,7 +23,7 @@ The core custom CRDs are the following: {{%tab name="Install CRDs from single YAML"%}} ```shell -kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/deploy/crds.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/deploy/crds.yaml ``` {{%/tab%}} diff --git a/site/content/installation/build-nginx-ingress-controller.md b/site/content/installation/build-nginx-ingress-controller.md index 15ff02cb3b..17468b76e1 100644 --- a/site/content/installation/build-nginx-ingress-controller.md +++ b/site/content/installation/build-nginx-ingress-controller.md @@ -7,7 +7,7 @@ product: NIC docs: DOCS-1453 --- -This document describes how to build an F5 NGINX Ingress Controller image from source code and upload it to a private Docker registry. +This document describes how to build an F5 NGINX Ingress Controller image from source code and upload it to a private Docker registry. It also includes information on the Makefile targets and variables. @@ -23,7 +23,7 @@ To get started, you need the following software installed on your machine: - [OpenSSL](https://www.openssl.org/), optionally, if you would like to generate a self-signed certificate and a key for the default server. - For NGINX Plus users, download the certificate (_nginx-repo.crt_) and key (_nginx-repo.key_) from [MyF5](https://my.f5.com). -Although NGINX Ingress Controller is written in Golang, you don't need to have Golang installed. +Although NGINX Ingress Controller is written in Golang, you don't need to have Golang installed. You can download the precompiled binary file or build NGINX Ingress Controller in a Docker container. @@ -42,14 +42,14 @@ Get your system ready for building and pushing the NGINX Ingress Controller imag 2. Clone the NGINX Ingress Controller GitHub repository. Replace `` with the version of NGINX Ingress Controller you want. ```shell - git clone https://github.com/nginxinc/kubernetes-ingress.git --branch + git clone https://github.com/nginx/kubernetes-ingress.git --branch cd kubernetes-ingress ``` For instance if you want to clone version v{{< nic-version >}}, the commands to run would be: ```shell - git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v{{< nic-version >}} + git clone https://github.com/nginx/kubernetes-ingress.git --branch v{{< nic-version >}} cd kubernetes-ingress ``` @@ -195,7 +195,7 @@ The _Makefile_ includes several key variables. You have the option to either mod If you prefer not to build your own NGINX Ingress Controller image, you can use pre-built images. Here are your options: -**NGINX Ingress Controller**: Download the image `nginx/nginx-ingress` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress) or [GitHub](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress). +**NGINX Ingress Controller**: Download the image `nginx/nginx-ingress` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress) or [GitHub](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress). **NGINX Plus Ingress Controller**: You have two options for this: diff --git a/site/content/installation/ingress-nginx.md b/site/content/installation/ingress-nginx.md index c20c842f1d..99c24159d9 100644 --- a/site/content/installation/ingress-nginx.md +++ b/site/content/installation/ingress-nginx.md @@ -445,7 +445,7 @@ sessionCookie: ``` ## Migration with Kubernetes Ingress resources -The other option for migrating from the community Ingress-NGINX Controller to NGINX Ingress Controller is using only [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) and [ConfigMaps](https://kubernetes.io/docs/concepts/configuration/configmap/) from standard Kubernetes resources, potentially relying on [mergeable Ingress types](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples/ingress-resources/mergeable-ingress-types). +The other option for migrating from the community Ingress-NGINX Controller to NGINX Ingress Controller is using only [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) and [ConfigMaps](https://kubernetes.io/docs/concepts/configuration/configmap/) from standard Kubernetes resources, potentially relying on [mergeable Ingress types](https://github.com/nginx/kubernetes-ingress/tree/main/examples/ingress-resources/mergeable-ingress-types). This ensures that all configuration is kept in the Ingress object. diff --git a/site/content/installation/installing-nic/installation-with-helm.md b/site/content/installation/installing-nic/installation-with-helm.md index b464d3e716..51f20829e4 100644 --- a/site/content/installation/installing-nic/installation-with-helm.md +++ b/site/content/installation/installing-nic/installation-with-helm.md @@ -46,14 +46,14 @@ kubectl apply -f crds/ Alternatively, CRDs can be upgraded without pulling the chart by running: ```shell -kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/deploy/crds.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/deploy/crds.yaml ``` In the above command, `v{{< nic-version >}}` represents the version of NGINX Ingress Controller release rather than the Helm chart version. {{< note >}} The following warning is expected and can be ignored: `Warning: kubectl apply should be used on resource created by either kubectl create --save-config or kubectl apply`. -Check the [release notes](https://www.github.com/nginxinc/kubernetes-ingress/releases) for a new release for any special upgrade procedures. +Check the [release notes](https://www.github.com/nginx/kubernetes-ingress/releases) for a new release for any special upgrade procedures. {{< /note >}} ### Uninstall the CRDs @@ -75,16 +75,16 @@ Run the following commands to install the chart with the release name my-release - For NGINX: ```shell - helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version {{< nic-helm-version >}} + helm install my-release oci://ghcr.io/nginx/charts/nginx-ingress --version {{< nic-helm-version >}} ``` - For NGINX Plus: (This assumes you have pushed NGINX Ingress Controller image `nginx-plus-ingress` to your private registry `myregistry.example.com`) ```shell - helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version {{< nic-helm-version >}} --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true + helm install my-release oci://ghcr.io/nginx/charts/nginx-ingress --version {{< nic-helm-version >}} --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true ``` -These commands install the latest `edge` version of NGINX Ingress Controller from GitHub Container Registry. If you prefer using Docker Hub, you can replace `ghcr.io/nginxinc/charts/nginx-ingress` with `registry-1.docker.io/nginxcharts/nginx-ingress`. +These commands install the latest `edge` version of NGINX Ingress Controller from GitHub Container Registry. If you prefer using Docker Hub, you can replace `ghcr.io/nginx/charts/nginx-ingress` with `registry-1.docker.io/nginxcharts/nginx-ingress`. ### Upgrade the chart @@ -93,7 +93,7 @@ Helm does not upgrade the CRDs during a release upgrade. Before you upgrade a re To upgrade the release `my-release`: ```shell -helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version {{< nic-helm-version >}} +helm upgrade my-release oci://ghcr.io/nginx/charts/nginx-ingress --version {{< nic-helm-version >}} ``` ### Uninstall the chart @@ -114,7 +114,7 @@ To test the latest changes in NGINX Ingress Controller before a new release, you You can install the `edge` version by specifying the `--version` flag with the value `0.0.0-edge`: ```shell -helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.0.0-edge +helm install my-release oci://ghcr.io/nginx/charts/nginx-ingress --version 0.0.0-edge ``` {{< warning >}} The `edge` version is not intended for production use. It is intended for testing and development purposes only. {{< /warning >}} @@ -128,7 +128,7 @@ This step is required if you're installing the chart using its sources. It also 1. Pull the chart sources: ```shell - helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version {{< nic-helm-version >}} + helm pull oci://ghcr.io/nginx/charts/nginx-ingress --untar --version {{< nic-helm-version >}} ``` 2. Change your working directory to nginx-ingress: @@ -181,7 +181,7 @@ Uninstalling the release does not remove the CRDs. To remove the CRDs, see [Unin ### Background -In NGINX Ingress Controller version 3.1.0, [changes were introduced](https://github.com/nginxinc/kubernetes-ingress/pull/3606) to Helm resource names, labels and annotations to fit with Helm best practices. +In NGINX Ingress Controller version 3.1.0, [changes were introduced](https://github.com/nginx/kubernetes-ingress/pull/3606) to Helm resource names, labels and annotations to fit with Helm best practices. When using Helm to upgrade from a version prior to 3.1.0, certain resources like Deployment, DaemonSet and Service will be recreated due to the aforementioned changes, which will result in downtime. Although the advisory is to update all resources in accordance with new naming convention, to avoid downtime follow the steps listed below. @@ -226,7 +226,7 @@ The steps you should follow depend on the Helm release name: It could look as follows: ```shell - helm upgrade nginx-ingress oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.19.0 --set controller.kind=deployment/daemonset --set controller.nginxplus=false/true --set controller.image.pullPolicy=Always --set serviceNameOverride="nginx-ingress-nginx-ingress" --set controller.name="" --set fullnameOverride="nginx-ingress-nginx-ingress" -f values.yaml + helm upgrade nginx-ingress oci://ghcr.io/nginx/charts/nginx-ingress --version 0.19.0 --set controller.kind=deployment/daemonset --set controller.nginxplus=false/true --set controller.image.pullPolicy=Always --set serviceNameOverride="nginx-ingress-nginx-ingress" --set controller.name="" --set fullnameOverride="nginx-ingress-nginx-ingress" -f values.yaml ``` 6. Once the upgrade process has finished, use `kubectl describe` on the deployment to verify the change by reviewing its events: @@ -273,7 +273,7 @@ The steps you should follow depend on the Helm release name: It could look as follows: ```shell - helm upgrade test-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.19.0 --set controller.kind=deployment/daemonset --set controller.nginxplus=false/true --set controller.image.pullPolicy=Always --set serviceNameOverride="test-release-nginx-ingress" --set controller.name="" -f values.yaml + helm upgrade test-release oci://ghcr.io/nginx/charts/nginx-ingress --version 0.19.0 --set controller.kind=deployment/daemonset --set controller.nginxplus=false/true --set controller.image.pullPolicy=Always --set serviceNameOverride="test-release-nginx-ingress" --set controller.name="" -f values.yaml ``` 6. Once the upgrade process has finished, use `kubectl describe` on the deployment to verify the change by reviewing its events: diff --git a/site/content/installation/installing-nic/installation-with-manifests.md b/site/content/installation/installing-nic/installation-with-manifests.md index 0d132489ae..fc4016d152 100644 --- a/site/content/installation/installing-nic/installation-with-manifests.md +++ b/site/content/installation/installing-nic/installation-with-manifests.md @@ -30,10 +30,10 @@ Choose one of the following methods to get the NGINX Ingress Controller image: Clone the NGINX Ingress Controller repository using the command shown below, and replace `` with the specific release you want to use. ```shell -git clone https://github.com/nginxinc/kubernetes-ingress.git --branch +git clone https://github.com/nginx/kubernetes-ingress.git --branch ``` -For example, if you want to use version {{< nic-version >}}, the command would be `git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v{{< nic-version >}}`. +For example, if you want to use version {{< nic-version >}}, the command would be `git clone https://github.com/nginx/kubernetes-ingress.git --branch v{{< nic-version >}}`. This guide assumes you are using the latest release. @@ -89,13 +89,13 @@ There are optional CRDs that are necessary if you want to use NGINX App Protect {{< note >}} This step can be skipped if you are using App Protect WAF module with policy bundles. {{< /note >}} ```shell -kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/deploy/crds-nap-waf.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/deploy/crds-nap-waf.yaml ``` **NGINX App Protect DoS**: ```shell -kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/deploy/crds-nap-dos.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/deploy/crds-nap-dos.yaml ``` {{%/tab%}} @@ -260,17 +260,17 @@ Connect to ports 80 and 443 using the IP address of any node in the cluster wher 1. Delete core custom resource definitions: ```shell - kubectl delete -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/deploy/crds.yaml + kubectl delete -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/deploy/crds.yaml ``` 2. Delete custom resource definitions for the NGINX App Protect WAF module: ```shell - kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/deploy/crds-nap-waf.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/deploy/crds-nap-waf.yaml ``` 3. Delete custom resource definitions for the NGINX App Protect DoS module: ```shell - kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/deploy/crds-nap-dos.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/deploy/crds-nap-dos.yaml ``` {{%/tab%}} diff --git a/site/content/installation/installing-nic/installation-with-operator.md b/site/content/installation/installing-nic/installation-with-operator.md index 830f61e815..22ae60b320 100644 --- a/site/content/installation/installing-nic/installation-with-operator.md +++ b/site/content/installation/installing-nic/installation-with-operator.md @@ -20,10 +20,10 @@ If you're using NGINX Plus, get the NGINX Ingress Controller JWT and [create a l - For NGINX Plus Ingress Controller, view the [Get the F5 Registry NGINX Ingress Controller image]({{< relref "installation/nic-images/get-registry-image.md" >}}) topic for details on how to pull the image from the F5 Docker registry. - The [Get the NGINX Ingress Controller image with JWT]({{< relref "installation/nic-images/get-image-using-jwt.md" >}}) topic describes how to use your subscription JWT token to get the image. - The [Build NGINX Ingress Controller]({{< relref "installation/build-nginx-ingress-controller.md" >}}) topic explains how to push an image to a private Docker registry. -1. Install the NGINX Ingress Operator following the [instructions](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/docs/installation.md). -1. Create the SecurityContextConstraint as outlined in the ["Getting Started" instructions](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/README.md#getting-started). +1. Install the NGINX Ingress Operator following the [instructions](https://github.com/nginx/nginx-ingress-helm-operator/blob/main/docs/installation.md). +1. Create the SecurityContextConstraint as outlined in the ["Getting Started" instructions](https://github.com/nginx/nginx-ingress-helm-operator/blob/main/README.md#getting-started). -{{< note >}} If you're upgrading your operator installation to a later release, navigate [here](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/helm-charts/nginx-ingress) and run `kubectl apply -f crds/` or `oc apply -f crds/` as a prerequisite {{< /note >}} +{{< note >}} If you're upgrading your operator installation to a later release, navigate [here](https://github.com/nginx/nginx-ingress-helm-operator/blob/main/helm-charts/nginx-ingress) and run `kubectl apply -f crds/` or `oc apply -f crds/` as a prerequisite {{< /note >}} ## Create the NGINX Ingress Controller manifest @@ -60,7 +60,7 @@ kubectl apply -f nginx-ingress-controller.yaml A new instance of NGINX Ingress Controller will be deployed by the NGINX Ingress Operator in the `default` namespace with default parameters. -To configure other parameters of the NginxIngressController resource, check the [documentation](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/docs/nginx-ingress-controller.md). +To configure other parameters of the NginxIngressController resource, check the [documentation](https://github.com/nginx/nginx-ingress-helm-operator/blob/main/docs/nginx-ingress-controller.md). ## Troubleshooting diff --git a/site/content/installation/installing-nic/upgrade-to-v4.md b/site/content/installation/installing-nic/upgrade-to-v4.md index d14c7bac19..dbcb7a6b94 100644 --- a/site/content/installation/installing-nic/upgrade-to-v4.md +++ b/site/content/installation/installing-nic/upgrade-to-v4.md @@ -61,8 +61,8 @@ spec: If a *GlobalConfiguration*, *Policy* or *TransportServer* resource is deployed with `apiVersion: k8s.nginx.org/v1alpha1`, it will be **deleted** during the upgrade process. {{}} -Once above specified custom resources are moved to `v1` ,please run below `kubectl` commands before upgrading to v4.0.0 Custom Resource Definitions (CRDs) to avoid [this issue](https://github.com/nginxinc/kubernetes-ingress/issues/7010). - +Once above specified custom resources are moved to `v1` ,please run below `kubectl` commands before upgrading to v4.0.0 Custom Resource Definitions (CRDs) to avoid [this issue](https://github.com/nginx/kubernetes-ingress/issues/7010). + ```shell kubectl patch customresourcedefinitions transportservers.k8s.nginx.org --subresource='status' --type='merge' -p '{"status":{"storedVersions": ["v1"]}}' ``` @@ -94,12 +94,12 @@ To configure structured logging, you must update your log deployment arguments f The Helm value of `controller.logLevel` has been changed from an integer to a string. -To change the rendering of the log format, use the `controller.logFormat` key. +To change the rendering of the log format, use the `controller.logFormat` key. ```yaml controller: logLevel: info - logFormat: json + logFormat: json ``` {{% /tab %}} diff --git a/site/content/installation/integrations/app-protect-dos/configuration.md b/site/content/installation/integrations/app-protect-dos/configuration.md index be396fa5d8..30081b0db9 100644 --- a/site/content/installation/integrations/app-protect-dos/configuration.md +++ b/site/content/installation/integrations/app-protect-dos/configuration.md @@ -9,7 +9,7 @@ weight: 200 {{< tip >}} -Check out the complete [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/app-protect-dos) and the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-dos). +Check out the complete [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/app-protect-dos) and the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-dos). {{< /tip >}} diff --git a/site/content/installation/integrations/app-protect-dos/installation.md b/site/content/installation/integrations/app-protect-dos/installation.md index 1a5bd14247..01d6f7f4e3 100644 --- a/site/content/installation/integrations/app-protect-dos/installation.md +++ b/site/content/installation/integrations/app-protect-dos/installation.md @@ -30,14 +30,14 @@ Get your system ready for building and pushing the NGINX Ingress Controller imag 2. Clone the NGINX Ingress Controller GitHub repository. Replace `` with the version of NGINX Ingress Controller you want. ```shell - git clone https://github.com/nginxinc/kubernetes-ingress.git --branch + git clone https://github.com/nginx/kubernetes-ingress.git --branch cd kubernetes-ingress ``` For instance if you want to clone version v{{< nic-version >}}, the commands to run would be: ```shell - git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v{{< nic-version >}} + git clone https://github.com/nginx/kubernetes-ingress.git --branch v{{< nic-version >}} cd kubernetes-ingress/deployments ``` @@ -135,7 +135,7 @@ This single YAML file creates CRDs for the following resources: - `DosProtectedResource` ```shell -kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/deploy/crds-nap-dos.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/deploy/crds-nap-dos.yaml ``` {{%/tab%}} @@ -180,7 +180,7 @@ kubectl apply -f config/crd/bases/appprotectdos.f5.com_dosprotectedresources.yam ### Helm Chart -The App Protect DoS Arbitrator can be installed using the [NGINX App Protect DoS Helm Chart](https://github.com/nginxinc/nap-dos-arbitrator-helm-chart). +The App Protect DoS Arbitrator can be installed using the [NGINX App Protect DoS Helm Chart](https://github.com/nginx/nap-dos-arbitrator-helm-chart). If you have the NGINX Helm Repository already added, you can install the App Protect DoS Arbitrator by running the following command: ```shell @@ -218,7 +218,7 @@ To enable the NGINX App Protect DoS Module: {{< include "installation/manifests/verify-pods-are-running.md" >}} -For more information, see the [Configuration guide]({{< relref "installation/integrations/app-protect-dos/configuration.md" >}}),the [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/app-protect-dos) and the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-dos). +For more information, see the [Configuration guide]({{< relref "installation/integrations/app-protect-dos/configuration.md" >}}),the [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/app-protect-dos) and the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/app-protect-dos). --- diff --git a/site/content/installation/integrations/app-protect-waf-v5/configuration.md b/site/content/installation/integrations/app-protect-waf-v5/configuration.md index d9d3123318..79cb698856 100644 --- a/site/content/installation/integrations/app-protect-waf-v5/configuration.md +++ b/site/content/installation/integrations/app-protect-waf-v5/configuration.md @@ -9,7 +9,7 @@ weight: 200 This document explains how to use F5 NGINX Ingress Controller to configure [NGINX App Protect WAF v5](https://docs.nginx.com/nginx-app-protect-waf/v5/). -{{< note >}} There are complete NGINX Ingress Controller with NGINX App Protect WAF [example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5). +{{< note >}} There are complete NGINX Ingress Controller with NGINX App Protect WAF [example resources on GitHub](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5). F5 recommends recompiling your NGINX AppProtect WAF Policy Bundles with each release of NGINX Ingress Controller. This ensures Policies remain compatible and are compiled with the latest attack signatures, bot signatures, and Ttreat campaigns.{{< /note >}} @@ -64,7 +64,7 @@ spec: This example shows how to deploy NGINX Ingress Controller with NGINX Plus and NGINX App Protect WAF v5, deploy a simple web application, and then configure load balancing and WAF protection for that application using the VirtualServer resource. -{{< note >}} You can find the files for this example on [GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5).{{< /note >}} +{{< note >}} You can find the files for this example on [GitHub](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5).{{< /note >}} ### Prerequisites @@ -87,7 +87,7 @@ This example shows how to deploy NGINX Ingress Controller with NGINX Plus and NG Create the application deployment and service: ```shell - kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5/webapp.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5/webapp.yaml ``` ### Create the Syslog service @@ -96,7 +96,7 @@ Create the syslog service and pod for the NGINX App Protect WAF security logs: ```shell - kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5/syslog.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5/syslog.yaml ``` ### Deploy the WAF Policy @@ -107,10 +107,10 @@ Create the syslog service and pod for the NGINX App Protect WAF security logs: Create and deploy the WAF policy. ```shell - kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5/waf.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5/waf.yaml ``` - + ### Configure load balancing {{< note >}} VirtualServer references the `waf-policy` created in Step 3.{{}} @@ -118,7 +118,7 @@ Create and deploy the WAF policy. 1. Create the VirtualServer Resource: ```shell - kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5/virtual-server.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/kubernetes-ingress/v{{< nic-version >}}/examples/custom-resources/app-protect-waf-v5/virtual-server.yaml ``` @@ -142,8 +142,8 @@ To access the application, curl the coffee and the tea services. Use the `--reso ```shell curl --resolve webapp.example.com:$IC_HTTP_PORT:$IC_IP "http://webapp.example.com:$IC_HTTP_PORT/