Skip to content

Commit

Permalink
linted
Browse files Browse the repository at this point in the history
  • Loading branch information
ebeaty-cisco committed Dec 12, 2024
1 parent 6ef7160 commit 2373d79
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion modules/aws/node/data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ data "aws_ec2_instance_type" "this" {

data "aws_eks_cluster" "this" {
name = var.cluster_name
}
}
14 changes: 7 additions & 7 deletions modules/aws/node/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,19 @@ resource "aws_instance" "this" {
user_data = templatefile(
"${path.module}/templates/user-data.tftpl",
{
name = data.aws_eks_cluster.this.name
api_endpoint = data.aws_eks_cluster.this.endpoint
name = data.aws_eks_cluster.this.name
api_endpoint = data.aws_eks_cluster.this.endpoint
certificate_authority = data.aws_eks_cluster.this.certificate_authority[0].data
cidr = data.aws_eks_cluster.this.kubernetes_network_config[0].service_ipv4_cidr
cidr = data.aws_eks_cluster.this.kubernetes_network_config[0].service_ipv4_cidr
kubelet_flags = concat(
["--node-labels=${local.kubelet_node_labels_arg}"],
var.kubelet_extra_args
)
hugepages_gb = local.hugepages_gb
isolated_cores = local.isolated_cores
hugepages_gb = local.hugepages_gb
isolated_cores = local.isolated_cores
additional_user_data = var.user_data
xrd_bootstrap = local.is_xrd_ami
private_ip = var.private_ip_address
xrd_bootstrap = local.is_xrd_ami
private_ip = var.private_ip_address
}
)

Expand Down
5 changes: 2 additions & 3 deletions tests/ut/test_node.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import base64
import json
import subprocess
import textwrap
import uuid
from pathlib import Path
import textwrap
from typing import Any

import pytest
Expand Down Expand Up @@ -318,8 +318,7 @@ def test_kubelet_extra_args(ec2, tf: Terraform, base_vars: dict[str, Any]):
" flags:\n"
f" - --node-labels=ios-xr.cisco.com/name={vars['name']}\n"
" - foo\n"
" - bar\n"
in user_data
" - bar\n" in user_data
)


Expand Down

0 comments on commit 2373d79

Please sign in to comment.