Retire some older conditional edges which required PromQL eval

blocked-edges/4.11.0-AWSOldBootImageLackAfterburn.yaml

@@ -5,17 +5,5 @@ name: AWSOldBootImagesLackAfterburn
 message: |-
   4.1 AWS boot images are not compatible with some 4.11 and later, and machines created with them will fail to become nodes.  This risk does not apply if a cluster is not on AWS, was installed as version 4.2 or later, or otherwise uses 4.2 or later boot images.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      topk(1,
-        label_replace(group(cluster_version{type="initial",version=~"4[.][0-9][.].*"}),"born_by_4_9", "yes, so possibly actually born in 4.1", "", "")
-        or
-        label_replace(0 * group(cluster_version{type="initial",version!~"4[.][0-9][.].*"}),"born_by_4_9", "no, born in 4.10 or later", "", "")
-      )
-      * on () group_left (type)
-      (
-        cluster_infrastructure_provider{type="AWS"}
-        or
-        0 * cluster_infrastructure_provider
-      )
+- type: Always
+

blocked-edges/4.11.0-MachineConfigRenderingChurn.yaml

@@ -5,9 +5,5 @@ name: MachineConfigRenderingChurn
 message: |-
   Clusters with KubletConfigs that do not set 'CSIMigrationOpenStack: true' should remain on 4.10 until they can update to a 4.11 that contains a fix.  Clusters that do not contain any KubeletConfigs are unlikely to be exposed.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(cluster:usage:resources:sum{resource="kubeletconfigs.machineconfiguration.openshift.io"} > 0)
-      or
-      0 * group(cluster:usage:resources:sum)
+- type: Always
+

blocked-edges/4.11.0-arm64-seccomp-error-524.yaml

@@ -5,9 +5,5 @@ name: ARM64SecCompError524
 message: |-
   4.11.0 arm64 nodes may expose container creation to seccomp error 524.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(max_over_time(kube_node_labels{label_beta_kubernetes_io_arch="arm64"}[1h]))
-      or
-      0 * group(max_over_time(kube_node_labels[1h]))
+- type: Always
+

blocked-edges/4.11.0-fc.0-AWSOldBootImageLackAfterburn.yaml

@@ -5,17 +5,5 @@ name: AWSOldBootImagesLackAfterburn
 message: |-
   4.1 AWS boot images are not compatible with some 4.11 and later, and machines created with them will fail to become nodes.  This risk does not apply if a cluster is not on AWS, was installed as version 4.2 or later, or otherwise uses 4.2 or later boot images.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      topk(1,
-        label_replace(group(cluster_version{type="initial",version=~"4[.][0-9][.].*"}),"born_by_4_9", "yes, so possibly actually born in 4.1", "", "")
-        or
-        label_replace(0 * group(cluster_version{type="initial",version!~"4[.][0-9][.].*"}),"born_by_4_9", "no, born in 4.10 or later", "", "")
-      )
-      * on () group_left (type)
-      (
-        cluster_infrastructure_provider{type="AWS"}
-        or
-        0 * cluster_infrastructure_provider
-      )
+- type: Always
+

blocked-edges/4.11.0-fc.0-MachineConfigRenderingChurn.yaml

@@ -5,9 +5,5 @@ name: MachineConfigRenderingChurn
 message: |-
   Clusters with KubletConfigs that do not set 'CSIMigrationOpenStack: true' should remain on 4.10 until they can update to a 4.11 that contains a fix.  Clusters that do not contain any KubeletConfigs are unlikely to be exposed.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(cluster:usage:resources:sum{resource="kubeletconfigs.machineconfiguration.openshift.io"} > 0)
-      or
-      0 * group(cluster:usage:resources:sum)
+- type: Always
+

blocked-edges/4.11.0-fc.0-arm64-seccomp-error-524.yaml

@@ -5,9 +5,5 @@ name: ARM64SecCompError524
 message: |-
   4.11.0-fc.0 arm64 nodes may expose container creation to seccomp error 524.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(max_over_time(kube_node_labels{label_beta_kubernetes_io_arch="arm64"}[1h]))
-      or
-      0 * group(max_over_time(kube_node_labels[1h]))
+- type: Always
+

blocked-edges/4.11.0-fc.3-AWSOldBootImageLackAfterburn.yaml

