Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/code/plugin/KubernetesApiClient.rb
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def isNodeMaster
def getNodesResourceUri(nodesResourceUri)
begin
# For ARO v3 cluster, filter out all other node roles other than compute
if IsAROV3Cluster
if isAROV3Cluster()
if !nodesResourceUri.nil? && !nodesResourceUri.index("?").nil?
nodesResourceUri = nodesResourceUri + "&labelSelector=node-role.kubernetes.io%2Fcompute%3Dtrue"
else
Expand Down Expand Up @@ -390,7 +390,7 @@ def getContainerResourceRequestsAndLimits(metricJSON, metricCategory, metricName
end

# For ARO, skip the pods scheduled on to master or infra nodes to ingest
if IsAROV3Cluster && !pod["spec"].nil? && !pod["spec"]["nodeName"].nil? &&
if isAROV3Cluster() && !pod["spec"].nil? && !pod["spec"]["nodeName"].nil? &&
( pod["spec"]["nodeName"].downcase.start_with?("infra-") ||
pod["spec"]["nodeName"].downcase.start_with?("master-") )
next
Expand Down