Refactor Helm Chart location

nginxinc · Sep 26, 2023 · a2b1013 · a2b1013
1 parent f255b03
commit a2b1013
Show file tree

Hide file tree

Showing 47 changed files with 24 additions and 4,280 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -26,4 +26,4 @@ dependencies:
   - changed-files: ['go.mod', 'go.sum']
 
 helm_chart:
-  - changed-files: ['deployments/helm-chart/**/*']
+  - changed-files: ['charts/nginx-ingress/**/*']
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,14 +46,14 @@ jobs:
         id: vars
         run: |
           echo "k8s_latest=$(grep -m1 'FROM kindest/node' <tests/Dockerfile | awk -F'[:v]' '{print $3}')" >> $GITHUB_OUTPUT
-          echo "chart_version=$(yq '.version' <deployments/helm-chart/Chart.yaml)" >> $GITHUB_OUTPUT
+          echo "chart_version=$(yq '.version' <charts/nginx-ingress/Chart.yaml)" >> $GITHUB_OUTPUT
           echo "go_path=$(go env GOPATH)" >> $GITHUB_OUTPUT
 
       - name: Check if go.mod and go.sum are up to date
         run: go mod tidy && git diff --exit-code -- go.mod go.sum
 
       - name: Check if CRDs changed
-        run: make update-crds && git diff --name-only --exit-code deployments/common/crds* deployments/helm-chart/crds*
+        run: make update-crds && git diff --name-only --exit-code deployments/common/crds*
 
       - name: Check if Codegen changed
         run: |
@@ -127,7 +127,7 @@ jobs:
             ## 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
+            - Helm Chart -- https://github.com/nginxinc/kubernetes-ingress/tree/{{version}}/charts/nginx-ingress
             - Operator -- https://github.com/nginxinc/nginx-ingress-helm-operator
         if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }}
 
@@ -215,7 +215,7 @@ jobs:
           --set controller.service.type=NodePort
           --set controller.nginxplus=${{ contains(matrix.type, 'plus') && 'true' || 'false' }}
           --wait
-        working-directory: ${{ github.workspace }}/deployments/helm-chart
+        working-directory: ${{ github.workspace }}/charts/nginx-ingress
 
       - name: Expose Test Ingresses
         run: |
@@ -419,7 +419,7 @@ jobs:
       - name: Package
         id: package
         run: |
-          output=$(helm package ${{ github.ref_type != 'tag' && '--app-version edge --version 0.0.0-edge' || '' }} kic/deployments/helm-chart)
+          output=$(helm package ${{ github.ref_type != 'tag' && '--app-version edge --version 0.0.0-edge' || '' }} kic/charts/nginx-ingress)
           echo "path=$(basename -- $(echo $output | cut -d: -f2))" >> $GITHUB_OUTPUT
 
       - name: Push to OCI registries

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -56,7 +56,7 @@ jobs:
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       - name: Lint chart
-        run: helm lint deployments/helm-chart
+        run: helm lint charts/nginx-ingress
 
   markdown-lint:
     name: Markdown Lint

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: end-of-file-fixer
       - id: check-yaml
         args: [--allow-multiple-documents]
-        exclude: ^(deployments/helm-chart.*/templates|deployments/helm-chart/crds)
+        exclude: ^(charts/nginx-ingress/templates)
       - id: check-ast
       - id: check-added-large-files
       - id: check-merge-conflict
@@ -67,9 +67,9 @@ repos:
     hooks:
       - id: check-jsonschema
         name: "Check Helm Chart JSON Schema"
-        files: deployments/helm-chart/values.yaml
+        files: charts/nginx-ingress/values.yaml
         types: [yaml]
-        args: ['--schemafile', 'deployments/helm-chart/values.schema.json']
+        args: ['--schemafile', 'charts/nginx-ingress/values.schema.json']
 
   - repo: https://github.com/DavidAnson/markdownlint-cli2
     rev: v0.10.0

diff --git a/Makefile b/Makefile
@@ -64,7 +64,6 @@ update-codegen: ## Generate code
 .PHONY: update-crds
 update-crds: ## Update CRDs
 	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