@@ -5,17 +5,5 @@ name: AWSOldBootImagesLackAfterburn
 message: |-
   4.1 AWS boot images are not compatible with some 4.11 and later, and machines created with them will fail to become nodes.  This risk does not apply if a cluster is not on AWS, was installed as version 4.2 or later, or otherwise uses 4.2 or later boot images.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      topk(1,
-        label_replace(group(cluster_version{type="initial",version=~"4[.][0-9][.].*"}),"born_by_4_9", "yes, so possibly actually born in 4.1", "", "")
-        or
-        label_replace(0 * group(cluster_version{type="initial",version!~"4[.][0-9][.].*"}),"born_by_4_9", "no, born in 4.10 or later", "", "")
-      )
-      * on () group_left (type)
-      (
-        cluster_infrastructure_provider{type="AWS"}
-        or
-        0 * cluster_infrastructure_provider
-      )
+- type: Always
+

blocked-edges/4.11.0-fc.3-MachineConfigRenderingChurn.yaml

@@ -5,9 +5,5 @@ name: MachineConfigRenderingChurn
 message: |-
   Clusters with KubletConfigs that do not set 'CSIMigrationOpenStack: true' should remain on 4.10 until they can update to a 4.11 that contains a fix.  Clusters that do not contain any KubeletConfigs are unlikely to be exposed.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(cluster:usage:resources:sum{resource="kubeletconfigs.machineconfiguration.openshift.io"} > 0)
-      or
-      0 * group(cluster:usage:resources:sum)
+- type: Always
+

blocked-edges/4.11.0-fc.3-arm64-seccomp-error-524.yaml

@@ -5,9 +5,5 @@ name: ARM64SecCompError524
 message: |-
   4.11.0-fc.3 arm64 nodes may expose container creation to seccomp error 524.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(max_over_time(kube_node_labels{label_beta_kubernetes_io_arch="arm64"}[1h]))
-      or
-      0 * group(max_over_time(kube_node_labels[1h]))
+- type: Always
+

blocked-edges/4.11.0-rc.0-AWSOldBootImageLackAfterburn.yaml

@@ -5,17 +5,5 @@ name: AWSOldBootImagesLackAfterburn
 message: |-
   4.1 AWS boot images are not compatible with some 4.11 and later, and machines created with them will fail to become nodes.  This risk does not apply if a cluster is not on AWS, was installed as version 4.2 or later, or otherwise uses 4.2 or later boot images.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      topk(1,
-        label_replace(group(cluster_version{type="initial",version=~"4[.][0-9][.].*"}),"born_by_4_9", "yes, so possibly actually born in 4.1", "", "")
-        or
-        label_replace(0 * group(cluster_version{type="initial",version!~"4[.][0-9][.].*"}),"born_by_4_9", "no, born in 4.10 or later", "", "")
-      )
-      * on () group_left (type)
-      (
-        cluster_infrastructure_provider{type="AWS"}
-        or
-        0 * cluster_infrastructure_provider
-      )
+- type: Always
+

blocked-edges/4.11.0-rc.0-MachineConfigRenderingChurn.yaml

@@ -5,9 +5,5 @@ name: MachineConfigRenderingChurn
 message: |-
   Clusters with KubletConfigs that do not set 'CSIMigrationOpenStack: true' should remain on 4.10 until they can update to a 4.11 that contains a fix.  Clusters that do not contain any KubeletConfigs are unlikely to be exposed.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(cluster:usage:resources:sum{resource="kubeletconfigs.machineconfiguration.openshift.io"} > 0)
-      or
-      0 * group(cluster:usage:resources:sum)
+- type: Always
+

blocked-edges/4.11.0-rc.0-arm64-seccomp-error-524.yaml

@@ -5,9 +5,5 @@ name: ARM64SecCompError524
 message: |-
   4.11.0-rc.0 arm64 nodes may expose container creation to seccomp error 524.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(max_over_time(kube_node_labels{label_beta_kubernetes_io_arch="arm64"}[1h]))
-      or
-      0 * group(max_over_time(kube_node_labels[1h]))
+- type: Always
+

blocked-edges/4.11.0-rc.1-AWSOldBootImageLackAfterburn.yaml

@@ -5,17 +5,5 @@ name: AWSOldBootImagesLackAfterburn
 message: |-
   4.1 AWS boot images are not compatible with some 4.11 and later, and machines created with them will fail to become nodes.  This risk does not apply if a cluster is not on AWS, was installed as version 4.2 or later, or otherwise uses 4.2 or later boot images.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      topk(1,
-        label_replace(group(cluster_version{type="initial",version=~"4[.][0-9][.].*"}),"born_by_4_9", "yes, so possibly actually born in 4.1", "", "")
-        or
-        label_replace(0 * group(cluster_version{type="initial",version!~"4[.][0-9][.].*"}),"born_by_4_9", "no, born in 4.10 or later", "", "")
-      )
-      * on () group_left (type)
-      (
-        cluster_infrastructure_provider{type="AWS"}
-        or
-        0 * cluster_infrastructure_provider
-      )
+- type: Always
+

blocked-edges/4.11.0-rc.1-MachineConfigRenderingChurn.yaml

