Skip to content

Commit 4a25999

Browse files
marioferhmarioferh
committed
small fix
1 parent 3d2e13c commit 4a25999

11 files changed

+163
-335
lines changed

‎config/v1alpha1/types_cluster_monitoring.go

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
v1 "k8s.io/api/core/v1"
2121
"k8s.io/apimachinery/pkg/api/resource"
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23-
auditv1 "k8s.io/apiserver/pkg/apis/audit/v1"
2423
)
2524

2625
// +genclient
@@ -173,16 +172,34 @@ type Audit struct {
173172
// - "request" - log metadata and request payloads
174173
// - "requestresponse" - log metadata, requests, and responses
175174
// - "none" - don't log requests
175+
// The default audit log level is "metadata"
176176
//
177177
// See: https://kubernetes.io/docs/tasks/debug-application-cluster/audit/#audit-policy
178178
// for more details about audit logging.
179179
//
180-
// +kubebuilder:validation:Required
181180
// +kubebuilder:validation:Enum=metadata;request;requestresponse;none
182-
// +required
183-
Profile auditv1.Level `json:"profile"`
181+
// +optional
182+
Profile AuditProfileType `json:"profile,omitempty"`
184183
}
185184

185+
// AuditProfileType defines the audit policy profile type.
186+
// +kubebuilder:validation:Enum=none;metadata;request;requestresponse
187+
type AuditProfileType string
188+
189+
const (
190+
// None - don't log events that match this rule.
191+
AuditProfileTypeNone AuditProfileType = "none"
192+
193+
// Metadata - log events with metadata (requesting user, timestamp, resource, verb, etc.) but not request or response body.
194+
AuditProfileTypeMetadata AuditProfileType = "metadata"
195+
196+
// Request - log events with request metadata and body but not response body. This does not apply for non-resource requests.
197+
AuditProfileTypeRequest AuditProfileType = "request"
198+
199+
// RequestResponse - log events with request metadata, request body and response body. This does not apply for non-resource requests.
200+
AuditProfileTypeRequestResponse AuditProfileType = "requestresponse"
201+
)
202+
186203
// ResourceSpec defines the requested and limited value of a resource.
187204
type ResourceSpec struct {
188205
// request is the minimum amount of the resource required (e.g. "2Mi", "1Gi").

‎config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-CustomNoUpgrade.crd.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,29 @@ spec:
6363
The audit field is optional.
6464
properties:
6565
profile:
66+
allOf:
67+
- enum:
68+
- none
69+
- metadata
70+
- request
71+
- requestresponse
72+
- enum:
73+
- metadata
74+
- request
75+
- requestresponse
76+
- none
6677
description: |-
6778
profile specifies the audit log level to use.
6879
Valid values are:
6980
- "metadata" - log metadata about requests (default)
7081
- "request" - log metadata and request payloads
7182
- "requestresponse" - log metadata, requests, and responses
7283
- "none" - don't log requests
84+
The default audit log level is "metadata"
7385
7486
See: https://kubernetes.io/docs/tasks/debug-application-cluster/audit/#audit-policy
7587
for more details about audit logging.
76-
enum:
77-
- metadata
78-
- request
79-
- requestresponse
80-
- none
8188
type: string
82-
required:
83-
- profile
8489
type: object
8590
nodeSelector:
8691
additionalProperties:
@@ -374,6 +379,7 @@ spec:
374379
- Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
375380
376381
If this value is nil, the behavior is equivalent to the Honor policy.
382+
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
377383
type: string
378384
nodeTaintsPolicy:
379385
description: |-
@@ -384,6 +390,7 @@ spec:
384390
- Ignore: node taints are ignored. All nodes are included.
385391
386392
If this value is nil, the behavior is equivalent to the Ignore policy.
393+
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
387394
type: string
388395
topologyKey:
389396
description: |-

‎config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-DevPreviewNoUpgrade.crd.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,29 @@ spec:
6363
The audit field is optional.
6464
properties:
6565
profile:
66+
allOf:
67+
- enum:
68+
- none
69+
- metadata
70+
- request
71+
- requestresponse
72+
- enum:
73+
- metadata
74+
- request
75+
- requestresponse
76+
- none
6677
description: |-
6778
profile specifies the audit log level to use.
6879
Valid values are:
6980
- "metadata" - log metadata about requests (default)
7081
- "request" - log metadata and request payloads
7182
- "requestresponse" - log metadata, requests, and responses
7283
- "none" - don't log requests
84+
The default audit log level is "metadata"
7385
7486
See: https://kubernetes.io/docs/tasks/debug-application-cluster/audit/#audit-policy
7587
for more details about audit logging.
76-
enum:
77-
- metadata
78-
- request
79-
- requestresponse
80-
- none
8188
type: string
82-
required:
83-
- profile
8489
type: object
8590
nodeSelector:
8691
additionalProperties:
@@ -374,6 +379,7 @@ spec:
374379
- Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
375380
376381
If this value is nil, the behavior is equivalent to the Honor policy.
382+
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
377383
type: string
378384
nodeTaintsPolicy:
379385
description: |-
@@ -384,6 +390,7 @@ spec:
384390
- Ignore: node taints are ignored. All nodes are included.
385391
386392
If this value is nil, the behavior is equivalent to the Ignore policy.
393+
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
387394
type: string
388395
topologyKey:
389396
description: |-

‎config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-TechPreviewNoUpgrade.crd.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,29 @@ spec:
6363
The audit field is optional.
6464
properties:
6565
profile:
66+
allOf:
67+
- enum:
68+
- none
69+
- metadata
70+
- request
71+
- requestresponse
72+
- enum:
73+
- metadata
74+
- request
75+
- requestresponse
76+
- none
6677
description: |-
6778
profile specifies the audit log level to use.
6879
Valid values are:
6980
- "metadata" - log metadata about requests (default)
7081
- "request" - log metadata and request payloads
7182
- "requestresponse" - log metadata, requests, and responses
7283
- "none" - don't log requests
84+
The default audit log level is "metadata"
7385
7486
See: https://kubernetes.io/docs/tasks/debug-application-cluster/audit/#audit-policy
7587
for more details about audit logging.
76-
enum:
77-
- metadata
78-
- request
79-
- requestresponse
80-
- none
8188
type: string
82-
required:
83-
- profile
8489
type: object
8590
nodeSelector:
8691
additionalProperties:
@@ -374,6 +379,7 @@ spec:
374379
- Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
375380
376381
If this value is nil, the behavior is equivalent to the Honor policy.
382+
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
377383
type: string
378384
nodeTaintsPolicy:
379385
description: |-
@@ -384,6 +390,7 @@ spec:
384390
- Ignore: node taints are ignored. All nodes are included.
385391
386392
If this value is nil, the behavior is equivalent to the Ignore policy.
393+
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
387394
type: string
388395
topologyKey:
389396
description: |-

‎config/v1alpha1/zz_generated.featuregated-crd-manifests/clustermonitoring.config.openshift.io/ClusterMonitoringConfig.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,29 @@ spec:
6363
The audit field is optional.
6464
properties:
6565
profile:
66+
allOf:
67+
- enum:
68+
- none
69+
- metadata
70+
- request
71+
- requestresponse
72+
- enum:
73+
- metadata
74+
- request
75+
- requestresponse
76+
- none
6677
description: |-
6778
profile specifies the audit log level to use.
6879
Valid values are:
6980
- "metadata" - log metadata about requests (default)
7081
- "request" - log metadata and request payloads
7182
- "requestresponse" - log metadata, requests, and responses
7283
- "none" - don't log requests
84+
The default audit log level is "metadata"
7385
7486
See: https://kubernetes.io/docs/tasks/debug-application-cluster/audit/#audit-policy
7587
for more details about audit logging.
76-
enum:
77-
- metadata
78-
- request
79-
- requestresponse
80-
- none
8188
type: string
82-
required:
83-
- profile
8489
type: object
8590
nodeSelector:
8691
additionalProperties:
@@ -374,6 +379,7 @@ spec:
374379
- Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
375380
376381
If this value is nil, the behavior is equivalent to the Honor policy.
382+
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
377383
type: string
378384
nodeTaintsPolicy:
379385
description: |-
@@ -384,6 +390,7 @@ spec:
384390
- Ignore: node taints are ignored. All nodes are included.
385391
386392
If this value is nil, the behavior is equivalent to the Ignore policy.
393+
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
387394
type: string
388395
topologyKey:
389396
description: |-

‎config/v1alpha1/zz_generated.swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)