-	@cp -Rp deployments/common/crds/* deployments/helm-chart/crds/
 
 .PHONY: certificate-and-key
 certificate-and-key: ## Create default cert and key

diff --git a/README.md b/README.md
@@ -119,7 +119,7 @@ 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 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/). |
-| 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). |
+| 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). |
 
 ## SBOM (Software Bill of Materials)
 

diff --git a/deployments/helm-chart/.helmignore → charts/nginx-ingress/.helmignore b/deployments/helm-chart/.helmignore → charts/nginx-ingress/.helmignore
diff --git a/deployments/helm-chart/Chart.yaml → charts/nginx-ingress/Chart.yaml b/deployments/helm-chart/Chart.yaml → charts/nginx-ingress/Chart.yaml
@@ -5,10 +5,10 @@ appVersion: 3.3.0
 kubeVersion: ">= 1.22.0-0"
 type: application
 description: NGINX Ingress Controller
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.3.0/deployments/helm-chart/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.3.0/charts/nginx-ingress/chart-icon.png
 home: https://github.com/nginxinc/kubernetes-ingress
 sources:
-  - https://github.com/nginxinc/kubernetes-ingress/tree/v3.3.0/deployments/helm-chart
+  - https://github.com/nginxinc/kubernetes-ingress/tree/v3.3.0/charts/nginx-ingress
 keywords:
   - ingress
   - nginx

diff --git a/deployments/helm-chart/README.md → charts/nginx-ingress/README.md b/deployments/helm-chart/README.md → charts/nginx-ingress/README.md
diff --git a/deployments/helm-chart/chart-icon.png → charts/nginx-ingress/chart-icon.png b/deployments/helm-chart/chart-icon.png → charts/nginx-ingress/chart-icon.png
diff --git a/charts/nginx-ingress/crds b/charts/nginx-ingress/crds
@@ -0,0 +1 @@
+../../deployments/common/crds/
diff --git a/deployments/helm-chart/templates/NOTES.txt → charts/nginx-ingress/templates/NOTES.txt b/deployments/helm-chart/templates/NOTES.txt → charts/nginx-ingress/templates/NOTES.txt
diff --git a/...oyments/helm-chart/templates/_helpers.tpl → charts/nginx-ingress/templates/_helpers.tpl b/...oyments/helm-chart/templates/_helpers.tpl → charts/nginx-ingress/templates/_helpers.tpl
diff --git a/...chart/templates/controller-configmap.yaml → ...gress/templates/controller-configmap.yaml b/...chart/templates/controller-configmap.yaml → ...gress/templates/controller-configmap.yaml
diff --git a/...chart/templates/controller-daemonset.yaml → ...gress/templates/controller-daemonset.yaml b/...chart/templates/controller-daemonset.yaml → ...gress/templates/controller-daemonset.yaml
diff --git a/...hart/templates/controller-deployment.yaml → ...ress/templates/controller-deployment.yaml b/...hart/templates/controller-deployment.yaml → ...ress/templates/controller-deployment.yaml
diff --git a/...lates/controller-globalconfiguration.yaml → ...lates/controller-globalconfiguration.yaml b/...lates/controller-globalconfiguration.yaml → ...lates/controller-globalconfiguration.yaml
diff --git a/.../helm-chart/templates/controller-hpa.yaml → ...inx-ingress/templates/controller-hpa.yaml b/.../helm-chart/templates/controller-hpa.yaml → ...inx-ingress/templates/controller-hpa.yaml
diff --git a/...t/templates/controller-ingress-class.yaml → ...s/templates/controller-ingress-class.yaml b/...t/templates/controller-ingress-class.yaml → ...s/templates/controller-ingress-class.yaml
diff --git a/...controller-leader-election-configmap.yaml → ...controller-leader-election-configmap.yaml b/...controller-leader-election-configmap.yaml → ...controller-leader-election-configmap.yaml
diff --git a/.../helm-chart/templates/controller-pdb.yaml → ...inx-ingress/templates/controller-pdb.yaml b/.../helm-chart/templates/controller-pdb.yaml → ...inx-ingress/templates/controller-pdb.yaml
diff --git a/...plates/controller-prometheus-service.yaml → ...plates/controller-prometheus-service.yaml b/...plates/controller-prometheus-service.yaml → ...plates/controller-prometheus-service.yaml
diff --git a/...lm-chart/templates/controller-secret.yaml → ...-ingress/templates/controller-secret.yaml b/...lm-chart/templates/controller-secret.yaml → ...-ingress/templates/controller-secret.yaml
diff --git a/...m-chart/templates/controller-service.yaml → ...ingress/templates/controller-service.yaml b/...m-chart/templates/controller-service.yaml → ...ingress/templates/controller-service.yaml
diff --git a/.../templates/controller-serviceaccount.yaml → .../templates/controller-serviceaccount.yaml b/.../templates/controller-serviceaccount.yaml → .../templates/controller-serviceaccount.yaml
diff --git a/.../templates/controller-servicemonitor.yaml → .../templates/controller-servicemonitor.yaml b/.../templates/controller-servicemonitor.yaml → .../templates/controller-servicemonitor.yaml
diff --git a/...templates/controller-wildcard-secret.yaml → ...templates/controller-wildcard-secret.yaml b/...templates/controller-wildcard-secret.yaml → ...templates/controller-wildcard-secret.yaml
diff --git a/deployments/helm-chart/templates/rbac.yaml → charts/nginx-ingress/templates/rbac.yaml b/deployments/helm-chart/templates/rbac.yaml → charts/nginx-ingress/templates/rbac.yaml
diff --git a/deployments/helm-chart/values-icp.yaml → charts/nginx-ingress/values-icp.yaml b/deployments/helm-chart/values-icp.yaml → charts/nginx-ingress/values-icp.yaml
diff --git a/deployments/helm-chart/values-nsm.yaml → charts/nginx-ingress/values-nsm.yaml b/deployments/helm-chart/values-nsm.yaml → charts/nginx-ingress/values-nsm.yaml
diff --git a/deployments/helm-chart/values-plus.yaml → charts/nginx-ingress/values-plus.yaml b/deployments/helm-chart/values-plus.yaml → charts/nginx-ingress/values-plus.yaml
diff --git a/deployments/helm-chart/values.schema.json → charts/nginx-ingress/values.schema.json b/deployments/helm-chart/values.schema.json → charts/nginx-ingress/values.schema.json
diff --git a/deployments/helm-chart/values.yaml → charts/nginx-ingress/values.yaml b/deployments/helm-chart/values.yaml → charts/nginx-ingress/values.yaml
diff --git a/deployments/helm-chart/crds/appprotect.f5.com_aplogconfs.yaml b/deployments/helm-chart/crds/appprotect.f5.com_aplogconfs.yaml