rename bundleSource objects (#10550)

* rename bundleSource objects so they can be used for both policy and logconf

* update codegen

Author: vepatel

config/crd/bases/k8s.nginx.org_policies.yaml

@@ -880,14 +880,14 @@ spec:
                           InsecureSkipVerify disables TLS certificate verification when fetching bundles.
                           Not recommended for production use.
                         type: boolean
-                      policyName:
-                        description: PolicyName is the policy name on the management
+                      name:
+                        description: Name is the policy/logconf name on the management
                           plane. Required for NIM and N1C; forbidden for HTTPS.
                         maxLength: 63
                         type: string
-                      policyNamespace:
-                        description: PolicyNamespace is the namespace/tenant on the
-                          management plane. Required for N1C only.
+                      namespace:
+                        description: Namespace is the namespace/tenant on the management
+                          plane. Required for N1C only.
                         maxLength: 63
                         type: string
                       pollInterval:
@@ -977,14 +977,14 @@ spec:
                               InsecureSkipVerify disables TLS certificate verification when fetching bundles.
                               Not recommended for production use.
                             type: boolean
-                          policyName:
-                            description: PolicyName is the policy name on the management
+                          name:
+                            description: Name is the policy/logconf name on the management
                               plane. Required for NIM and N1C; forbidden for HTTPS.
                             maxLength: 63
                             type: string
-                          policyNamespace:
-                            description: PolicyNamespace is the namespace/tenant on
-                              the management plane. Required for N1C only.
+                          namespace:
+                            description: Namespace is the namespace/tenant on the
+                              management plane. Required for N1C only.
                             maxLength: 63
                             type: string
                           pollInterval:
@@ -1081,14 +1081,15 @@ spec:
                                 InsecureSkipVerify disables TLS certificate verification when fetching bundles.
                                 Not recommended for production use.
                               type: boolean
-                            policyName:
-                              description: PolicyName is the policy name on the management
-                                plane. Required for NIM and N1C; forbidden for HTTPS.
+                            name:
+                              description: Name is the policy/logconf name on the
+                                management plane. Required for NIM and N1C; forbidden
+                                for HTTPS.
                               maxLength: 63
                               type: string
-                            policyNamespace:
-                              description: PolicyNamespace is the namespace/tenant
-                                on the management plane. Required for N1C only.
+                            namespace:
+                              description: Namespace is the namespace/tenant on the
+                                management plane. Required for N1C only.
                               maxLength: 63
                               type: string
                             pollInterval:

deploy/crds.yaml

@@ -1051,14 +1051,14 @@ spec:
                           InsecureSkipVerify disables TLS certificate verification when fetching bundles.
                           Not recommended for production use.
                         type: boolean
-                      policyName:
-                        description: PolicyName is the policy name on the management
+                      name:
+                        description: Name is the policy/logconf name on the management
                           plane. Required for NIM and N1C; forbidden for HTTPS.
                         maxLength: 63
                         type: string
-                      policyNamespace:
-                        description: PolicyNamespace is the namespace/tenant on the
-                          management plane. Required for N1C only.
+                      namespace:
+                        description: Namespace is the namespace/tenant on the management
+                          plane. Required for N1C only.
                         maxLength: 63
                         type: string
                       pollInterval:
@@ -1148,14 +1148,14 @@ spec:
                               InsecureSkipVerify disables TLS certificate verification when fetching bundles.
                               Not recommended for production use.
                             type: boolean
-                          policyName:
-                            description: PolicyName is the policy name on the management
+                          name:
+                            description: Name is the policy/logconf name on the management
                               plane. Required for NIM and N1C; forbidden for HTTPS.
                             maxLength: 63
                             type: string
-                          policyNamespace:
-                            description: PolicyNamespace is the namespace/tenant on
-                              the management plane. Required for N1C only.
+                          namespace:
+                            description: Namespace is the namespace/tenant on the
+                              management plane. Required for N1C only.
                             maxLength: 63
                             type: string
                           pollInterval:
@@ -1252,14 +1252,15 @@ spec:
                                 InsecureSkipVerify disables TLS certificate verification when fetching bundles.
                                 Not recommended for production use.
                               type: boolean
-                            policyName:
-                              description: PolicyName is the policy name on the management
-                                plane. Required for NIM and N1C; forbidden for HTTPS.
+                            name:
+                              description: Name is the policy/logconf name on the
+                                management plane. Required for NIM and N1C; forbidden
+                                for HTTPS.
                               maxLength: 63
                               type: string
-                            policyNamespace:
-                              description: PolicyNamespace is the namespace/tenant
-                                on the management plane. Required for N1C only.
+                            namespace:
+                              description: Namespace is the namespace/tenant on the
+                                management plane. Required for N1C only.
                               maxLength: 63
                               type: string
                             pollInterval:

docs/crd/k8s.nginx.org_policies.md

@@ -147,8 +147,8 @@ The `.spec` object supports the following fields:
 | `waf.apBundleSource` | `object` | ApBundleSource fetches the WAF policy bundle from N1C, NIM, or an HTTPS endpoint. Mutually exclusive with ApPolicy and ApBundle. |
 | `waf.apBundleSource.enablePolling` | `boolean` | EnablePolling enables background polling to automatically detect and fetch updated bundles at the configured PollInterval. When false, the bundle is fetched once on policy creation or update; subsequent updates require modifying the Policy resource to trigger a new fetch. |
 | `waf.apBundleSource.insecureSkipVerify` | `boolean` | InsecureSkipVerify disables TLS certificate verification when fetching bundles. Not recommended for production use. |
-| `waf.apBundleSource.policyName` | `string` | PolicyName is the policy name on the management plane. Required for NIM and N1C; forbidden for HTTPS. |
-| `waf.apBundleSource.policyNamespace` | `string` | PolicyNamespace is the namespace/tenant on the management plane. Required for N1C only. |
+| `waf.apBundleSource.name` | `string` | Name is the policy/logconf name on the management plane. Required for NIM and N1C; forbidden for HTTPS. |
+| `waf.apBundleSource.namespace` | `string` | Namespace is the namespace/tenant on the management plane. Required for N1C only. |
 | `waf.apBundleSource.pollInterval` | `string` | PollInterval is how often to re-fetch the bundle when enablePolling is true. Minimum 1m. Default 5m. Ignored when enablePolling is false. |
 | `waf.apBundleSource.retryAttempts` | `integer` | RetryAttempts is the number of retry attempts on transient failure. Range 1–10. |
 | `waf.apBundleSource.secret` | `string` | Secret is the name of a Kubernetes Secret in the same namespace as the Policy. For HTTPS: kubernetes.io/tls (tls.crt + tls.key for client mTLS; optional ca.crt for server CA). For N1C: nginx.com/waf-bundle Secret with a 'token' field containing the API token. For NIM: nginx.com/waf-bundle Secret with a 'token' field (bearer auth) or 'username'+'password' fields (basic auth). |
@@ -164,8 +164,8 @@ The `.spec` object supports the following fields:
 | `waf.securityLog.apLogBundleSource` | `object` | ApLogBundleSource fetches the log profile bundle from N1C, NIM, or an HTTPS endpoint. Mutually exclusive with ApLogConf and ApLogBundle. Requires apBundleSource on the parent WAF. |
 | `waf.securityLog.apLogBundleSource.enablePolling` | `boolean` | EnablePolling enables background polling to automatically detect and fetch updated bundles at the configured PollInterval. When false, the bundle is fetched once on policy creation or update; subsequent updates require modifying the Policy resource to trigger a new fetch. |
 | `waf.securityLog.apLogBundleSource.insecureSkipVerify` | `boolean` | InsecureSkipVerify disables TLS certificate verification when fetching bundles. Not recommended for production use. |
-| `waf.securityLog.apLogBundleSource.policyName` | `string` | PolicyName is the policy name on the management plane. Required for NIM and N1C; forbidden for HTTPS. |
-| `waf.securityLog.apLogBundleSource.policyNamespace` | `string` | PolicyNamespace is the namespace/tenant on the management plane. Required for N1C only. |
+| `waf.securityLog.apLogBundleSource.name` | `string` | Name is the policy/logconf name on the management plane. Required for NIM and N1C; forbidden for HTTPS. |
+| `waf.securityLog.apLogBundleSource.namespace` | `string` | Namespace is the namespace/tenant on the management plane. Required for N1C only. |
 | `waf.securityLog.apLogBundleSource.pollInterval` | `string` | PollInterval is how often to re-fetch the bundle when enablePolling is true. Minimum 1m. Default 5m. Ignored when enablePolling is false. |
 | `waf.securityLog.apLogBundleSource.retryAttempts` | `integer` | RetryAttempts is the number of retry attempts on transient failure. Range 1–10. |
 | `waf.securityLog.apLogBundleSource.secret` | `string` | Secret is the name of a Kubernetes Secret in the same namespace as the Policy. For HTTPS: kubernetes.io/tls (tls.crt + tls.key for client mTLS; optional ca.crt for server CA). For N1C: nginx.com/waf-bundle Secret with a 'token' field containing the API token. For NIM: nginx.com/waf-bundle Secret with a 'token' field (bearer auth) or 'username'+'password' fields (basic auth). |
@@ -182,8 +182,8 @@ The `.spec` object supports the following fields:
 | `waf.securityLogs[].apLogBundleSource` | `object` | ApLogBundleSource fetches the log profile bundle from N1C, NIM, or an HTTPS endpoint. Mutually exclusive with ApLogConf and ApLogBundle. Requires apBundleSource on the parent WAF. |
 | `waf.securityLogs[].apLogBundleSource.enablePolling` | `boolean` | EnablePolling enables background polling to automatically detect and fetch updated bundles at the configured PollInterval. When false, the bundle is fetched once on policy creation or update; subsequent updates require modifying the Policy resource to trigger a new fetch. |
 | `waf.securityLogs[].apLogBundleSource.insecureSkipVerify` | `boolean` | InsecureSkipVerify disables TLS certificate verification when fetching bundles. Not recommended for production use. |
-| `waf.securityLogs[].apLogBundleSource.policyName` | `string` | PolicyName is the policy name on the management plane. Required for NIM and N1C; forbidden for HTTPS. |
-| `waf.securityLogs[].apLogBundleSource.policyNamespace` | `string` | PolicyNamespace is the namespace/tenant on the management plane. Required for N1C only. |
+| `waf.securityLogs[].apLogBundleSource.name` | `string` | Name is the policy/logconf name on the management plane. Required for NIM and N1C; forbidden for HTTPS. |
+| `waf.securityLogs[].apLogBundleSource.namespace` | `string` | Namespace is the namespace/tenant on the management plane. Required for N1C only. |
 | `waf.securityLogs[].apLogBundleSource.pollInterval` | `string` | PollInterval is how often to re-fetch the bundle when enablePolling is true. Minimum 1m. Default 5m. Ignored when enablePolling is false. |
 | `waf.securityLogs[].apLogBundleSource.retryAttempts` | `integer` | RetryAttempts is the number of retry attempts on transient failure. Range 1–10. |
 | `waf.securityLogs[].apLogBundleSource.secret` | `string` | Secret is the name of a Kubernetes Secret in the same namespace as the Policy. For HTTPS: kubernetes.io/tls (tls.crt + tls.key for client mTLS; optional ca.crt for server CA). For N1C: nginx.com/waf-bundle Secret with a 'token' field containing the API token. For NIM: nginx.com/waf-bundle Secret with a 'token' field (bearer auth) or 'username'+'password' fields (basic auth). |

examples/custom-resources/security-monitoring-v5/waf-n1c.yaml

@@ -8,8 +8,8 @@ spec:
     apBundleSource:
       type: N1C
       url: "https://<tenant>.console.ves.volterra.io"
-      policyName: "<policy_name>"
-      policyNamespace: "default"
+      name: "<policy_name>"
+      namespace: "default"
       secret: "n1c-credentials"
       enablePolling: true
       pollInterval: "5m"
@@ -18,8 +18,8 @@ spec:
       apLogBundleSource:
         type: N1C
         url: "https://<tenant>.console.ves.volterra.io"
-        policyName: "secops_dashboard"
-        policyNamespace: "default"
+        name: "secops_dashboard"
+        namespace: "default"
         secret: "n1c-credentials"
         enablePolling: true
         pollInterval: "5m"

examples/custom-resources/security-monitoring-v5/waf-nim.yaml

@@ -8,7 +8,7 @@ spec:
     apBundleSource:
       type: NIM
       url: "https://<nim_host>"
-      policyName: "<policy_name>"
+      name: "<policy_name>"
       secret: "nim-credentials"
       enablePolling: true
       pollInterval: "5m"
@@ -17,7 +17,7 @@ spec:
       apLogBundleSource:
         type: NIM
         url: "https://<nim_host>"
-        policyName: "<log_profile_name>"
+        name: "<log_profile_name>"
         secret: "nim-credentials"
         enablePolling: true
         pollInterval: "5m"

examples/custom-resources/waf-management-plane/waf-n1c.yaml

@@ -8,8 +8,8 @@ spec:
     apBundleSource:
       type: N1C
       url: "https://<tenant>.console.ves.volterra.io"
-      policyName: "<policy_name>"
-      policyNamespace: "default"
+      name: "<policy_name>"
+      namespace: "default"
       secret: "n1c-credentials"
       enablePolling: true
       pollInterval: "5m"
@@ -18,8 +18,8 @@ spec:
       apLogBundleSource:
         type: N1C
         url: "https://<tenant>.console.ves.volterra.io"
-        policyName: "secops_dashboard"
-        policyNamespace: "default"
+        name: "secops_dashboard"
+        namespace: "default"
         secret: "n1c-credentials"
         enablePolling: true
         pollInterval: "5m"

examples/custom-resources/waf-management-plane/waf-nim.yaml

@@ -8,7 +8,7 @@ spec:
     apBundleSource:
       type: NIM
       url: "https://<nim_host>"
-      policyName: "<policy_name>"
+      name: "<policy_name>"
       secret: "nim-credentials"
       enablePolling: true
       pollInterval: "5m"
@@ -17,7 +17,7 @@ spec:
       apLogBundleSource:
         type: NIM
         url: "https://<nim_host>"
-        policyName: "<log_profile_name>"
+        name: "<log_profile_name>"
         secret: "nim-credentials"
         enablePolling: true
         pollInterval: "5m"

examples/ingress-resources/security-monitoring-v5/waf-n1c.yaml

@@ -8,8 +8,8 @@ spec:
     apBundleSource:
       type: N1C
       url: "https://<tenant>.console.ves.volterra.io"
-      policyName: "<policy_name>"
-      policyNamespace: "default"
+      name: "<policy_name>"
+      namespace: "default"
       secret: "n1c-credentials"
       enablePolling: true
       pollInterval: "5m"
@@ -18,8 +18,8 @@ spec:
       apLogBundleSource:
         type: N1C
         url: "https://<tenant>.console.ves.volterra.io"
-        policyName: "secops_dashboard"
-        policyNamespace: "default"
+        name: "secops_dashboard"
+        namespace: "default"
         secret: "n1c-credentials"
         enablePolling: true
         pollInterval: "5m"

examples/ingress-resources/security-monitoring-v5/waf-nim.yaml

@@ -8,7 +8,7 @@ spec:
     apBundleSource:
       type: NIM
       url: "https://<nim_host>"
-      policyName: "<policy_name>"
+      name: "<policy_name>"
       secret: "nim-credentials"
       enablePolling: true
       pollInterval: "5m"
@@ -17,7 +17,7 @@ spec:
       apLogBundleSource:
         type: NIM
         url: "https://<nim_host>"
-        policyName: "<log_profile_name>"
+        name: "<log_profile_name>"
         secret: "nim-credentials"
         enablePolling: true
         pollInterval: "5m"

examples/ingress-resources/waf-management-plane/waf-n1c.yaml

@@ -8,8 +8,8 @@ spec:
     apBundleSource:
       type: N1C
       url: "https://<tenant>.console.ves.volterra.io"
-      policyName: "<policy_name>"
-      policyNamespace: "default"
+      name: "<policy_name>"
+      namespace: "default"
       secret: "n1c-credentials"
       enablePolling: true
       pollInterval: "5m"
@@ -18,8 +18,8 @@ spec:
       apLogBundleSource:
         type: N1C
         url: "https://<tenant>.console.ves.volterra.io"
-        policyName: "secops_dashboard"
-        policyNamespace: "default"
+        name: "secops_dashboard"
+        namespace: "default"
         secret: "n1c-credentials"
         enablePolling: true
         pollInterval: "5m"