@@ -5,9 +5,5 @@ name: MachineConfigRenderingChurn
 message: |-
   Clusters with KubletConfigs that do not set 'CSIMigrationOpenStack: true' should remain on 4.10 until they can update to a 4.11 that contains a fix.  Clusters that do not contain any KubeletConfigs are unlikely to be exposed.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(cluster:usage:resources:sum{resource="kubeletconfigs.machineconfiguration.openshift.io"} > 0)
-      or
-      0 * group(cluster:usage:resources:sum)
+- type: Always
+

blocked-edges/4.11.0-rc.1-arm64-seccomp-error-524.yaml

@@ -5,9 +5,5 @@ name: ARM64SecCompError524
 message: |-
   4.11.0-rc.1 arm64 nodes may expose container creation to seccomp error 524.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(max_over_time(kube_node_labels{label_beta_kubernetes_io_arch="arm64"}[1h]))
-      or
-      0 * group(max_over_time(kube_node_labels[1h]))
+- type: Always
+

blocked-edges/4.11.0-rc.2-AWSOldBootImageLackAfterburn.yaml

@@ -5,17 +5,5 @@ name: AWSOldBootImagesLackAfterburn
 message: |-
   4.1 AWS boot images are not compatible with some 4.11 and later, and machines created with them will fail to become nodes.  This risk does not apply if a cluster is not on AWS, was installed as version 4.2 or later, or otherwise uses 4.2 or later boot images.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      topk(1,
-        label_replace(group(cluster_version{type="initial",version=~"4[.][0-9][.].*"}),"born_by_4_9", "yes, so possibly actually born in 4.1", "", "")
-        or
-        label_replace(0 * group(cluster_version{type="initial",version!~"4[.][0-9][.].*"}),"born_by_4_9", "no, born in 4.10 or later", "", "")
-      )
-      * on () group_left (type)
-      (
-        cluster_infrastructure_provider{type="AWS"}
-        or
-        0 * cluster_infrastructure_provider
-      )
+- type: Always
+

blocked-edges/4.11.0-rc.2-MachineConfigRenderingChurn.yaml

@@ -5,9 +5,5 @@ name: MachineConfigRenderingChurn
 message: |-
   Clusters with KubletConfigs that do not set 'CSIMigrationOpenStack: true' should remain on 4.10 until they can update to a 4.11 that contains a fix.  Clusters that do not contain any KubeletConfigs are unlikely to be exposed.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(cluster:usage:resources:sum{resource="kubeletconfigs.machineconfiguration.openshift.io"} > 0)
-      or
-      0 * group(cluster:usage:resources:sum)
+- type: Always
+

blocked-edges/4.11.0-rc.2-arm64-seccomp-error-524.yaml

@@ -5,9 +5,5 @@ name: ARM64SecCompError524
 message: |-
   4.11.0-rc.2 arm64 nodes may expose container creation to seccomp error 524.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(max_over_time(kube_node_labels{label_beta_kubernetes_io_arch="arm64"}[1h]))
-      or
-      0 * group(max_over_time(kube_node_labels[1h]))
+- type: Always
+

blocked-edges/4.11.0-rc.3-AWSOldBootImageLackAfterburn.yaml

@@ -5,17 +5,5 @@ name: AWSOldBootImagesLackAfterburn
 message: |-
   4.1 AWS boot images are not compatible with some 4.11 and later, and machines created with them will fail to become nodes.  This risk does not apply if a cluster is not on AWS, was installed as version 4.2 or later, or otherwise uses 4.2 or later boot images.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      topk(1,
-        label_replace(group(cluster_version{type="initial",version=~"4[.][0-9][.].*"}),"born_by_4_9", "yes, so possibly actually born in 4.1", "", "")
-        or
-        label_replace(0 * group(cluster_version{type="initial",version!~"4[.][0-9][.].*"}),"born_by_4_9", "no, born in 4.10 or later", "", "")
-      )
-      * on () group_left (type)
-      (
-        cluster_infrastructure_provider{type="AWS"}
-        or
-        0 * cluster_infrastructure_provider
-      )
+- type: Always
+

blocked-edges/4.11.0-rc.3-MachineConfigRenderingChurn.yaml

@@ -5,9 +5,5 @@ name: MachineConfigRenderingChurn
 message: |-
   Clusters with KubletConfigs that do not set 'CSIMigrationOpenStack: true' should remain on 4.10 until they can update to a 4.11 that contains a fix.  Clusters that do not contain any KubeletConfigs are unlikely to be exposed.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(cluster:usage:resources:sum{resource="kubeletconfigs.machineconfiguration.openshift.io"} > 0)
-      or
-      0 * group(cluster:usage:resources:sum)
+- type: Always
+

