Merge branch 'nginxinc:main' into main

nginxinc · Apr 29, 2024 · ba5f7c1 · ba5f7c1
2 parents a325ad4 + 7232b9f
commit ba5f7c1
Show file tree

Hide file tree

Showing 17 changed files with 2,344 additions and 2,139 deletions.
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -361,7 +361,6 @@ RUN --mount=type=bind,target=/tmp [ -n "${NAP_MODULES##*waf*}" ] && exit 0; mkdi
 	&& chown -R 101:0 /etc/app_protect /usr/share/ts /var/log/app_protect/ /opt/app_protect/ \
 	&& chmod -R g=u /etc/app_protect /usr/share/ts /var/log/app_protect/ /opt/app_protect/ \
 	&& touch /etc/nginx/waf/nac-usersigs/index.conf \
-	&& cp -a /tmp/build/log-default.json /etc/nginx \
 	&& if [ -z "${NGINX_AGENT##true}" ]; then mkdir -p /etc/ssl/nms /opt/nms-nap-compiler \
 	&& chown -R 101:0 /etc/ssl/nms /opt/nms-nap-compiler \
 	&& chmod -R g=u /etc/ssl/nms /opt/nms-nap-compiler \

diff --git a/build/log-default.json b/build/log-default.json
diff --git a/config/crd/bases/appprotect.f5.com_aplogconfs.yaml b/config/crd/bases/appprotect.f5.com_aplogconfs.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: aplogconfs.appprotect.f5.com
 spec:
   group: appprotect.f5.com
@@ -15,66 +14,70 @@ spec:
   preserveUnknownFields: false
   scope: Namespaced
   versions:
-    - name: v1beta1
-      schema:
-        openAPIV3Schema:
-          description: APLogConf is the Schema for the APLogConfs API
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: APLogConfSpec defines the desired state of APLogConf
-              properties:
-                content:
-                  properties:
-                    escaping_characters:
-                      items:
-                        properties:
-                          from:
-                            type: string
-                          to:
-                            type: string
-                        type: object
-                      type: array
-                    format:
-                      enum:
-                        - splunk
-                        - arcsight
-                        - default
-                        - user-defined
-                        - grpc
-                      type: string
-                    format_string:
-                      type: string
-                    list_delimiter:
-                      type: string
-                    list_prefix:
-                      type: string
-                    list_suffix:
-                      type: string
-                    max_message_size:
-                      pattern: ^([1-9]|[1-5][0-9]|6[0-4])k$
-                      type: string
-                    max_request_size:
-                      pattern: ^([1-9]|[1-9][0-9]|[1-9][0-9]{2}|1[0-9]{3}|20[1-3][0-9]|204[1-8]|any)$
-                      type: string
-                  type: object
-                filter:
-                  properties:
-                    request_type:
-                      enum:
-                        - all
-                        - illegal
-                        - blocked
-                      type: string
-                  type: object
-              type: object
-          type: object
-      served: true
-      storage: true
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: APLogConf is the Schema for the APLogConfs API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: APLogConfSpec defines the desired state of APLogConf
+            properties:
+              content:
+                properties:
+                  escaping_characters:
+                    items:
+                      properties:
+                        from:
+                          type: string
+                        to:
+                          type: string
+                      type: object
+                    type: array
+                  format:
+                    enum:
+                    - splunk
+                    - arcsight
+                    - default
+                    - user-defined
+                    - grpc
+                    type: string
+                  format_string:
+                    type: string
+                  list_delimiter:
+                    type: string
+                  list_prefix:
+                    type: string
+                  list_suffix:
+                    type: string
+                  max_message_size:
+                    pattern: ^([1-9]|[1-5][0-9]|6[0-4])k$
+                    type: string
+                  max_request_size:
+                    pattern: ^([1-9]|[1-9][0-9]|[1-9][0-9]{2}|[1-9][0-9]{3}|10[0-2][0-9][0-9]|[1-9]k|10k|any)$
+                    type: string
+                type: object
+              filter:
+                properties:
+                  request_type:
+                    enum:
+                    - all
+                    - illegal
+                    - blocked
+                    type: string
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true