Merge branch 'main' into agent-v3

.github/renovate.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "local>nginxinc/k8s-common"
+    "local>nginx/k8s-common"
   ]
 }

.github/workflows/dependabot-auto-merge.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34 # v2.2.0
+        uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7 # v2.3.0
 
       - name: Enable auto-merge for Dependabot PRs
         run: gh pr merge --auto --squash "$PR_URL"

.github/workflows/sync.yml

@@ -28,10 +28,10 @@ jobs:
           repository: |
             nginxinc/kic-test-containers
             nginxinc/nginx-ingress-helm-operator
-            nginxinc/nginx-prometheus-exporter
-            nginxinc/nginx-plus-go-client
-            nginxinc/nginx-asg-sync
-            nginxinc/telemetry-exporter
+            nginx/nginx-prometheus-exporter
+            nginx/nginx-plus-go-client
+            nginx/nginx-asg-sync
+            nginx/telemetry-exporter
           token: ${{ secrets.NGINX_PAT }}
           prune: true
 
@@ -42,7 +42,7 @@ jobs:
     steps:
       - run: |
           gh repo sync nginx-bot/certified-operators
-          gh repo sync nginxinc/winget-pkgs
+          gh repo sync nginx/winget-pkgs
           gh repo sync nginxinc/kubernetes-json-schema
         env:
           GITHUB_TOKEN: ${{ secrets.NGINX_PAT }}

.gitignore

@@ -8,3 +8,5 @@
 
 # MacOS Finder
 .DS_Store
+
+license.jwt

.pre-commit-config.yaml

@@ -27,12 +27,12 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.22.1
+    rev: v8.23.2
     hooks:
       - id: gitleaks
 
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.17.1
+    rev: v0.17.2
     hooks:
       - id: markdownlint-cli2
 

tools/build.pkr.hcl

@@ -33,36 +33,41 @@ build {
 
   provisioner "shell" {
     inline = [
-    "curl -L https://nixos.org/nix/install -o install-nix.sh",
-    "chmod +x install-nix.sh",
-    "bash install-nix.sh --daemon",
-    "rm install-nix.sh",
-    "sed -i '1i. /etc/bashrc' ~/.bashrc"
+      "curl -L https://nixos.org/nix/install -o install-nix.sh",
+      "chmod +x install-nix.sh",
+      "bash install-nix.sh --daemon",
+      "rm install-nix.sh",
+      "sed -i '1i. /etc/bashrc' ~/.bashrc"
     ]
   }
 
   provisioner "file" {
     source      = "packages.nix"
     destination = "/tmp/packages.nix"
+  }
 
-
+  provisioner "file" {
+    source      = "license.jwt"
+    destination = "/tmp/license.jwt"
   }
 
   provisioner "shell" {
     inline = [
-    "nix-env -if /tmp/packages.nix",
-    "sudo apt-get update",
-    "sudo apt-get install -y --no-install-recommends --no-install-suggests google-cloud-sdk-gke-gcloud-auth-plugin locales",
-    "echo 'en_US.UTF-8 UTF-8' | sudo tee /etc/locale.gen",
-    "sudo locale-gen",
+      "nix-env -if /tmp/packages.nix",
+      "sudo apt-get update",
+      "sudo apt-get install -y --no-install-recommends --no-install-suggests google-cloud-sdk-gke-gcloud-auth-plugin locales cloud-init",
+      "echo 'en_US.UTF-8 UTF-8' | sudo tee /etc/locale.gen",
+      "sudo locale-gen",
     ]
   }
 
   provisioner "shell" {
     inline = [
-      "git clone https://github.com/nginxinc/nginx-gateway-fabric.git",
+      "echo 'alias k='kubectl'' >> .bashrc",
+      "git clone https://github.com/nginx/nginx-gateway-fabric.git",
       "cd nginx-gateway-fabric/tests",
       "go mod download",
+      "cp /tmp/license.jwt ../license.jwt",
     ]
   }