Merge pull request #2520 from tjungblu/CNTRLPLANE-1576

CNTRLPLANE-1576: add event-ttl configuration to kube-apiserver

Author: openshift-merge-bot[bot]

openapi/generated_openapi/zz_generated.openapi.go

@@ -30910,6 +30910,11 @@
         "forceRedeploymentReason"
       ],
       "properties": {
+        "eventTTLMinutes": {
+          "description": "eventTTLMinutes specifies the amount of time that the events are stored before being deleted. The TTL is allowed between 5 minutes minimum up to a maximum of 180 minutes (3 hours).\n\nLowering this value will reduce the storage required in etcd. Note that this setting will only apply to new events being created and will not update existing events.\n\nWhen omitted this means no opinion, and the platform is left to choose a reasonable default, which is subject to change over time. The current default value is 3h (180 minutes).",
+          "type": "integer",
+          "format": "int32"
+        },
         "failedRevisionLimit": {
           "description": "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)",
           "type": "integer",
@@ -31016,7 +31021,8 @@
           "items": {
             "default": {},
             "$ref": "#/definitions/com.github.openshift.api.operator.v1.ServiceAccountIssuerStatus"
-          }
+          },
+          "x-kubernetes-list-type": "atomic"
         },
         "version": {
           "description": "version is the level this availability applies to",

openapi/openapi.json

@@ -0,0 +1,49 @@
+apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
+name: "KubeAPIServer"
+crdName: kubeapiservers.operator.openshift.io
+featureGates:
+  - EventTTL
+tests:
+  onCreate:
+    - name: Should be able to create default omitted event ttl
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: KubeAPIServer
+        spec: {} # No spec is required for a KubeAPIServer
+      expected: |
+        apiVersion: operator.openshift.io/v1
+        kind: KubeAPIServer
+        spec:
+          logLevel: Normal
+          operatorLogLevel: Normal
+    - name: Should be able to create a normal hour event ttl
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: KubeAPIServer
+        spec:
+          eventTTLMinutes: 60
+      expected: |
+        apiVersion: operator.openshift.io/v1
+        kind: KubeAPIServer
+        spec:
+          logLevel: Normal
+          operatorLogLevel: Normal
+          eventTTLMinutes: 60
+    - name: Should not be able to create with less than 5 minutes
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: KubeAPIServer
+        metadata:
+          name: gg1
+        spec:
+          eventTTLMinutes: 4
+      expectedError: "Invalid value: 4: spec.eventTTLMinutes in body should be greater than or equal to 5"
+    - name: Should not be able to create more than 360 minutes
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: KubeAPIServer
+        metadata:
+          name: gg1
+        spec:
+          eventTTLMinutes: 181
+      expectedError: "Invalid value: 181: spec.eventTTLMinutes in body should be less than or equal to 180"

operator/v1/tests/kubeapiservers.operator.openshift.io/EventTTL.yaml

@@ -35,6 +35,21 @@ type KubeAPIServer struct {
 
 type KubeAPIServerSpec struct {
 	StaticPodOperatorSpec `json:",inline"`
+
+	// eventTTLMinutes specifies the amount of time that the events are stored before being deleted.
+	// The TTL is allowed between 5 minutes minimum up to a maximum of 180 minutes (3 hours).
+	//
+	// Lowering this value will reduce the storage required in etcd. Note that this setting will only apply
+	// to new events being created and will not update existing events.
+	//
+	// When omitted this means no opinion, and the platform is left to choose a reasonable default, which is subject to change over time.
+	// The current default value is 3h (180 minutes).
+	//
+	// +openshift:enable:FeatureGate=EventTTL
+	// +kubebuilder:validation:Minimum=5
+	// +kubebuilder:validation:Maximum=180
+	// +optional
+	EventTTLMinutes int32 `json:"eventTTLMinutes,omitempty"`
 }
 
 type KubeAPIServerStatus struct {
@@ -46,6 +61,7 @@ type KubeAPIServerStatus struct {
 	// The default expiration for the items is set by the platform and it defaults to 24h.
 	// see: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#service-account-token-volume-projection
 	// +optional
+	// +listType=atomic
 	ServiceAccountIssuers []ServiceAccountIssuerStatus `json:"serviceAccountIssuers,omitempty"`
 }