Move the helm chart to charts (nginx#1862)

Problem: The helm chart is not in a known path and it's hard to find.

Solution: Move the helm chart to the standard charts directory

Author: miledxz

.github/labeler.yml

@@ -29,4 +29,4 @@ tests:
 helm-chart:
   - head-branch: ['^helm/', '^helm-chart/']
   - changed-files:
-      - any-glob-to-any-file: ['deploy/helm-chart/**/*']
+      - any-glob-to-any-file: ['charts/**/*']

.github/workflows/ci.yml

@@ -299,7 +299,7 @@ jobs:
       - name: Deploy Kubernetes
         id: k8s
         run: |
-          kube_config=${{ github.workspace }}/deploy/helm-chart/kube-${{ github.run_id }}-helm
+          kube_config=${{ github.workspace }}/kube-${{ github.run_id }}-helm
           make create-kind-cluster KIND_KUBE_CONFIG=${kube_config}
           echo "KUBECONFIG=${kube_config}" >> "$GITHUB_ENV"
           kind load docker-image ghcr.io/nginxinc/nginx-gateway-fabric:${{ steps.ngf-meta.outputs.version }} ghcr.io/nginxinc/nginx-gateway-fabric/nginx:${{ steps.nginx-meta.outputs.version }}
@@ -321,7 +321,7 @@ jobs:
           --set nginx.image.pullPolicy=Never
           --set service.type=NodePort
           -n nginx-gateway
-        working-directory: ${{ github.workspace }}/deploy/helm-chart
+        working-directory: ${{ github.workspace }}/charts/nginx-gateway-fabric
 
   publish-helm:
     name: Package and Publish Helm Chart
@@ -345,7 +345,7 @@ jobs:
       - name: Package
         id: package
         run: |
-          output=$(helm package ${{ github.ref_type != 'tag' && '--app-version edge --version 0.0.0-edge' || '' }} deploy/helm-chart)
+          output=$(helm package ${{ github.ref_type != 'tag' && '--app-version edge --version 0.0.0-edge' || '' }} charts/nginx-gateway-fabric)
           echo "path=$(basename -- $(echo $output | cut -d: -f2))" >> $GITHUB_OUTPUT
 
       - name: Push to GitHub Container Registry

.github/workflows/release-pr.yml

@@ -35,7 +35,7 @@ jobs:
         id: vars
         run: |
           # TODO(lucacome): improve this and maybe use appVersion instead of version if we switch to tags
-          echo "current_version=$(yq '.version' <deploy/helm-chart/Chart.yaml)" >> $GITHUB_OUTPUT
+          echo "current_version=$(yq '.version' <charts/nginx-gateway-fabric/Chart.yaml)" >> $GITHUB_OUTPUT
 
       - name: Find and Replace
         uses: jacobtomlinson/gha-find-replace@a51bbcd94d000df9ca0fcb54ec8be69aad8374b0 # v3.0.2
@@ -50,23 +50,23 @@ jobs:
         with:
           find: "edge"
           replace: ${{ inputs.version }}
-          include: "deploy/helm-chart/*.yaml"
+          include: "charts/nginx-gateway-fabric/*.yaml"
           regex: false
 
       - name: Find and Replace
         uses: jacobtomlinson/gha-find-replace@a51bbcd94d000df9ca0fcb54ec8be69aad8374b0 # v3.0.2
         with:
           find: ${{ steps.vars.outputs.current_version }}
           replace: ${{ inputs.version }}
-          include: "deploy/helm-chart/*.yaml"
+          include: "charts/nginx-gateway-fabric/*.yaml"
           regex: false
 
       - name: Find and Replace
         uses: jacobtomlinson/gha-find-replace@a51bbcd94d000df9ca0fcb54ec8be69aad8374b0 # v3.0.2
         with:
           find: "Always"
           replace: "IfNotPresent"
-          include: "deploy/helm-chart/*.yaml"
+          include: "charts/nginx-gateway-fabric/*.yaml"
           regex: false
 
       - name: Generate manifests and changelog

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: end-of-file-fixer
       - id: check-yaml
         args: [--allow-multiple-documents]
-        exclude: (^deploy/helm-chart/templates)
+        exclude: (^charts/nginx-gateway-fabric/templates)
       - id: check-added-large-files
       - id: check-merge-conflict
       - id: check-case-conflict

.yamllint.yaml

@@ -4,7 +4,7 @@ yaml-files:
   - "*.yml"
 
 ignore:
-  - deploy/helm-chart/templates/
+  - charts/nginx-gateway-fabric
   - config/crd/bases/
   - .github/workflows/
 

Makefile

@@ -3,7 +3,7 @@ VERSION = edge
 GIT_COMMIT = $(shell git rev-parse HEAD || echo "unknown")
 DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 MANIFEST_DIR = $(CURDIR)/deploy/manifests
-CHART_DIR = $(CURDIR)/deploy/helm-chart
+CHART_DIR = $(CURDIR)/charts/nginx-gateway-fabric
 NGINX_CONF_DIR = internal/mode/static/nginx/conf
 NJS_DIR = internal/mode/static/nginx/modules/src
 NGINX_DOCKER_BUILD_PLUS_ARGS = --secret id=nginx-repo.crt,src=nginx-repo.crt --secret id=nginx-repo.key,src=nginx-repo.key
@@ -194,12 +194,12 @@ install-ngf-local-build-with-plus: build-images-with-plus load-images-with-plus
 .PHONY: helm-install-local
 helm-install-local: ## Helm install NGF on configured kind cluster with local images. To build, load, and install with helm run make install-ngf-local-build.
 	./conformance/scripts/install-gateway.sh $(GW_API_VERSION) $(INSTALL_WEBHOOK)
-	helm install dev ./deploy/helm-chart --create-namespace --wait --set service.type=NodePort --set nginxGateway.image.repository=$(PREFIX) --set nginxGateway.image.tag=$(TAG) --set nginxGateway.image.pullPolicy=Never --set nginx.image.repository=$(NGINX_PREFIX) --set nginx.image.tag=$(TAG) --set nginx.image.pullPolicy=Never -n nginx-gateway
+	helm install dev $(CHART_DIR) --create-namespace --wait --set service.type=NodePort --set nginxGateway.image.repository=$(PREFIX) --set nginxGateway.image.tag=$(TAG) --set nginxGateway.image.pullPolicy=Never --set nginx.image.repository=$(NGINX_PREFIX) --set nginx.image.tag=$(TAG) --set nginx.image.pullPolicy=Never -n nginx-gateway
 
 .PHONY: helm-install-local-with-plus
 helm-install-local-with-plus: ## Helm install NGF with NGINX Plus on configured kind cluster with local images. To build, load, and install with helm run make install-ngf-local-build-with-plus.
 	./conformance/scripts/install-gateway.sh $(GW_API_VERSION) $(INSTALL_WEBHOOK)
-	helm install dev ./deploy/helm-chart --create-namespace --wait --set service.type=NodePort --set nginxGateway.image.repository=$(PREFIX) --set nginxGateway.image.tag=$(TAG) --set nginxGateway.image.pullPolicy=Never --set nginx.image.repository=$(NGINX_PLUS_PREFIX) --set nginx.image.tag=$(TAG) --set nginx.image.pullPolicy=Never --set nginx.plus=true -n nginx-gateway
+	helm install dev $(CHART_DIR) --create-namespace --wait --set service.type=NodePort --set nginxGateway.image.repository=$(PREFIX) --set nginxGateway.image.tag=$(TAG) --set nginxGateway.image.pullPolicy=Never --set nginx.image.repository=$(NGINX_PLUS_PREFIX) --set nginx.image.tag=$(TAG) --set nginx.image.pullPolicy=Never --set nginx.plus=true -n nginx-gateway
 
 # Debug Targets
 .PHONY: debug-build

deploy/helm-chart/.helmignore renamed to charts/nginx-gateway-fabric/.helmignore

@@ -5,9 +5,9 @@ type: application
 version: 1.2.0
 appVersion: "edge"
 home: https://github.com/nginxinc/nginx-gateway-fabric
-icon: https://raw.githubusercontent.com/nginxinc/nginx-gateway-fabric/main/deploy/helm-chart/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/nginx-gateway-fabric/main/charts/nginx-gateway-fabric/chart-icon.png
 sources:
-  - https://github.com/nginxinc/nginx-gateway-fabric/tree/main/deploy/helm-chart
+  - https://github.com/nginxinc/nginx-gateway-fabric/tree/main/charts/nginx-gateway-fabric
 keywords:
   - kubernetes
   - gateway