Skip to content

Commit fdc7ec6

Browse files
committed
Revert "add SNO control plane high cpu usage alert"
This reverts commit d92b461.
1 parent 8fae6b5 commit fdc7ec6

File tree

6 files changed

+2
-435
lines changed

6 files changed

+2
-435
lines changed

bindata/assets/alerts/cpu-utilization-sno.yaml

Lines changed: 0 additions & 47 deletions
This file was deleted.

pkg/operator/starter.go

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"github.com/openshift/cluster-kube-apiserver-operator/pkg/operator/targetconfigcontroller"
3434
"github.com/openshift/cluster-kube-apiserver-operator/pkg/operator/terminationobserver"
3535
"github.com/openshift/cluster-kube-apiserver-operator/pkg/operator/webhooksupportabilitycontroller"
36-
"github.com/openshift/cluster-kube-apiserver-operator/pkg/operator/workloadpartitioning"
3736
"github.com/openshift/library-go/pkg/controller/controllercmd"
3837
"github.com/openshift/library-go/pkg/operator/apiserver/controller/auditpolicy"
3938
"github.com/openshift/library-go/pkg/operator/certrotation"
@@ -171,11 +170,9 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
171170
if err != nil {
172171
return err
173172
}
174-
175173
var notOnSingleReplicaTopology resourceapply.ConditionalFunction = func() bool {
176174
return infrastructure.Status.ControlPlaneTopology != configv1.SingleReplicaTopologyMode
177175
}
178-
179176
staticResourceController := staticresourcecontroller.NewStaticResourceController(
180177
"KubeAPIServerStaticResources",
181178
bindata.Asset,
@@ -202,6 +199,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
202199
"assets/kube-apiserver/storage-version-migration-prioritylevelconfiguration.yaml",
203200
"assets/alerts/api-usage.yaml",
204201
"assets/alerts/audit-errors.yaml",
202+
"assets/alerts/cpu-utilization.yaml",
205203
"assets/alerts/kube-apiserver-requests.yaml",
206204
"assets/alerts/kube-apiserver-slos-basic.yaml",
207205
"assets/alerts/podsecurity-violations.yaml",
@@ -214,14 +212,9 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
214212
operatorClient,
215213
controllerContext.EventRecorder,
216214
).
217-
WithConditionalResources(bindata.Asset, []string{"assets/alerts/kube-apiserver-slos-extended.yaml", "assets/alerts/cpu-utilization.yaml"}, notOnSingleReplicaTopology, nil).
215+
WithConditionalResources(bindata.Asset, []string{"assets/alerts/kube-apiserver-slos-extended.yaml"}, notOnSingleReplicaTopology, nil).
218216
AddKubeInformers(kubeInformersForNamespaces)
219217

220-
err = workloadpartitioning.CreateSNOAlert(ctx, dynamicClient, infrastructure.Status, controllerContext.EventRecorder)
221-
if err != nil {
222-
klog.Errorln("Failed to create workload partition based sno cpu alert", err)
223-
}
224-
225218
targetConfigReconciler := targetconfigcontroller.NewTargetConfigController(
226219
os.Getenv("IMAGE"),
227220
os.Getenv("OPERATOR_IMAGE"),

pkg/operator/workloadpartitioning/cpuPartitioningAlertRenderer.go

Lines changed: 0 additions & 114 deletions
This file was deleted.

vendor/k8s.io/utils/cpuset/OWNERS

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)