Update directory structure (#3401)

Problem: Now that the original provisioner mode has been removed, we don't need the nested `mode/static` directory structure. The naming no longer makes sense.

Solution: Updated `mode/static` directory to `controller`, and moved some of the `framework` packages into `controller`. Other packages in `framework` were left alone since many of them are general enough for "controller building" use.

Author: sjberman

.github/workflows/build.yml

@@ -149,8 +149,8 @@ jobs:
           sbom: true
           provenance: mode=max
           build-args: |
-            NJS_DIR=internal/mode/static/nginx/modules/src
-            NGINX_CONF_DIR=internal/mode/static/nginx/conf
+            NJS_DIR=internal/controller/nginx/modules/src
+            NGINX_CONF_DIR=internal/controller/nginx/conf
             BUILD_AGENT=gha
           secrets: |
             ${{ contains(inputs.image, 'plus') && format('"nginx-repo.crt={0}"', secrets.NGINX_CRT) || '' }}

.github/workflows/ci.yml

@@ -119,7 +119,7 @@ jobs:
           node-version-file: .nvmrc
 
       - name: Run tests
-        run: npm --prefix ${{ github.workspace }}/internal/mode/static/nginx/modules install-ci-test
+        run: npm --prefix ${{ github.workspace }}/internal/controller/nginx/modules install-ci-test
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3

.github/workflows/conformance.yml

@@ -106,8 +106,8 @@ jobs:
           cache-from: type=gha,scope=${{ inputs.image }}
           pull: true
           build-args: |
-            NJS_DIR=internal/mode/static/nginx/modules/src
-            NGINX_CONF_DIR=internal/mode/static/nginx/conf
+            NJS_DIR=internal/controller/nginx/modules/src
+            NGINX_CONF_DIR=internal/controller/nginx/conf
             BUILD_AGENT=gha
 
       - name: Update Go Modules

.github/workflows/functional.yml

@@ -100,8 +100,8 @@ jobs:
           cache-from: type=gha,scope=${{ inputs.image }}
           pull: true
           build-args: |
-            NJS_DIR=internal/mode/static/nginx/modules/src
-            NGINX_CONF_DIR=internal/mode/static/nginx/conf
+            NJS_DIR=internal/controller/nginx/modules/src
+            NGINX_CONF_DIR=internal/controller/nginx/conf
             BUILD_AGENT=gha
 
       - name: Setup license file for plus

.github/workflows/helm.yml

@@ -80,8 +80,8 @@ jobs:
           cache-from: type=gha,scope=${{ inputs.image }}
           pull: true
           build-args: |
-            NJS_DIR=internal/mode/static/nginx/modules/src
-            NGINX_CONF_DIR=internal/mode/static/nginx/conf
+            NJS_DIR=internal/controller/nginx/modules/src
+            NGINX_CONF_DIR=internal/controller/nginx/conf
             BUILD_AGENT=gha
 
       - name: Install cloud-provider-kind

.github/workflows/lint.yml

@@ -58,8 +58,8 @@ jobs:
         id: prettier-run
         uses: rutajdash/prettier-cli-action@d42c4325a3b344f3bd4be482bc34de521998d557 # v1.0.2
         with:
-          config_path: ${{ github.workspace }}/internal/mode/static/nginx/modules/.prettierrc
-          file_pattern: ${{ github.workspace }}/internal/mode/static/nginx/modules/**/*.js
+          config_path: ${{ github.workspace }}/internal/controller/nginx/modules/.prettierrc
+          file_pattern: ${{ github.workspace }}/internal/controller/nginx/modules/**/*.js
           prettier_version: 3.3.3 # renovate: datasource=npm depName=prettier
 
       - name: Prettier Output

.gitignore

@@ -37,7 +37,7 @@ tests/**/*.csv
 node_modules/
 
 # JS test coverage
-internal/mode/static/nginx/modules/coverage
+internal/controller/nginx/modules/coverage
 
 # MacOS Finder
 .DS_Store

.gitleaksignore

@@ -3,4 +3,4 @@
 68d1f6eb80d23c8650c11629459dd6a06c986ca1:internal/state/graph/graph_test.go:private-key:44
 890fddb787ff3560b9b743647a36b649d498ae51:internal/state/graph/secret_test.go:private-key:35
 890fddb787ff3560b9b743647a36b649d498ae51:internal/state/change_processor_test.go:private-key:211
-internal/mode/static/state/graph/config_maps_test.go:private-key:35
+internal/controller/state/graph/config_maps_test.go:private-key:35

Makefile

@@ -2,8 +2,8 @@
 VERSION = edge
 SELF_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 CHART_DIR = $(SELF_DIR)charts/nginx-gateway-fabric
-NGINX_CONF_DIR = internal/mode/static/nginx/conf
-NJS_DIR = internal/mode/static/nginx/modules/src
+NGINX_CONF_DIR = internal/controller/nginx/conf
+NJS_DIR = internal/controller/nginx/modules/src
 KIND_CONFIG_FILE = $(SELF_DIR)config/cluster/kind-cluster.yaml
 NGINX_DOCKER_BUILD_PLUS_ARGS = --secret id=nginx-repo.crt,src=$(SELF_DIR)nginx-repo.crt --secret id=nginx-repo.key,src=$(SELF_DIR)nginx-repo.key
 BUILD_AGENT = local
@@ -202,7 +202,7 @@ unit-test: ## Run unit tests for the go code
 .PHONY: njs-unit-test
 njs-unit-test: ## Run unit tests for the njs httpmatches module
 	docker run --rm -w /modules \
-		-v $(CURDIR)/internal/mode/static/nginx/modules:/modules/ \
+		-v $(CURDIR)/internal/controller/nginx/modules:/modules/ \
 		node:${NODE_VERSION} \
 		/bin/bash -c "npm ci && npm test && npm run clean"
 

cmd/gateway/commands.go

@@ -20,11 +20,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	ctlrZap "sigs.k8s.io/controller-runtime/pkg/log/zap"
 
+	"github.com/nginx/nginx-gateway-fabric/internal/controller"
+	"github.com/nginx/nginx-gateway-fabric/internal/controller/config"
+	"github.com/nginx/nginx-gateway-fabric/internal/controller/licensing"
+	ngxConfig "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config"
 	"github.com/nginx/nginx-gateway-fabric/internal/framework/file"
-	"github.com/nginx/nginx-gateway-fabric/internal/mode/static"
-	"github.com/nginx/nginx-gateway-fabric/internal/mode/static/config"
-	"github.com/nginx/nginx-gateway-fabric/internal/mode/static/licensing"
-	ngxConfig "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config"
 )
 
 // These flags are shared by multiple commands.
@@ -259,7 +259,7 @@ func createControllerCommand() *cobra.Command {
 				NGINXSCCName:           nginxSCCName.value,
 			}
 
-			if err := static.StartManager(conf); err != nil {
+			if err := controller.StartManager(conf); err != nil {
 				return fmt.Errorf("failed to start control loop: %w", err)
 			}