8000 Refactor Helm Chart location (#4306) · nginx/kubernetes-ingress@9dcd4cc · GitHub
[go: up one dir, main page]
Skip to content

Commit 9dcd4cc

Browse files
lucacomelucacome
authored
Refactor Helm Chart location (#4306)
1 parent f255b03 commit 9dcd4cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+24
-4280
lines changed

‎.github/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ dependencies:
2626
- changed-files: ['go.mod', 'go.sum']
2727

2828
helm_chart:
29-
- changed-files: ['deployments/helm-chart/**/*']
29+
- changed-files: ['charts/nginx-ingress/**/*']

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
id: vars
4747
run: |
4848
echo "k8s_latest=$(grep -m1 'FROM kindest/node' <tests/Dockerfile | awk -F'[:v]' '{print $3}')" >> $GITHUB_OUTPUT
49-
echo "chart_version=$(yq '.version' <deployments/helm-chart/Chart.yaml)" >> $GITHUB_OUTPUT
49+
echo "chart_version=$(yq '.version' <charts/nginx-ingress/Chart.yaml)" >> $GITHUB_OUTPUT
5050
echo "go_path=$(go env GOPATH)" >> $GITHUB_OUTPUT
5151
5252
- name: Check if go.mod and go.sum are up to date
5353
run: go mod tidy && git diff --exit-code -- go.mod go.sum
5454

5555
- name: Check if CRDs changed
56-
run: make update-crds && git diff --name-only --exit-code deployments/common/crds* deployments/helm-chart/crds*
56+
run: make update-crds && git diff --name-only --exit-code deployments/common/crds*
5757

5858
- name: Check if Codegen changed
5959
run: |
@@ -127,7 +127,7 @@ jobs:
127127
## Resources
128128
- Documentation -- https://docs.nginx.com/nginx-ingress-controller/
129129
- Configuration examples -- https://github.com/nginxinc/kubernetes-ingress/tree/{{version}}/examples
130-
- Helm Chart -- https://github.com/nginxinc/kubernetes-ingress/tree/{{version}}/deployments/helm-chart
130+
- Helm Chart -- https://github.com/nginxinc/kubernetes-ingress/tree/{{version}}/charts/nginx-ingress
131131
- Operator -- https://github.com/nginxinc/nginx-ingress-helm-operator
132132
if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }}
133133

@@ -215,7 +215,7 @@ jobs:
215215
--set controller.service.type=NodePort
216216
--set controller.nginxplus=${{ contains(matrix.type, 'plus') && 'true' || 'false' }}
217217
--wait
218-
working-directory: ${{ github.workspace }}/deployments/helm-chart
218+
working-directory: ${{ github.workspace }}/charts/nginx-ingress
219219

220220
- name: Expose Test Ingresses
221221
run: |
@@ -419,7 +419,7 @@ jobs:
419419
- name: Package
420420
id: package
421421
run: |
422-
output=$(helm package ${{ github.ref_type != 'tag' && '--app-version edge --version 0.0.0-edge' || '' }} kic/deployments/helm-chart)
422+
output=$(helm package ${{ github.ref_type != 'tag' && '--app-version edge --version 0.0.0-edge' || '' }} kic/charts/nginx-ingress)
423423
echo "path=$(basename -- $(echo $output | cut -d: -f2))" >> $GITHUB_OUTPUT
424424
425425
- name: Push to OCI registries

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
5757

5858
- name: Lint chart
59-
run: helm lint deployments/helm-chart
59+
run: helm lint charts/nginx-ingress
6060

6161
markdown-lint:
6262
name: Markdown Lint

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repos:
99
- id: end-of-file-fixer
1010
- id: check-yaml
1111
args: [--allow-multiple-documents]
12-
exclude: ^(deployments/helm-chart.*/templates|deployments/helm-chart/crds)
12+
29CA exclude: ^(charts/nginx-ingress/templates)
1313
- id: check-ast
1414
- id: check-added-large-files
1515
- id: check-merge-conflict
@@ -67,9 +67,9 @@ repos:
6767
hooks:
6868
- id: check-jsonschema
6969
name: "Check Helm Chart JSON Schema"
70-
files: deployments/helm-chart/values.yaml
70+
files: charts/nginx-ingress/values.yaml
7171
types: [yaml]
72-
args: ['--schemafile', 'deployments/helm-chart/values.schema.json']
72+
args: ['--schemafile', 'charts/nginx-ingress/values.schema.json']
7373

7474
- repo: https://github.com/DavidAnson/markdownlint-cli2
7575
rev: v0.10.0

‎Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ update-codegen: ## Generate code
6464
.PHONY: update-crds
6565
update-crds: ## Update CRDs
6666
go run sigs.k8s.io/controller-tools/cmd/controller-gen crd:crdVersions=v1 schemapatch:manifests=./deployments/common/crds/ paths=./pkg/apis/... output:dir=./deployments/common/crds
67-
@cp -Rp deployments/common/crds/* deployments/helm-chart/crds/
6867

6968
.PHONY: certificate-and-key
7069
certificate-and-key: ## Create default cert and key

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ your links to the correct versions:
119119
| Version | Description | Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples |
120120
| ------- | ----------- | --------------- | -------------------- | ---------------------------------------| -------------------------- |
121121
| Latest stable release | For production use | Use the 3.3.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/building-ingress-controller-image/). | Use the 3.3.0 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v3.3.0/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v3.3.0/deployments/helm-chart). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
122-
| 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://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content/installation/building-ingress-controller-image.md). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content/installation/building-ingress-controller-image.md). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/main/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/main/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples). |
122+
| 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://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content/installation/building-ingress-controller-image.md). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content/installation/building-ingress-controller-image.md). | [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/docs/content). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples). |
123123

124124
## SBOM (Software Bill of Materials)
125125

‎deployments/helm-chart/.helmignore‎ renamed to ‎charts/nginx-ingress/.helmignore‎

File renamed without changes.

‎deployments/helm-chart/Chart.yaml‎ renamed to ‎charts/nginx-ingress/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ appVersion: 3.3.0
55
kubeVersion: ">= 1.22.0-0"
66
type: application
77
description: NGINX Ingress Controller
8-
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.3.0/deployments/helm-chart/chart-icon.png
8+
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.3.0/charts/nginx-ingress/chart-icon.png
99
home: https://github.com/nginxinc/kubernetes-ingress
1010
sources:
11-
- https://github.com/nginxinc/kubernetes-ingress/tree/v3.3.0/deployments/helm-chart
11+
- https://github.com/nginxinc/kubernetes-ingress/tree/v3.3.0/charts/nginx-ingress
1212
keywords:
1313
- ingress
1414
- nginx

‎deployments/helm-chart/README.md‎ renamed to ‎charts/nginx-ingress/README.md‎

File renamed without changes.

‎deployments/helm-chart/chart-icon.png‎ renamed to ‎charts/nginx-ingress/chart-icon.png‎

File renamed without changes.

0 commit comments

Comments
 (0)
0