Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 2094362: Duplicate prometheus rules for API SLOs after upgrade #1376

Merged
merged 2 commits into from Oct 28, 2022
Merged

Bug 2094362: Duplicate prometheus rules for API SLOs after upgrade #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b457e
use conditional static resource functionality
sanchezl Sep 7, 2022
0a83a4d
delete prometheusrules/kube-apiserver-slos
sanchezl Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions bindata/assets/alerts/kube-apiserver-slos.yaml
View file
Open in desktop
@@ -0,0 +1,6 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
name: kube-apiserver-slos
namespace: openshift-kube-apiserver
spec: {}
67 changes: 35 additions & 32 deletions pkg/operator/starter.go
View file
Open in desktop
Expand Up @@ -129,53 +129,56 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
WithEventHandler(operatorclient.TargetNamespace, "LateConnections", terminationobserver.ProcessLateConnectionEvents).
ToController(kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace), kubeClient.CoreV1(), controllerContext.EventRecorder)

staticResourceFiles := []string{
"assets/kube-apiserver/ns.yaml",
"assets/kube-apiserver/svc.yaml",
"assets/kube-apiserver/kubeconfig-cm.yaml",
"assets/kube-apiserver/check-endpoints-clusterrole.yaml",
"assets/kube-apiserver/check-endpoints-clusterrole-node-reader.yaml",
"assets/kube-apiserver/check-endpoints-clusterrole-crd-reader.yaml",
"assets/kube-apiserver/check-endpoints-clusterrolebinding-auth-delegator.yaml",
"assets/kube-apiserver/check-endpoints-clusterrolebinding-node-reader.yaml",
"assets/kube-apiserver/check-endpoints-clusterrolebinding-crd-reader.yaml",
"assets/kube-apiserver/check-endpoints-kubeconfig-cm.yaml",
"assets/kube-apiserver/check-endpoints-rolebinding-kube-system.yaml",
"assets/kube-apiserver/check-endpoints-rolebinding.yaml",
"assets/kube-apiserver/control-plane-node-kubeconfig-cm.yaml",
"assets/kube-apiserver/delegated-incluster-authentication-rolebinding.yaml",
"assets/kube-apiserver/localhost-recovery-client-crb.yaml",
"assets/kube-apiserver/localhost-recovery-sa.yaml",
"assets/kube-apiserver/localhost-recovery-token.yaml",
"assets/kube-apiserver/apiserver.openshift.io_apirequestcount.yaml",
"assets/kube-apiserver/storage-version-migration-flowschema.yaml",
"assets/kube-apiserver/storage-version-migration-prioritylevelconfiguration.yaml",
"assets/alerts/api-usage.yaml",
"assets/alerts/audit-errors.yaml",
"assets/alerts/cpu-utilization.yaml",
"assets/alerts/kube-apiserver-requests.yaml",
"assets/alerts/kube-apiserver-slos-basic.yaml",
"assets/alerts/podsecurity-violations.yaml",
}
infrastructure, err := configClient.ConfigV1().Infrastructures().Get(ctx, "cluster", metav1.GetOptions{})
if err != nil {
return err
}
if infrastructure.Status.ControlPlaneTopology != configv1.SingleReplicaTopologyMode {
staticResourceFiles = append(staticResourceFiles, "assets/alerts/kube-apiserver-slos-extended.yaml")
var notOnSingleReplicaTopology resourceapply.ConditionalFunction = func() bool {
return infrastructure.Status.ControlPlaneTopology != configv1.SingleReplicaTopologyMode
}
var never resourceapply.ConditionalFunction = func() bool { return false }
staticResourceController := staticresourcecontroller.NewStaticResourceController(
"KubeAPIServerStaticResources",
bindata.Asset,
staticResourceFiles,
[]string{
"assets/kube-apiserver/ns.yaml",
"assets/kube-apiserver/svc.yaml",
"assets/kube-apiserver/kubeconfig-cm.yaml",
"assets/kube-apiserver/check-endpoints-clusterrole.yaml",
"assets/kube-apiserver/check-endpoints-clusterrole-node-reader.yaml",
"assets/kube-apiserver/check-endpoints-clusterrole-crd-reader.yaml",
"assets/kube-apiserver/check-endpoints-clusterrolebinding-auth-delegator.yaml",
"assets/kube-apiserver/check-endpoints-clusterrolebinding-node-reader.yaml",
"assets/kube-apiserver/check-endpoints-clusterrolebinding-crd-reader.yaml",
"assets/kube-apiserver/check-endpoints-kubeconfig-cm.yaml",
"assets/kube-apiserver/check-endpoints-rolebinding-kube-system.yaml",
"assets/kube-apiserver/check-endpoints-rolebinding.yaml",
"assets/kube-apiserver/control-plane-node-kubeconfig-cm.yaml",
"assets/kube-apiserver/delegated-incluster-authentication-rolebinding.yaml",
"assets/kube-apiserver/localhost-recovery-client-crb.yaml",
"assets/kube-apiserver/localhost-recovery-sa.yaml",
"assets/kube-apiserver/localhost-recovery-token.yaml",
"assets/kube-apiserver/apiserver.openshift.io_apirequestcount.yaml",
"assets/kube-apiserver/storage-version-migration-flowschema.yaml",
"assets/kube-apiserver/storage-version-migration-prioritylevelconfiguration.yaml",
"assets/alerts/api-usage.yaml",
"assets/alerts/audit-errors.yaml",
"assets/alerts/cpu-utilization.yaml",
"assets/alerts/kube-apiserver-requests.yaml",
"assets/alerts/kube-apiserver-slos-basic.yaml",
"assets/alerts/podsecurity-violations.yaml",
},
(&resourceapply.ClientHolder{}).
WithKubernetes(kubeClient).
WithAPIExtensionsClient(apiextensionsClient).
WithDynamicClient(dynamicClient).
WithMigrationClient(migrationClient),
operatorClient,
controllerContext.EventRecorder,
).AddKubeInformers(kubeInformersForNamespaces)
).
WithConditionalResources(bindata.Asset, []string{"assets/alerts/kube-apiserver-slos-extended.yaml"}, notOnSingleReplicaTopology, nil).
WithConditionalResources(bindata.Asset, []string{"assets/alerts/kube-apiserver-slos.yaml"}, never, nil). // TODO remove in 4.13
AddKubeInformers(kubeInformersForNamespaces)

targetConfigReconciler := targetconfigcontroller.NewTargetConfigController(
os.Getenv("IMAGE"),
Expand Down