Skip to content

Commit

Permalink
Simplify telemetry ping
Browse files Browse the repository at this point in the history
  • Loading branch information
jefflill committed Nov 13, 2023
1 parent b48e250 commit 2a3f133
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
7 changes: 0 additions & 7 deletions Lib/Neon.Kube/ClusterMetadata/ClusterTelemetry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -331,12 +331,5 @@ public class ClusterNodeTelemetry
/// </summary>
[JsonProperty(PropertyName = "PrivateAddress", Required = Required.Always | Required.AllowNull)]
public string PrivateAddress { get; set; }

/// <summary>
/// Indicates whether the node is configured and is ready to accept external network traffic
/// for the cluster.
/// </summary>
[JsonProperty(PropertyName = "Ingress", Required = Required.Always | Required.AllowNull)]
public bool Ingress { get; set; }
}
}
10 changes: 0 additions & 10 deletions Services/neon-cluster-operator/CronJobs/TelemetryPingJob.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,6 @@ public async Task Execute(IJobExecutionContext context)
node.PrivateAddress = k8sNode.Status.Addresses.FirstOrDefault(address => address.Type == "InternalIP").Address;
node.Role = k8sNode.Metadata.GetLabel(NodeLabels.LabelRole);

// $todo(jefflill):
//
// We need to really figure this out from the node status and Istio config.
// We're currently assuming that only worker nodes support ingress unless
// there are no workers and we're not checking node health either.
//
// https://github.com/nforgeio/neonKUBE/issues/1816

node.Ingress = !hasWorkers || node.Role == NodeRole.Worker;

if (k8sNode.Status.Capacity.TryGetValue("cpu", out var cores))
{
node.VCpus = cores.ToInt32();
Expand Down

0 comments on commit 2a3f133

Please sign in to comment.