blocked-edges/4.11.0-rc.3-arm64-seccomp-error-524.yaml

@@ -5,9 +5,5 @@ name: ARM64SecCompError524
 message: |-
   4.11.0-rc.3 arm64 nodes may expose container creation to seccomp error 524.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(max_over_time(kube_node_labels{label_beta_kubernetes_io_arch="arm64"}[1h]))
-      or
-      0 * group(max_over_time(kube_node_labels[1h]))
+- type: Always
+

blocked-edges/4.11.0-rc.4-AWSOldBootImageLackAfterburn.yaml

@@ -5,17 +5,5 @@ name: AWSOldBootImagesLackAfterburn
 message: |-
   4.1 AWS boot images are not compatible with some 4.11 and later, and machines created with them will fail to become nodes.  This risk does not apply if a cluster is not on AWS, was installed as version 4.2 or later, or otherwise uses 4.2 or later boot images.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      topk(1,
-        label_replace(group(cluster_version{type="initial",version=~"4[.][0-9][.].*"}),"born_by_4_9", "yes, so possibly actually born in 4.1", "", "")
-        or
-        label_replace(0 * group(cluster_version{type="initial",version!~"4[.][0-9][.].*"}),"born_by_4_9", "no, born in 4.10 or later", "", "")
-      )
-      * on () group_left (type)
-      (
-        cluster_infrastructure_provider{type="AWS"}
-        or
-        0 * cluster_infrastructure_provider
-      )
+- type: Always
+

blocked-edges/4.11.0-rc.4-MachineConfigRenderingChurn.yaml

@@ -5,9 +5,5 @@ name: MachineConfigRenderingChurn
 message: |-
   Clusters with KubletConfigs that do not set 'CSIMigrationOpenStack: true' should remain on 4.10 until they can update to a 4.11 that contains a fix.  Clusters that do not contain any KubeletConfigs are unlikely to be exposed.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(cluster:usage:resources:sum{resource="kubeletconfigs.machineconfiguration.openshift.io"} > 0)
-      or
-      0 * group(cluster:usage:resources:sum)
+- type: Always
+

blocked-edges/4.11.0-rc.4-arm64-seccomp-error-524.yaml

@@ -5,9 +5,5 @@ name: ARM64SecCompError524
 message: |-
   4.11.0-rc.4 arm64 nodes may expose container creation to seccomp error 524.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(max_over_time(kube_node_labels{label_beta_kubernetes_io_arch="arm64"}[1h]))
-      or
-      0 * group(max_over_time(kube_node_labels[1h]))
+- type: Always
+

blocked-edges/4.11.0-rc.5-AWSOldBootImageLackAfterburn.yaml

@@ -5,17 +5,5 @@ name: AWSOldBootImagesLackAfterburn
 message: |-
   4.1 AWS boot images are not compatible with some 4.11 and later, and machines created with them will fail to become nodes.  This risk does not apply if a cluster is not on AWS, was installed as version 4.2 or later, or otherwise uses 4.2 or later boot images.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      topk(1,
-        label_replace(group(cluster_version{type="initial",version=~"4[.][0-9][.].*"}),"born_by_4_9", "yes, so possibly actually born in 4.1", "", "")
-        or
-        label_replace(0 * group(cluster_version{type="initial",version!~"4[.][0-9][.].*"}),"born_by_4_9", "no, born in 4.10 or later", "", "")
-      )
-      * on () group_left (type)
-      (
-        cluster_infrastructure_provider{type="AWS"}
-        or
-        0 * cluster_infrastructure_provider
-      )
+- type: Always
+

blocked-edges/4.11.0-rc.5-MachineConfigRenderingChurn.yaml

@@ -5,9 +5,5 @@ name: MachineConfigRenderingChurn
 message: |-
   Clusters with KubletConfigs that do not set 'CSIMigrationOpenStack: true' should remain on 4.10 until they can update to a 4.11 that contains a fix.  Clusters that do not contain any KubeletConfigs are unlikely to be exposed.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(cluster:usage:resources:sum{resource="kubeletconfigs.machineconfiguration.openshift.io"} > 0)
-      or
-      0 * group(cluster:usage:resources:sum)
+- type: Always
+

blocked-edges/4.11.0-rc.5-arm64-seccomp-error-524.yaml

@@ -5,9 +5,5 @@ name: ARM64SecCompError524
 message: |-
   4.11.0-rc.5 arm64 nodes may expose container creation to seccomp error 524.
 matchingRules:
-- type: PromQL
-  promql:
-    promql:
-      group(max_over_time(kube_node_labels{label_beta_kubernetes_io_arch="arm64"}[1h]))
-      or
-      0 * group(max_over_time(kube_node_labels[1h]))
+- type: Always
+