diff --git a/.editorconfig b/.editorconfig index 1ed453a..302cfc4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,10 +1,13 @@ root = true [*] +charset = utf-8 end_of_line = lf insert_final_newline = true +trim_trailing_whitespace = true +indent_size = 4 +indent_style = tab -[*.{js,json,yml}] -charset = utf-8 -indent_style = space +[*.{md,yml,yaml}] indent_size = 2 +indent_style = space diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml index 6281c4c..9255ee1 100644 --- a/.github/workflows/check-dist.yml +++ b/.github/workflows/check-dist.yml @@ -12,7 +12,7 @@ on: pull_request: branches: - main - workflow_dispatch: + workflow_dispatch: # yamllint disable-line rule:empty-values jobs: check-dist: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f22d8a3..d591ec2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -56,16 +56,5 @@ jobs: - name: Autobuild uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0 - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 93ee2b0..d1be1af 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -29,4 +29,4 @@ 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" diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index fb45b29..243e8e5 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -17,7 +17,7 @@ jobs: sparse-checkout: | labeler.yml sparse-checkout-cone-mode: false - repository: nginxinc/k8s-common + repository: nginx/k8s-common - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3c6572a..06627c6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,7 +9,7 @@ on: pull_request: paths-ignore: - '**.md' - workflow_dispatch: + workflow_dispatch: # yamllint disable-line rule:empty-values jobs: check-dist: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8030492..d22d911 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,8 @@ name: 'build-test' on: # rebuild any PRs and main branch changes pull_request: + branches: + - main push: branches: - main @@ -38,11 +40,11 @@ jobs: # version: 'v3.1.1' # product-id: ${{ secrets.AWS_MARKETPLACE_PRODUCT_ID }} # registry: '709825985650.dkr.ecr.us-east-1.amazonaws.com/nginx/nginx-plus-ingress:3.1.1-mktpl' -# release-notes: 'https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.1.1' +# release-notes: 'https://github.com/nginx/kubernetes-ingress/releases/tag/v3.1.1' # 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/master/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/master/deployments # Use this image instead of building your own. diff --git a/README.md b/README.md index 8e19c76..d133161 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![OpenSSFScorecard](https://api.securityscorecards.dev/projects/github.com/nginxinc/aws-marketplace-publish/badge)](https://scorecard.dev/viewer/?uri=github.com/nginxinc/aws-marketplace-publish) +[![OpenSSFScorecard](https://api.securityscorecards.dev/projects/github.com/nginx/aws-marketplace-publish/badge)](https://scorecard.dev/viewer/?uri=github.com/nginx/aws-marketplace-publish) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) # Publish Docker images to AWS Marketplace @@ -32,7 +32,7 @@ jobs: aws-region: us-east-1 - name: Publish to AWS Marketplace - uses: nginxinc/aws-marketplace-publish@v1.0.6 + uses: nginx/aws-marketplace-publish@v1.0.8 with: product-id: ${{ secrets.AWS_MARKETPLACE_PRODUCT_ID }} version: ${{ replace(github.ref, 'refs/tags/', '') }} diff --git a/package.json b/package.json index e2df9b0..32c74b1 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/nginxinc/aws-marketplace-publish.git" + "url": "git+https://github.com/nginx/aws-marketplace-publish.git" }, "keywords": [ "actions", diff --git a/renovate.json b/renovate.json index abd344b..6796d8d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>nginxinc/k8s-common", + "github>nginx/k8s-common", "schedule:monthly" ], "rangeStrategy": "bump"